|
From: Eran I. <no...@so...> - 2014-01-11 10:13:05
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "codelite".
The branch, master has been updated
via 3d16ef3517db1bc1d2a20342de928690bf0665d8 (commit)
via 5169cc55ed030afe8df7db0afffdaa4681534762 (commit)
via 46f8ee21ce7ab86f1d23e87b17f93e8e0943eb88 (commit)
from 5efaee1ec1d6297ec6197e569671151f79c34dd0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://sourceforge.net/p/codelite/codelitegit/ci/3d16ef3517db1bc1d2a20342de928690bf0665d8
commit 3d16ef3517db1bc1d2a20342de928690bf0665d8
Author: eran <er...@os...>
Date: Sat Jan 11 04:12:31 2014 -0800
Message pane: increased the size of the buttons by 2 pixels
diff --git a/LiteEditor/messagepane.wxcp b/LiteEditor/messagepane.wxcp
index d220301..528ac71 100644
--- a/LiteEditor/messagepane.wxcp
+++ b/LiteEditor/messagepane.wxcp
@@ -354,7 +354,7 @@
}, {
"type": "string",
"m_label": "Size:",
- "m_value": ""
+ "m_value": "-1,-1"
}, {
"type": "string",
"m_label": "Minimum Size:",
@@ -686,7 +686,7 @@
"gbSpan": ",",
"gbPosition": ",",
"m_styles": [],
- "m_sizerFlags": ["wxALIGN_CENTER_VERTICAL"],
+ "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_CENTER_VERTICAL"],
"m_properties": [{
"type": "string",
"m_label": "Name:",
@@ -709,7 +709,7 @@
"gbSpan": ",",
"gbPosition": ",",
"m_styles": [],
- "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxTOP", "wxEXPAND"],
+ "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
"m_properties": [{
"type": "winid",
"m_label": "ID:",
@@ -798,7 +798,7 @@
"gbSpan": ",",
"gbPosition": ",",
"m_styles": [],
- "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxTOP", "wxEXPAND", "wxALIGN_CENTER_VERTICAL"],
+ "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND", "wxALIGN_CENTER_VERTICAL"],
"m_properties": [{
"type": "winid",
"m_label": "ID:",
@@ -887,7 +887,7 @@
"gbSpan": ",",
"gbPosition": ",",
"m_styles": [],
- "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxTOP", "wxEXPAND", "wxALIGN_CENTER_VERTICAL"],
+ "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND", "wxALIGN_CENTER_VERTICAL"],
"m_properties": [{
"type": "winid",
"m_label": "ID:",
diff --git a/LiteEditor/messagepane_base.cpp b/LiteEditor/messagepane_base.cpp
index a015ae1..3af1a2e 100644
--- a/LiteEditor/messagepane_base.cpp
+++ b/LiteEditor/messagepane_base.cpp
@@ -1,5 +1,6 @@
//////////////////////////////////////////////////////////////////////
// This file was auto-generated by codelite's wxCrafter Plugin
+// wxCrafter project file: messagepane.wxcp
// Do not modify this file by hand!
//////////////////////////////////////////////////////////////////////
@@ -22,7 +23,7 @@ MessagePaneBase::MessagePaneBase(wxWindow* parent, wxWindowID id, const wxPoint&
bBitmapLoaded = true;
}
- bSizer8 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* bSizer8 = new wxBoxSizer(wxVERTICAL);
this->SetSizer(bSizer8);
m_panel2 = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(-1, -1), wxTAB_TRAVERSAL|wxBORDER_SIMPLE);
@@ -30,14 +31,14 @@ MessagePaneBase::MessagePaneBase(wxWindow* parent, wxWindowID id, const wxPoint&
bSizer8->Add(m_panel2, 1, wxEXPAND, 0);
- mainSizer = new wxBoxSizer(wxHORIZONTAL);
+ wxBoxSizer* mainSizer = new wxBoxSizer(wxHORIZONTAL);
m_panel2->SetSizer(mainSizer);
- bSizer81 = new wxBoxSizer(wxHORIZONTAL);
+ wxBoxSizer* bSizer81 = new wxBoxSizer(wxHORIZONTAL);
mainSizer->Add(bSizer81, 1, wxALIGN_CENTER_VERTICAL, 5);
- bSizer4 = new wxBoxSizer(wxHORIZONTAL);
+ wxBoxSizer* bSizer4 = new wxBoxSizer(wxHORIZONTAL);
bSizer81->Add(bSizer4, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);
@@ -45,15 +46,15 @@ MessagePaneBase::MessagePaneBase(wxWindow* parent, wxWindowID id, const wxPoint&
bSizer4->Add(m_bitmap1, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5);
- m_panel1 = new wxPanel(m_panel2, wxID_ANY, wxDefaultPosition, wxSize(-1, -1), wxWANTS_CHARS|wxTAB_TRAVERSAL);
+ m_panel1 = new wxPanel(m_panel2, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxWANTS_CHARS|wxTAB_TRAVERSAL);
m_panel1->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_INFOBK));
bSizer4->Add(m_panel1, 1, wxALL|wxEXPAND, 5);
- bSizer2 = new wxBoxSizer(wxHORIZONTAL);
+ wxBoxSizer* bSizer2 = new wxBoxSizer(wxHORIZONTAL);
m_panel1->SetSizer(bSizer2);
- bSizer3 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* bSizer3 = new wxBoxSizer(wxVERTICAL);
bSizer2->Add(bSizer3, 1, wxALIGN_CENTER_VERTICAL, 5);
@@ -77,22 +78,22 @@ MessagePaneBase::MessagePaneBase(wxWindow* parent, wxWindowID id, const wxPoint&
bSizer3->Add(m_DontAnnoyMeCheck, 0, wxALL, 5);
- bSizer7 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* bSizer7 = new wxBoxSizer(wxVERTICAL);
- bSizer4->Add(bSizer7, 0, wxALIGN_CENTER_VERTICAL, 5);
+ bSizer4->Add(bSizer7, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5);
m_buttonClose = new wxButton(m_panel2, wxID_CANCEL, _("Hide"), wxDefaultPosition, wxSize(-1, -1), 0);
- bSizer7->Add(m_buttonClose, 0, wxLEFT|wxRIGHT|wxTOP|wxEXPAND, 5);
+ bSizer7->Add(m_buttonClose, 0, wxALL|wxEXPAND, 5);
m_buttonAction = new wxButton(m_panel2, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1, -1), 0);
m_buttonAction->SetDefault();
- bSizer7->Add(m_buttonAction, 0, wxLEFT|wxRIGHT|wxTOP|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);
+ bSizer7->Add(m_buttonAction, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);
m_buttonAction1 = new wxButton(m_panel2, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1, -1), 0);
- bSizer7->Add(m_buttonAction1, 0, wxLEFT|wxRIGHT|wxTOP|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);
+ bSizer7->Add(m_buttonAction1, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);
m_buttonAction2 = new wxButton(m_panel2, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1, -1), 0);
diff --git a/LiteEditor/messagepane_base.h b/LiteEditor/messagepane_base.h
index 46e0bbb..68714d3 100644
--- a/LiteEditor/messagepane_base.h
+++ b/LiteEditor/messagepane_base.h
@@ -1,5 +1,6 @@
//////////////////////////////////////////////////////////////////////
// This file was auto-generated by codelite's wxCrafter Plugin
+// wxCrafter project file: messagepane.wxcp
// Do not modify this file by hand!
//////////////////////////////////////////////////////////////////////
@@ -20,19 +21,12 @@
class MessagePaneBase : public wxPanel
{
protected:
- wxBoxSizer* bSizer8;
wxPanel* m_panel2;
- wxBoxSizer* mainSizer;
- wxBoxSizer* bSizer81;
- wxBoxSizer* bSizer4;
wxStaticBitmap* m_bitmap1;
wxPanel* m_panel1;
- wxBoxSizer* bSizer2;
- wxBoxSizer* bSizer3;
wxStaticText* m_staticText2;
wxStaticText* m_staticTextMessage;
wxCheckBox* m_DontAnnoyMeCheck;
- wxBoxSizer* bSizer7;
wxButton* m_buttonClose;
wxButton* m_buttonAction;
wxButton* m_buttonAction1;
diff --git a/LiteEditor/messagepane_liteeditor_bitmaps.cpp b/LiteEditor/messagepane_liteeditor_bitmaps.cpp
index 198916e..166f91b 100644
--- a/LiteEditor/messagepane_liteeditor_bitmaps.cpp
+++ b/LiteEditor/messagepane_liteeditor_bitmaps.cpp
@@ -1,48 +1,48 @@
-//
-// This file was automatically generated by wxrc, do not edit by hand.
-//
-
-#include <wx/wxprec.h>
-
-#ifdef __BORLANDC__
- #pragma hdrstop
-#endif
-
-#include <wx/filesys.h>
-#include <wx/fs_mem.h>
-#include <wx/xrc/xmlres.h>
-#include <wx/xrc/xh_all.h>
-
-#if wxCHECK_VERSION(2,8,5) && wxABI_VERSION >= 20805
- #define XRC_ADD_FILE(name, data, size, mime) \
- wxMemoryFSHandler::AddFileWithMimeType(name, data, size, mime)
-#else
- #define XRC_ADD_FILE(name, data, size, mime) \
- wxMemoryFSHandler::AddFile(name, data, size)
-#endif
-
-static size_t xml_res_size_0 = 108;
-static unsigned char xml_res_file_0[] = {
-60,63,120,109,108,32,118,101,114,115,105,111,110,61,34,49,46,48,34,32,101,
-110,99,111,100,105,110,103,61,34,85,84,70,45,56,34,63,62,10,60,114,101,
-115,111,117,114,99,101,32,120,109,108,110,115,61,34,104,116,116,112,58,
-47,47,119,119,119,46,119,120,119,105,110,100,111,119,115,46,111,114,103,
-47,119,120,120,114,99,34,32,118,101,114,115,105,111,110,61,34,50,46,51,
-46,48,46,49,34,47,62,10};
-
-void wxC2A73InitBitmapResources()
-{
-
- // Check for memory FS. If not present, load the handler:
- {
- wxMemoryFSHandler::AddFile(wxT("XRC_resource/dummy_file"), wxT("dummy one"));
- wxFileSystem fsys;
- wxFSFile *f = fsys.OpenFile(wxT("memory:XRC_resource/dummy_file"));
- wxMemoryFSHandler::RemoveFile(wxT("XRC_resource/dummy_file"));
- if (f) delete f;
- else wxFileSystem::AddHandler(new wxMemoryFSHandlerBase);
- }
-
- XRC_ADD_FILE(wxT("XRC_resource/messagepane_liteeditor_bitmaps.cpp$C__src_codelitegit_LiteEditor_messagepane_liteeditor_bitmaps.xrc"), xml_res_file_0, xml_res_size_0, wxT("text/xml"));
- wxXmlResource::Get()->Load(wxT("memory:XRC_resource/messagepane_liteeditor_bitmaps.cpp$C__src_codelitegit_LiteEditor_messagepane_liteeditor_bitmaps.xrc"));
-}
+//
+// This file was automatically generated by wxrc, do not edit by hand.
+//
+
+#include <wx/wxprec.h>
+
+#ifdef __BORLANDC__
+ #pragma hdrstop
+#endif
+
+#include <wx/filesys.h>
+#include <wx/fs_mem.h>
+#include <wx/xrc/xmlres.h>
+#include <wx/xrc/xh_all.h>
+
+#if wxCHECK_VERSION(2,8,5) && wxABI_VERSION >= 20805
+ #define XRC_ADD_FILE(name, data, size, mime) \
+ wxMemoryFSHandler::AddFileWithMimeType(name, data, size, mime)
+#else
+ #define XRC_ADD_FILE(name, data, size, mime) \
+ wxMemoryFSHandler::AddFile(name, data, size)
+#endif
+
+static size_t xml_res_size_0 = 108;
+static unsigned char xml_res_file_0[] = {
+60,63,120,109,108,32,118,101,114,115,105,111,110,61,34,49,46,48,34,32,101,
+110,99,111,100,105,110,103,61,34,85,84,70,45,56,34,63,62,10,60,114,101,
+115,111,117,114,99,101,32,120,109,108,110,115,61,34,104,116,116,112,58,
+47,47,119,119,119,46,119,120,119,105,110,100,111,119,115,46,111,114,103,
+47,119,120,120,114,99,34,32,118,101,114,115,105,111,110,61,34,50,46,51,
+46,48,46,49,34,47,62,10};
+
+void wxC2A73InitBitmapResources()
+{
+
+ // Check for memory FS. If not present, load the handler:
+ {
+ wxMemoryFSHandler::AddFile(wxT("XRC_resource/dummy_file"), wxT("dummy one"));
+ wxFileSystem fsys;
+ wxFSFile *f = fsys.OpenFile(wxT("memory:XRC_resource/dummy_file"));
+ wxMemoryFSHandler::RemoveFile(wxT("XRC_resource/dummy_file"));
+ if (f) delete f;
+ else wxFileSystem::AddHandler(new wxMemoryFSHandlerBase);
+ }
+
+ XRC_ADD_FILE(wxT("XRC_resource/messagepane_liteeditor_bitmaps.cpp$_Users_eran_devl_codelitegit_LiteEditor_messagepane_liteeditor_bitmaps.xrc"), xml_res_file_0, xml_res_size_0, wxT("text/xml"));
+ wxXmlResource::Get()->Load(wxT("memory:XRC_resource/messagepane_liteeditor_bitmaps.cpp$_Users_eran_devl_codelitegit_LiteEditor_messagepane_liteeditor_bitmaps.xrc"));
+}
https://sourceforge.net/p/codelite/codelitegit/ci/5169cc55ed030afe8df7db0afffdaa4681534762
commit 5169cc55ed030afe8df7db0afffdaa4681534762
Merge: 46f8ee2 5efaee1
Author: eran <er...@os...>
Date: Sat Jan 11 04:08:12 2014 -0800
Merge branch 'master' of ssh://git.code.sf.net/p/codelite/codelitegit
# By Eran
# Via Eran
* 'master' of ssh://git.code.sf.net/p/codelite/codelitegit:
Fixed: added missing border cmake's plugin settings dialog
Updated TODO list
https://sourceforge.net/p/codelite/codelitegit/ci/46f8ee21ce7ab86f1d23e87b17f93e8e0943eb88
commit 46f8ee21ce7ab86f1d23e87b17f93e8e0943eb88
Author: eran <er...@os...>
Date: Sat Jan 11 04:07:11 2014 -0800
Debugger: dont let the tooltip to minimize under 100x100 pixels
Git: OSX: set the default git binary to simply 'git'
diff --git a/LiteEditor/new_quick_watch_dlg.cpp b/LiteEditor/new_quick_watch_dlg.cpp
index dff859f..1affe82 100644
--- a/LiteEditor/new_quick_watch_dlg.cpp
+++ b/LiteEditor/new_quick_watch_dlg.cpp
@@ -37,7 +37,11 @@ DisplayVariableDlg::DisplayVariableDlg( wxWindow* parent)
WindowAttrManager::Load(this, "DebuggerTooltip", NULL);
m_timer2 = new wxTimer(this);
m_mousePosTimer = new wxTimer(this);
-
+
+ if (GetSize().x < 100 || GetSize().y < 100 ) {
+ SetSize( wxRect(GetPosition(), wxSize(100, 100) ) );
+ }
+
Connect(m_timer2->GetId(), wxEVT_TIMER, wxTimerEventHandler(DisplayVariableDlg::OnTimer2), NULL, this);
Connect(m_mousePosTimer->GetId(), wxEVT_TIMER, wxTimerEventHandler(DisplayVariableDlg::OnCheckMousePosTimer), NULL, this);
m_panelStatusBar->Connect(wxEVT_MOUSE_CAPTURE_LOST, wxMouseCaptureLostEventHandler(DisplayVariableDlg::OnCaptureLost), NULL, this);
@@ -604,7 +608,7 @@ void DisplayVariableDlg::DoUpdateSize(bool performClean)
if ( m_dragging ) {
wxRect curect = GetScreenRect();
curect.SetBottomRight( ::wxGetMousePosition() );
- if ( curect.GetHeight() <= 10 || curect.GetWidth() <= 10 ) {
+ if ( curect.GetHeight() <= 100 || curect.GetWidth() <= 100 ) {
if ( performClean ) {
m_dragging = false;
if ( m_panelStatusBar->HasCapture() ) {
diff --git a/LiteEditor/newquickwatch.cpp b/LiteEditor/newquickwatch.cpp
index 0f9a5df..c110a8a 100644
--- a/LiteEditor/newquickwatch.cpp
+++ b/LiteEditor/newquickwatch.cpp
@@ -1,5 +1,6 @@
//////////////////////////////////////////////////////////////////////
// This file was auto-generated by codelite's wxCrafter Plugin
+// wxCrafter project file: newquickwatch.wxcp
// Do not modify this file by hand!
//////////////////////////////////////////////////////////////////////
@@ -22,42 +23,42 @@ clDebuggerTipWindowBase::clDebuggerTipWindowBase(wxWindow* parent,long style)
bBitmapLoaded = true;
}
- boxSizer4 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* boxSizer4 = new wxBoxSizer(wxVERTICAL);
this->SetSizer(boxSizer4);
- m_panel46 = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(200,100), wxTAB_TRAVERSAL|wxBORDER_SIMPLE);
+ m_panel46 = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL|wxBORDER_SIMPLE);
boxSizer4->Add(m_panel46, 1, wxEXPAND, 5);
- boxSizer48 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* boxSizer48 = new wxBoxSizer(wxVERTICAL);
m_panel46->SetSizer(boxSizer48);
- m_scrollWin6 = new wxScrolledWindow(m_panel46, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxBORDER_NONE|wxHSCROLL|wxVSCROLL);
+ m_scrollWin6 = new wxScrolledWindow(m_panel46, wxID_ANY, wxDefaultPosition, wxSize(200,100), wxBORDER_NONE|wxHSCROLL|wxVSCROLL);
m_scrollWin6->SetScrollRate(5, 5);
boxSizer48->Add(m_scrollWin6, 1, wxEXPAND, 2);
- bSizer5 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* bSizer5 = new wxBoxSizer(wxVERTICAL);
m_scrollWin6->SetSizer(bSizer5);
- m_treeCtrl = new wxTreeCtrl(m_scrollWin6, wxID_ANY, wxDefaultPosition, wxSize(-1, -1), wxTR_DEFAULT_STYLE|wxTR_SINGLE|wxBORDER_NONE);
+ m_treeCtrl = new wxTreeCtrl(m_scrollWin6, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTR_DEFAULT_STYLE|wxTR_SINGLE|wxBORDER_NONE);
m_treeCtrl->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_INFOBK));
m_treeCtrl->SetForegroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_INFOTEXT));
bSizer5->Add(m_treeCtrl, 1, wxEXPAND, 0);
+ m_scrollWin6->SetMinSize(wxSize(200,100));
m_panelStatusBar = new wxPanel(m_panel46, wxID_ANY, wxDefaultPosition, wxSize(-1,22), wxTAB_TRAVERSAL);
m_panelStatusBar->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_INFOBK));
boxSizer48->Add(m_panelStatusBar, 0, wxEXPAND, 2);
- boxSizer42 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* boxSizer42 = new wxBoxSizer(wxVERTICAL);
m_panelStatusBar->SetSizer(boxSizer42);
m_staticBitmap44 = new wxStaticBitmap(m_panelStatusBar, wxID_ANY, wxXmlResource::Get()->LoadBitmap(wxT("resize")), wxDefaultPosition, wxSize(16,16), 0 );
boxSizer42->Add(m_staticBitmap44, 0, wxALL|wxALIGN_RIGHT|wxALIGN_BOTTOM, 5);
- m_panel46->SetMinSize(wxSize(200,100));
SetSizeHints(-1,-1);
if ( GetSizer() ) {
@@ -101,14 +102,14 @@ clDebuggerEditItemDlgBase::clDebuggerEditItemDlgBase(wxWindow* parent, wxWindowI
bBitmapLoaded = true;
}
- boxSizer24 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* boxSizer24 = new wxBoxSizer(wxVERTICAL);
this->SetSizer(boxSizer24);
m_panel32 = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
boxSizer24->Add(m_panel32, 1, wxALL|wxEXPAND, 5);
- boxSizer34 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* boxSizer34 = new wxBoxSizer(wxVERTICAL);
m_panel32->SetSizer(boxSizer34);
m_staticText36 = new wxStaticText(m_panel32, wxID_ANY, _("Enter new expression:"), wxDefaultPosition, wxSize(-1,-1), 0);
@@ -119,7 +120,7 @@ clDebuggerEditItemDlgBase::clDebuggerEditItemDlgBase(wxWindow* parent, wxWindowI
boxSizer34->Add(m_textCtrl38, 0, wxALL|wxEXPAND, 5);
- boxSizer26 = new wxBoxSizer(wxHORIZONTAL);
+ wxBoxSizer* boxSizer26 = new wxBoxSizer(wxHORIZONTAL);
boxSizer24->Add(boxSizer26, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5);
diff --git a/LiteEditor/newquickwatch.h b/LiteEditor/newquickwatch.h
index 5e9449f..addd72e 100644
--- a/LiteEditor/newquickwatch.h
+++ b/LiteEditor/newquickwatch.h
@@ -1,5 +1,6 @@
//////////////////////////////////////////////////////////////////////
// This file was auto-generated by codelite's wxCrafter Plugin
+// wxCrafter project file: newquickwatch.wxcp
// Do not modify this file by hand!
//////////////////////////////////////////////////////////////////////
@@ -25,14 +26,10 @@
class clDebuggerTipWindowBase : public wxPopupWindow
{
protected:
- wxBoxSizer* boxSizer4;
wxPanel* m_panel46;
- wxBoxSizer* boxSizer48;
wxScrolledWindow* m_scrollWin6;
- wxBoxSizer* bSizer5;
wxTreeCtrl* m_treeCtrl;
wxPanel* m_panelStatusBar;
- wxBoxSizer* boxSizer42;
wxStaticBitmap* m_staticBitmap44;
protected:
@@ -55,12 +52,9 @@ public:
class clDebuggerEditItemDlgBase : public wxDialog
{
protected:
- wxBoxSizer* boxSizer24;
wxPanel* m_panel32;
- wxBoxSizer* boxSizer34;
wxStaticText* m_staticText36;
wxTextCtrl* m_textCtrl38;
- wxBoxSizer* boxSizer26;
wxButton* m_button28;
wxButton* m_button30;
diff --git a/LiteEditor/newquickwatch.wxcp b/LiteEditor/newquickwatch.wxcp
index 355412c..6f47160 100644
--- a/LiteEditor/newquickwatch.wxcp
+++ b/LiteEditor/newquickwatch.wxcp
@@ -136,11 +136,11 @@
}, {
"type": "string",
"m_label": "Size:",
- "m_value": "200,100"
+ "m_value": "-1,-1"
}, {
"type": "string",
"m_label": "Minimum Size:",
- "m_value": "200,100"
+ "m_value": "-1,-1"
}, {
"type": "string",
"m_label": "Name:",
@@ -225,11 +225,11 @@
}, {
"type": "string",
"m_label": "Size:",
- "m_value": "-1,-1"
+ "m_value": "200,100"
}, {
"type": "string",
"m_label": "Minimum Size:",
- "m_value": "-1,-1"
+ "m_value": "200,100"
}, {
"type": "string",
"m_label": "Name:",
@@ -322,11 +322,11 @@
}, {
"type": "string",
"m_label": "Size:",
- "m_value": ""
... 212 lines suppressed ...
hooks/post-receive
--
codelite
|