Revision: 7478
http://mahogany.svn.sourceforge.net/mahogany/?rev=7478&view=rev
Author: vadz
Date: 2008-05-13 13:30:22 -0700 (Tue, 13 May 2008)
Log Message:
-----------
use wxTE_PROCESS_ENTER with lookup control in the ADB frame; fix the bug in
wxPTextEntry ctor this uncovered
Modified Paths:
--------------
trunk/M/src/adb/AdbFrame.cpp
trunk/M/src/gui/wxDialogLayout.cpp
trunk/M/src/wx/generic/persctrl.cpp
Modified: trunk/M/src/adb/AdbFrame.cpp
===================================================================
--- trunk/M/src/adb/AdbFrame.cpp 2008-05-13 20:17:13 UTC (rev 7477)
+++ trunk/M/src/adb/AdbFrame.cpp 2008-05-13 20:30:22 UTC (rev 7478)
@@ -1278,7 +1278,11 @@
// ----------------------------
wxPanel *panel = new wxPanel(this, -1);
wxStaticText *label = new wxStaticText(panel, -1, _("&Lookup:"));
- m_textKey = new wxPTextEntry(ADB_CONFIG_PATH _T("/FindKey"), panel,
AdbView_Lookup);
+ m_textKey = new wxPTextEntry(ADB_CONFIG_PATH _T("/FindKey"), panel,
+ AdbView_Lookup,
+ "", // initial value
+ wxDefaultPosition, wxDefaultSize,
+ wxTE_PROCESS_ENTER);
m_treeAdb = new wxAdbTree(this, panel, AdbView_Tree);
m_notebook = new wxAdbNotebook(panel, AdbView_Notebook);
Modified: trunk/M/src/gui/wxDialogLayout.cpp
===================================================================
--- trunk/M/src/gui/wxDialogLayout.cpp 2008-05-13 20:17:13 UTC (rev 7477)
+++ trunk/M/src/gui/wxDialogLayout.cpp 2008-05-13 20:30:22 UTC (rev 7478)
@@ -1032,7 +1032,7 @@
// and the listbox itself
wxListBox *listbox = new wxListBox(GetCanvas(), -1);
c = new wxLayoutConstraints;
- c->top.SameAs(box, wxTop, 4*LAYOUT_Y_MARGIN);
+ c->top.SameAs(box, wxTop, 5*LAYOUT_Y_MARGIN);
c->left.SameAs(box, wxLeft, LAYOUT_X_MARGIN);
c->right.LeftOf(buttonModify, LAYOUT_X_MARGIN);;
c->bottom.SameAs(box, wxBottom, LAYOUT_Y_MARGIN);
Modified: trunk/M/src/wx/generic/persctrl.cpp
===================================================================
--- trunk/M/src/wx/generic/persctrl.cpp 2008-05-13 20:17:13 UTC (rev 7477)
+++ trunk/M/src/wx/generic/persctrl.cpp 2008-05-13 20:30:22 UTC (rev 7478)
@@ -482,7 +482,7 @@
const wxSize& size,
long style,
wxConfigBase *config)
- : wxComboBox(parent, id, value, pos, size, style)
+ : wxComboBox(parent, id, value, pos, size, 0, NULL, style)
{
Init();
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Mahogany-cvsupdates mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
