wxVariant is in wxBase so should be forward declared using WXDLLIMPEXP_BASE and not...

[wxWidgets.git] / src / gtk1 / window.cpp

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 9bd0dc994e64d10c7966deb8ec8f3cb708d07244..345274e55d7dce1c482d79c094b96c1ba82d3713 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;

 }
 }
 
 }
 }
 


@@ -1704,6 +1704,7 @@ static gint gtk_window_button_press_callback( GtkWidget *widget,
     // GdkDisplay is a GTK+ 2.2.0 thing
 #if defined(__WXGTK20__) && GTK_CHECK_VERSION(2, 2, 0)
     if ( gdk_event->type == GDK_2BUTTON_PRESS &&
     // GdkDisplay is a GTK+ 2.2.0 thing
 #if defined(__WXGTK20__) && GTK_CHECK_VERSION(2, 2, 0)
     if ( gdk_event->type == GDK_2BUTTON_PRESS &&

+            !gtk_check_version(2,2,0) &&

             gdk_event->button >= 1 && gdk_event->button <= 3 )
     {
         // Reset GDK internal timestamp variables in order to disable GDK
             gdk_event->button >= 1 && gdk_event->button <= 3 )
     {
         // Reset GDK internal timestamp variables in order to disable GDK