Improve default size for wxGauge and wxChoice.

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

diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp
index 384f8b5d0048366b24c45f4d8736dff21b23c026..54f9b1de429bc3f67edbf1ae2f50881a0eaed2b8 100644 (file)
--- a/src/gtk/choice.cpp
+++ b/src/gtk/choice.cpp
@@ -560,7 +560,11 @@ wxSize wxChoice::DoGetBestSize() const
     if ( ret.x < 80 )
         ret.x = 80;
 
     if ( ret.x < 80 )
         ret.x = 80;
 

-    ret.y = 16 + GetCharHeight();
+    // If this request_size is called with no entries then
+    // the returned height is wrong. Give it a reasonable
+    // default value.
+    if (ret.y <= 18)
+        ret.y = 8 + GetCharHeight();

 
     return ret;
 }
 
     return ret;
 }

diff --git a/src/gtk/gauge.cpp b/src/gtk/gauge.cpp
index b6cd78c4c5a4c1905bc56b3a5e8eef5647d59999..7fe754a52e2f6a68a1ac1de0925ea6e787a1f43e 100644 (file)
--- a/src/gtk/gauge.cpp
+++ b/src/gtk/gauge.cpp
@@ -72,10 +72,10 @@ void wxGauge::DoSetGauge()
 
 wxSize wxGauge::DoGetBestSize() const
 {
 
 wxSize wxGauge::DoGetBestSize() const
 {

-    if (HasFlag(wxGA_HORIZONTAL))
-        return wxSize(100, 28);
-    else
+    if (HasFlag(wxGA_VERTICAL))

         return wxSize(28, 100);
         return wxSize(28, 100);

+    else
+        return wxSize(100, 28);

 }
 
 void wxGauge::SetRange( int range )
 }
 
 void wxGauge::SetRange( int range )

diff --git a/src/gtk1/choice.cpp b/src/gtk1/choice.cpp
index 384f8b5d0048366b24c45f4d8736dff21b23c026..54f9b1de429bc3f67edbf1ae2f50881a0eaed2b8 100644 (file)
--- a/src/gtk1/choice.cpp
+++ b/src/gtk1/choice.cpp
@@ -560,7 +560,11 @@ wxSize wxChoice::DoGetBestSize() const
     if ( ret.x < 80 )
         ret.x = 80;
 
     if ( ret.x < 80 )
         ret.x = 80;
 

-    ret.y = 16 + GetCharHeight();
+    // If this request_size is called with no entries then
+    // the returned height is wrong. Give it a reasonable
+    // default value.
+    if (ret.y <= 18)
+        ret.y = 8 + GetCharHeight();

 
     return ret;
 }
 
     return ret;
 }

diff --git a/src/gtk1/gauge.cpp b/src/gtk1/gauge.cpp
index b6cd78c4c5a4c1905bc56b3a5e8eef5647d59999..7fe754a52e2f6a68a1ac1de0925ea6e787a1f43e 100644 (file)
--- a/src/gtk1/gauge.cpp
+++ b/src/gtk1/gauge.cpp
@@ -72,10 +72,10 @@ void wxGauge::DoSetGauge()
 
 wxSize wxGauge::DoGetBestSize() const
 {
 
 wxSize wxGauge::DoGetBestSize() const
 {

-    if (HasFlag(wxGA_HORIZONTAL))
-        return wxSize(100, 28);
-    else
+    if (HasFlag(wxGA_VERTICAL))

         return wxSize(28, 100);
         return wxSize(28, 100);

+    else
+        return wxSize(100, 28);

 }
 
 void wxGauge::SetRange( int range )
 }
 
 void wxGauge::SetRange( int range )