From: Robert Roebling <robert@roebling.de>
Date: Mon, 16 Oct 2006 21:44:22 +0000 (+0000)
Subject:  Correct wxComboBox height in wxToolbar for old
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/0a82ca5b33982736cad2958497237348d98468cb

 Correct wxComboBox height in wxToolbar for old
   GtkCombo-based implementation.


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

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index f2022e177e..de71af2416 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -438,10 +438,16 @@ void wxgtk_combo_size_request_callback(GtkWidget *widget,
     GtkRequisition entry_req;
     entry_req.width = 2;
     entry_req.height = 2;
-    (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(gcombo->button) )->size_request )
-        (gcombo->button, &entry_req );
+    (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(gcombo->entry) )->size_request )
+        (gcombo->entry, &entry_req );
 
-    requisition->width = w - entry_req.width;
+    GtkRequisition button_req;
+    button_req.width = 2;
+    button_req.height = 2;
+    (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(gcombo->button) )->size_request )
+        (gcombo->button, &button_req );
+        
+    requisition->width = w - button_req.width;
     requisition->height = entry_req.height;
 }
 }