Don't add extra size to the height, it makes the combo way too big.

(Patch from Ricardo Pedroso.)

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

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 9bd0dc994e64d10c7966deb8ec8f3cb708d07244..950f84f25afb1bb1cdf119d445ff12792e06bb15 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -507,7 +507,7 @@ void wxgtk_combo_size_request_callback(GtkWidget *widget,
         (gcombo->button, &entry_req );
     
     requisition->width = w - entry_req.width;
         (gcombo->button, &entry_req );
     
     requisition->width = w - entry_req.width;

-    requisition->height = entry_req.height+4;  // TODO: why +4?
+    requisition->height = entry_req.height;

 }
 }
 
 }
 }
 

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 9bd0dc994e64d10c7966deb8ec8f3cb708d07244..950f84f25afb1bb1cdf119d445ff12792e06bb15 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -507,7 +507,7 @@ void wxgtk_combo_size_request_callback(GtkWidget *widget,
         (gcombo->button, &entry_req );
     
     requisition->width = w - entry_req.width;
         (gcombo->button, &entry_req );
     
     requisition->width = w - entry_req.width;

-    requisition->height = entry_req.height+4;  // TODO: why +4?
+    requisition->height = entry_req.height;

 }
 }
 
 }
 }