Small fixes for compiling Cygwin (with --disable-sockets)

[wxWidgets.git] / src / gtk / popupwin.cpp

diff --git a/src/gtk/popupwin.cpp b/src/gtk/popupwin.cpp
index 4e9908879bb0aac8a15ab9567b40bb37a0e5f56f..9593f43a573284e9b63492fd6b8b03783941833e 100644 (file)
--- a/src/gtk/popupwin.cpp
+++ b/src/gtk/popupwin.cpp
@@ -230,8 +230,8 @@ bool wxPopupWindow::Create( wxWindow *parent, int style )
     gtk_signal_connect( GTK_OBJECT(m_widget), "focus",
         GTK_SIGNAL_FUNC(gtk_dialog_focus_callback), (gpointer)this );
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "focus",
         GTK_SIGNAL_FUNC(gtk_dialog_focus_callback), (gpointer)this );
 

-    g_signal_connect (GTK_OBJECT(m_widget), "button_press_event",
-                   G_CALLBACK(gtk_popup_button_press), (gpointer)this );
+    gtk_signal_connect (GTK_OBJECT(m_widget), "button_press_event",
+        GTK_SIGNAL_FUNC(gtk_popup_button_press), (gpointer)this );

         
     return TRUE;
 }
         
     return TRUE;
 }


@@ -327,30 +327,30 @@ void wxPopupWindow::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int
     m_width = width;
     m_height = height;
 
     m_width = width;
     m_height = height;
 

+    /* FIXME: is this a hack? */
+    /* since for some reason GTK will revert to using maximum size ever set
+       for this window, we have to set geometry hints maxsize to match
+       size given. */

     int minWidth = GetMinWidth(),
     int minWidth = GetMinWidth(),

-        minHeight = GetMinHeight(),
-        maxWidth = GetMaxWidth(),
-        maxHeight = GetMaxHeight();
+        minHeight = GetMinHeight();

 
     if ((minWidth != -1) && (m_width < minWidth)) m_width = minWidth;
     if ((minHeight != -1) && (m_height < minHeight)) m_height = minHeight;
 
     if ((minWidth != -1) && (m_width < minWidth)) m_width = minWidth;
     if ((minHeight != -1) && (m_height < minHeight)) m_height = minHeight;

-    if ((maxWidth != -1) && (m_width > maxWidth)) m_width = maxWidth;
-    if ((maxHeight != -1) && (m_height > maxHeight)) m_height = maxHeight;

 
     /* set size hints */
 
     /* set size hints */

-    gint flag = 0; // GDK_HINT_POS;
+    gint flag = GDK_HINT_MAX_SIZE; // GDK_HINT_POS;

     if ((minWidth != -1) || (minHeight != -1)) flag |= GDK_HINT_MIN_SIZE;
     if ((minWidth != -1) || (minHeight != -1)) flag |= GDK_HINT_MIN_SIZE;

-    if ((maxWidth != -1) || (maxHeight != -1)) flag |= GDK_HINT_MAX_SIZE;

     GdkGeometry geom;
     geom.min_width = minWidth;
     geom.min_height = minHeight;
     GdkGeometry geom;
     geom.min_width = minWidth;
     geom.min_height = minHeight;

-    geom.max_width = maxWidth;
-    geom.max_height = maxHeight;
+    geom.max_width = m_width;
+    geom.max_height = m_height;

     gtk_window_set_geometry_hints( GTK_WINDOW(m_widget),
                                    (GtkWidget*) NULL,
                                    &geom,
                                    (GdkWindowHints) flag );
 
     gtk_window_set_geometry_hints( GTK_WINDOW(m_widget),
                                    (GtkWidget*) NULL,
                                    &geom,
                                    (GdkWindowHints) flag );
 

+

     m_sizeSet = TRUE;
 
     wxSizeEvent event( wxSize(m_width,m_height), GetId() );
     m_sizeSet = TRUE;
 
     wxSizeEvent event( wxSize(m_width,m_height), GetId() );