fixed problems with sometimes processing the events twice introduced in rev 1.170...

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

diff --git a/src/gtk1/popupwin.cpp b/src/gtk1/popupwin.cpp
index 4e9908879bb0aac8a15ab9567b40bb37a0e5f56f..72139ffb01ee0bfc2cd417cee19f75dd2180c4ab 100644 (file)
--- a/src/gtk1/popupwin.cpp
+++ b/src/gtk1/popupwin.cpp
@@ -7,10 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "popupwin.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -38,6 +34,7 @@ extern bool g_isIdle;
 // "button_press"
 //-----------------------------------------------------------------------------
 
+extern "C" {
 static gint gtk_popup_button_press (GtkWidget *widget, GdkEvent *gdk_event, wxPopupWindow* win )
 {
     GtkWidget *child = gtk_get_event_widget (gdk_event);
@@ -52,9 +49,9 @@ static gint gtk_popup_button_press (GtkWidget *widget, GdkEvent *gdk_event, wxPo
     if (child != widget)
     {
         while (child)
-           {
-               if (child == widget)
-                   return FALSE;
+        {
+            if (child == widget)
+                return FALSE;
             child = child->parent;
         }
     }
@@ -66,11 +63,13 @@ static gint gtk_popup_button_press (GtkWidget *widget, GdkEvent *gdk_event, wxPo
 
     return TRUE;
 }
+}
 
 //-----------------------------------------------------------------------------
 // "focus" from m_window
 //-----------------------------------------------------------------------------
 
+extern "C" {
 static gint gtk_dialog_focus_callback( GtkWidget *widget, GtkDirectionType WXUNUSED(d), wxWindow *WXUNUSED(win) )
 {
     if (g_isIdle)
@@ -80,11 +79,13 @@ static gint gtk_dialog_focus_callback( GtkWidget *widget, GtkDirectionType WXUNU
     gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "focus" );
     return TRUE;
 }
+}
 
 //-----------------------------------------------------------------------------
 // "delete_event"
 //-----------------------------------------------------------------------------
 
+extern "C" {
 bool gtk_dialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxPopupWindow *win )
 {
     if (g_isIdle)
@@ -95,24 +96,6 @@ bool gtk_dialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED
 
     return TRUE;
 }
-
-//-----------------------------------------------------------------------------
-// "size_allocate"
-//-----------------------------------------------------------------------------
-
-static void gtk_dialog_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxPopupWindow *win )
-{
-    if (g_isIdle)
-        wxapp_install_idle_handler();
-
-    if (!win->m_hasVMT) return;
-
-    if ((win->m_width != alloc->width) || (win->m_height != alloc->height))
-    {
-        win->m_width = alloc->width;
-        win->m_height = alloc->height;
-        win->GtkUpdateSize();
-    }
 }
 
 //-----------------------------------------------------------------------------
@@ -122,6 +105,7 @@ static void gtk_dialog_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation
 /* we cannot MWM hints and icons before the widget has been realized,
    so we do this directly after realization */
 
+extern "C" {
 static gint
 gtk_dialog_realized_callback( GtkWidget * WXUNUSED(widget), wxPopupWindow *win )
 {
@@ -140,6 +124,7 @@ gtk_dialog_realized_callback( GtkWidget * WXUNUSED(widget), wxPopupWindow *win )
 
     return FALSE;
 }
+}
 
 //-----------------------------------------------------------------------------
 // InsertChild for wxPopupWindow
@@ -153,11 +138,11 @@ gtk_dialog_realized_callback( GtkWidget * WXUNUSED(widget), wxPopupWindow *win )
 static void wxInsertChildInDialog( wxPopupWindow* parent, wxWindow* child )
 {
     gtk_pizza_put( GTK_PIZZA(parent->m_wxwindow),
-                     GTK_WIDGET(child->m_widget),
-                     child->m_x,
-                     child->m_y,
-                     child->m_width,
-                     child->m_height );
+                   GTK_WIDGET(child->m_widget),
+                   child->m_x,
+                   child->m_y,
+                   child->m_width,
+                   child->m_height );
 
     if (parent->HasFlag(wxTAB_TRAVERSAL))
     {
@@ -192,6 +177,9 @@ bool wxPopupWindow::Create( wxWindow *parent, int style )
         return FALSE;
     }
 
+    // Unlike windows, top level windows are created hidden by default.
+    m_isShown = false;
+
     // All dialogs should really have this style
     m_windowStyle |= wxTAB_TRAVERSAL;
 
@@ -222,17 +210,13 @@ bool wxPopupWindow::Create( wxWindow *parent, int style )
     gtk_signal_connect( GTK_OBJECT(m_widget), "realize",
                         GTK_SIGNAL_FUNC(gtk_dialog_realized_callback), (gpointer) this );
 
-    // the user resized the frame by dragging etc.
-    gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
-        GTK_SIGNAL_FUNC(gtk_dialog_size_callback), (gpointer)this );
-
     // disable native tab traversal
     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;
 }
 
@@ -327,30 +311,25 @@ void wxPopupWindow::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int
     m_width = width;
     m_height = height;
 
-    int minWidth = GetMinWidth(),
-        minHeight = GetMinHeight(),
-        maxWidth = GetMaxWidth(),
-        maxHeight = GetMaxHeight();
-
-    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;
+    /* 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. Also set the to that minsize since resizing isn't possible
+       anyway. */
 
     /* set size hints */
-    gint flag = 0; // GDK_HINT_POS;
-    if ((minWidth != -1) || (minHeight != -1)) flag |= GDK_HINT_MIN_SIZE;
-    if ((maxWidth != -1) || (maxHeight != -1)) flag |= GDK_HINT_MAX_SIZE;
+    gint flag = GDK_HINT_MAX_SIZE | GDK_HINT_MIN_SIZE; // GDK_HINT_POS;
     GdkGeometry geom;
-    geom.min_width = minWidth;
-    geom.min_height = minHeight;
-    geom.max_width = maxWidth;
-    geom.max_height = maxHeight;
+    geom.min_width = m_width;
+    geom.min_height = m_height;
+    geom.max_width = m_width;
+    geom.max_height = m_height;
     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() );
@@ -377,9 +356,9 @@ bool wxPopupWindow::Show( bool show )
 
         GtkOnSize( m_x, m_y, m_width, m_height );
     }
-    
+
     bool ret = wxWindow::Show( show );
-    
+
     return ret;
 }