I keep running into situations where the old small default window size

was expected, and odd initial layouts resulted, so let's leave only
TLWs at the new 400x250 default size, and give all other windows the
old 20x20 default.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26206 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h
index 02dc3ea81d0c3ad8555ac19c67ed743cb1422ca1..e4ea49abb18b990c7a19318786a43e4353d79535 100644 (file)
--- a/include/wx/toplevel.h
+++ b/include/wx/toplevel.h
@@ -150,6 +150,12 @@ protected:
     // send the iconize event, return TRUE if processed
     bool SendIconizeEvent(bool iconized = TRUE);
 
+    // Get the default size for the new window if no explicit size given. If
+    // there are better default sizes then these can be changed, just as long
+    // as they are not too small for TLWs.
+    static int WidthDefault(int w) { return w == -1 ? 400 : w; }
+    static int HeightDefault(int h) { return h == -1 ? 250 : h; }
+
     // the frame icon
     wxIconBundle m_icons;
 

diff --git a/include/wx/window.h b/include/wx/window.h
index 1d3ab69344738740740b63bdb00b5a6436359541..80925c1468576d2f1e913ca8c8b6aa570f78d939 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -1060,8 +1060,8 @@ protected:
     // Get the default size for the new window if no explicit size given. If
     // there are better default sizes then these can be changed, just as long
     // as they are not too small for TLWs.
-    static int WidthDefault(int w) { return w == -1 ? 400 : w; }
-    static int HeightDefault(int h) { return h == -1 ? 250 : h; }
+    static int WidthDefault(int w) { return w == -1 ? 20 : w; }
+    static int HeightDefault(int h) { return h == -1 ? 20 : h; }
 
     // set the best size for the control if the default size was given:
     // replaces the fields of size == -1 with the best values for them and

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index 4153c61a48d560946e55494fdcd7c049c4ded1fd..b4a0ed8489592ba1856e716e9705b6fa0d14a76f 100644 (file)
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -328,7 +328,7 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
     // least for MSW compatibility)
     wxSize size = sizeOrig;
     size.x = WidthDefault(size.x);
-    size.y = WidthDefault(size.y);
+    size.y = HeightDefault(size.y);
 
     wxTopLevelWindows.Append( this );
 

diff --git a/src/gtk1/toplevel.cpp b/src/gtk1/toplevel.cpp
index 4153c61a48d560946e55494fdcd7c049c4ded1fd..b4a0ed8489592ba1856e716e9705b6fa0d14a76f 100644 (file)
--- a/src/gtk1/toplevel.cpp
+++ b/src/gtk1/toplevel.cpp
@@ -328,7 +328,7 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
     // least for MSW compatibility)
     wxSize size = sizeOrig;
     size.x = WidthDefault(size.x);
-    size.y = WidthDefault(size.y);
+    size.y = HeightDefault(size.y);
 
     wxTopLevelWindows.Append( this );