Update of /cvsroot/mahogany/M/src/gui
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv9638/src/gui
Modified Files:
wxTextDialog.cpp
Log Message:
fixed dialog layout (buttons sizer didn't appear initially under wxGTK)
Index: wxTextDialog.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxTextDialog.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -b -u -2 -r1.13 -r1.14
--- wxTextDialog.cpp 24 Aug 2006 17:51:23 -0000 1.13
+++ wxTextDialog.cpp 24 Aug 2006 17:58:37 -0000 1.14
@@ -144,27 +144,10 @@
m_configPath = configPath;
- // we may have or not the location in config where the dialogs position/size
- // are stored
- int x, y, w, h;
- if ( m_configPath )
- {
- wxMFrame::RestorePosition(configPath, &x, &y, &w, &h);
- }
- else
- {
- x =
- y = -1;
- w = 500;
- h = 300;
- }
-
- SetSize(x, y, w, h);
-
// create controls
// ---------------
m_text = new wxTextCtrl(this, -1, wxEmptyString,
- wxPoint(0, 0),
- wxSize(w, h),
+ wxDefaultPosition,
+ wxDefaultSize,
wxTE_MULTILINE |
wxTE_READONLY |
@@ -205,9 +188,9 @@
sizerTop->Add(sizerBtns, 0, wxCENTRE | wxTOP | wxBOTTOM, LAYOUT_Y_MARGIN);
- // set the sizer &c
- // ----------------
-
SetSizer(sizerTop);
+ // final initialization
+ // --------------------
+
m_text->SetFocus();
@@ -216,4 +199,21 @@
m_text->SetInsertionPoint(0);
+ // we may have or not the location in config where the dialogs position/size
+ // are stored
+ int x, y, w, h;
+ if ( m_configPath )
+ {
+ wxMFrame::RestorePosition(configPath, &x, &y, &w, &h);
+ }
+ else
+ {
+ x =
+ y = -1;
+ w = 500;
+ h = 300;
+ }
+
+ SetSize(x, y, w, h);
+
Show(TRUE);
}
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Mahogany-cvsupdates mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
