revert updating GTK size hints when window decorations change, it messes up min size...

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

diff --git a/src/gtk/popupwin.cpp b/src/gtk/popupwin.cpp
index 604d0565c8eef72a6bfe1af7db509e6e72b3b039..a16315563ba736ce45c364fb4f077a213a0f583d 100644 (file)
--- a/src/gtk/popupwin.cpp
+++ b/src/gtk/popupwin.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        popupwin.cpp
+// Name:        src/gtk/popupwin.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -13,22 +13,13 @@
 #if wxUSE_POPUPWIN
 
 #include "wx/popupwin.h"
 #if wxUSE_POPUPWIN
 
 #include "wx/popupwin.h"

-#include "wx/frame.h"
-#include "wx/app.h"
-#include "wx/cursor.h"

 
 

-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-
-#include "wx/gtk/win_gtk.h"
+#ifndef WX_PRECOMP
+#endif // WX_PRECOMP

 
 

-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
+#include <gtk/gtk.h>

 
 

-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
+#include "wx/gtk/private/win_gtk.h"

 
 //-----------------------------------------------------------------------------
 // "button_press"
 
 //-----------------------------------------------------------------------------
 // "button_press"


@@ -39,13 +30,16 @@ static gint gtk_popup_button_press (GtkWidget *widget, GdkEvent *gdk_event, wxPo
 {
     GtkWidget *child = gtk_get_event_widget (gdk_event);
 
 {
     GtkWidget *child = gtk_get_event_widget (gdk_event);
 

-  /* We don't ask for button press events on the grab widget, so
-   *  if an event is reported directly to the grab widget, it must
-   *  be on a window outside the application (and thus we remove
-   *  the popup window). Otherwise, we check if the widget is a child
-   *  of the grab widget, and only remove the popup window if it
-   *  is not.
-   */
+    /* Ignore events sent out before we connected to the signal */
+    if (win->m_time >= ((GdkEventButton*)gdk_event)->time)
+        return FALSE;
+
+    /*  We don't ask for button press events on the grab widget, so
+     *  if an event is reported directly to the grab widget, it must
+     *  be on a window outside the application (and thus we remove
+     *  the popup window). Otherwise, we check if the widget is a child
+     *  of the grab widget, and only remove the popup window if it
+     *  is not. */

     if (child != widget)
     {
         while (child)
     if (child != widget)
     {
         while (child)


@@ -59,28 +53,12 @@ static gint gtk_popup_button_press (GtkWidget *widget, GdkEvent *gdk_event, wxPo
     wxFocusEvent event( wxEVT_KILL_FOCUS, win->GetId() );
     event.SetEventObject( win );
 
     wxFocusEvent event( wxEVT_KILL_FOCUS, win->GetId() );
     event.SetEventObject( win );
 

-    (void)win->GetEventHandler()->ProcessEvent( event );
+    (void)win->HandleWindowEvent( event );

 
     return TRUE;
 }
 }
 
 
     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)
-        wxapp_install_idle_handler();
-
-    // This disables GTK's tab traversal
-    g_signal_stop_emission_by_name (widget, "focus");
-    return TRUE;
-}
-}
-

 //-----------------------------------------------------------------------------
 // "delete_event"
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // "delete_event"
 //-----------------------------------------------------------------------------


@@ -88,9 +66,6 @@ static gint gtk_dialog_focus_callback( GtkWidget *widget, GtkDirectionType WXUNU
 extern "C" {
 bool gtk_dialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxPopupWindow *win )
 {
 extern "C" {
 bool gtk_dialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxPopupWindow *win )
 {

-    if (g_isIdle)
-        wxapp_install_idle_handler();
-

     if (win->IsEnabled())
         win->Close();
 
     if (win->IsEnabled())
         win->Close();
 


@@ -109,9 +84,6 @@ extern "C" {
 static gint
 gtk_dialog_realized_callback( GtkWidget * WXUNUSED(widget), wxPopupWindow *win )
 {
 static gint
 gtk_dialog_realized_callback( GtkWidget * WXUNUSED(widget), wxPopupWindow *win )
 {

-    if (g_isIdle)
-        wxapp_install_idle_handler();
-

     /* all this is for Motif Window Manager "hints" and is supposed to be
        recognized by other WM as well. not tested. */
     long decor = (long) GDK_DECOR_BORDER;
     /* all this is for Motif Window Manager "hints" and is supposed to be
        recognized by other WM as well. not tested. */
     long decor = (long) GDK_DECOR_BORDER;


@@ -135,14 +107,12 @@ gtk_dialog_realized_callback( GtkWidget * WXUNUSED(widget), wxPopupWindow *win )
  * virtual function here as wxWidgets requires different ways to insert
  * a child in container classes. */
 
  * virtual function here as wxWidgets requires different ways to insert
  * a child in container classes. */
 

-static void wxInsertChildInDialog( wxPopupWindow* parent, wxWindow* child )
+static void wxInsertChildInPopupWin(wxWindowGTK* parent, wxWindowGTK* 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_set_size_request(
+        child->m_widget, child->m_width, child->m_height);
+    gtk_fixed_put(
+        GTK_FIXED(parent->m_wxwindow), child->m_widget, child->m_x, child->m_y);

 
     if (parent->HasFlag(wxTAB_TRAVERSAL))
     {
 
     if (parent->HasFlag(wxTAB_TRAVERSAL))
     {


@@ -156,11 +126,11 @@ static void wxInsertChildInDialog( wxPopupWindow* parent, wxWindow* child )
 // wxPopupWindow
 //-----------------------------------------------------------------------------
 
 // wxPopupWindow
 //-----------------------------------------------------------------------------
 

-BEGIN_EVENT_TABLE(wxPopupWindow,wxPopupWindowBase)

 #ifdef __WXUNIVERSAL__
 #ifdef __WXUNIVERSAL__

+BEGIN_EVENT_TABLE(wxPopupWindow,wxPopupWindowBase)

     EVT_SIZE(wxPopupWindow::OnSize)
     EVT_SIZE(wxPopupWindow::OnSize)

-#endif

 END_EVENT_TABLE()
 END_EVENT_TABLE()

+#endif

 
 wxPopupWindow::~wxPopupWindow()
 {
 
 wxPopupWindow::~wxPopupWindow()
 {


@@ -168,13 +138,11 @@ wxPopupWindow::~wxPopupWindow()
 
 bool wxPopupWindow::Create( wxWindow *parent, int style )
 {
 
 bool wxPopupWindow::Create( wxWindow *parent, int style )
 {

-    m_needParent = FALSE;
-

     if (!PreCreation( parent, wxDefaultPosition, wxDefaultSize ) ||
         !CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("popup") ))
     {
         wxFAIL_MSG( wxT("wxPopupWindow creation failed") );
     if (!PreCreation( parent, wxDefaultPosition, wxDefaultSize ) ||
         !CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("popup") ))
     {
         wxFAIL_MSG( wxT("wxPopupWindow creation failed") );

-        return FALSE;
+        return false;

     }
 
     // Unlike windows, top level windows are created hidden by default.
     }
 
     // Unlike windows, top level windows are created hidden by default.


@@ -183,7 +151,7 @@ bool wxPopupWindow::Create( wxWindow *parent, int style )
     // All dialogs should really have this style
     m_windowStyle |= wxTAB_TRAVERSAL;
 
     // All dialogs should really have this style
     m_windowStyle |= wxTAB_TRAVERSAL;
 

-    m_insertCallback = (wxInsertChildFunction) wxInsertChildInDialog;
+    m_insertCallback = wxInsertChildInPopupWin;

 
     m_widget = gtk_window_new( GTK_WINDOW_POPUP );
 
 
     m_widget = gtk_window_new( GTK_WINDOW_POPUP );
 


@@ -195,7 +163,7 @@ bool wxPopupWindow::Create( wxWindow *parent, int style )
     g_signal_connect (m_widget, "delete_event",
                       G_CALLBACK (gtk_dialog_delete_callback), this);
 
     g_signal_connect (m_widget, "delete_event",
                       G_CALLBACK (gtk_dialog_delete_callback), this);
 

-    m_wxwindow = gtk_pizza_new();
+    m_wxwindow = wxPizza::New(m_windowStyle);

     gtk_widget_show( m_wxwindow );
     GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );
 
     gtk_widget_show( m_wxwindow );
     GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );
 


@@ -210,14 +178,12 @@ bool wxPopupWindow::Create( wxWindow *parent, int style )
     g_signal_connect (m_widget, "realize",
                       G_CALLBACK (gtk_dialog_realized_callback), this);
 
     g_signal_connect (m_widget, "realize",
                       G_CALLBACK (gtk_dialog_realized_callback), this);
 

-    // disable native tab traversal
-    g_signal_connect (m_widget, "focus",
-                      G_CALLBACK (gtk_dialog_focus_callback), this);
+    m_time = gtk_get_current_event_time();

 
     g_signal_connect (m_widget, "button_press_event",
                       G_CALLBACK (gtk_popup_button_press), this);
 
 
     g_signal_connect (m_widget, "button_press_event",
                       G_CALLBACK (gtk_popup_button_press), this);
 

-    return TRUE;
+    return true;

 }
 
 void wxPopupWindow::DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(width), int WXUNUSED(height) )
 }
 
 void wxPopupWindow::DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(width), int WXUNUSED(height) )


@@ -230,131 +196,48 @@ void wxPopupWindow::DoSetSize( int x, int y, int width, int height, int sizeFlag
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid dialog") );
     wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid dialog") );
 
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid dialog") );
     wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid dialog") );
 

-    if (m_resizing) return; /* I don't like recursions */
-    m_resizing = TRUE;
-

     int old_x = m_x;
     int old_y = m_y;
 
     int old_width = m_width;
     int old_height = m_height;
 
     int old_x = m_x;
     int old_y = m_y;
 
     int old_width = m_width;
     int old_height = m_height;
 

-    if ((sizeFlags & wxSIZE_ALLOW_MINUS_ONE) == 0)
-    {
-        if (x != -1) m_x = x;
-        if (y != -1) m_y = y;
-        if (width != -1) m_width = width;
-        if (height != -1) m_height = height;
-    }
-    else
-    {
+    if (x != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))

         m_x = x;
         m_x = x;

+    if (y != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))

         m_y = y;
         m_y = y;

+    if (width != -1)

         m_width = width;
         m_width = width;

+    if (height != -1)

         m_height = height;
         m_height = height;

-    }
-
-/*
-    if ((sizeFlags & wxSIZE_AUTO_WIDTH) == wxSIZE_AUTO_WIDTH)
-    {
-        if (width == -1) m_width = 80;
-    }
-
-    if ((sizeFlags & wxSIZE_AUTO_HEIGHT) == wxSIZE_AUTO_HEIGHT)
-    {
-       if (height == -1) m_height = 26;
-    }
-*/

 
 

-    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;
+    ConstrainSize();

 
     if ((m_x != -1) || (m_y != -1))
     {
         if ((m_x != old_x) || (m_y != old_y))
         {
 
     if ((m_x != -1) || (m_y != -1))
     {
         if ((m_x != old_x) || (m_y != old_y))
         {

-            /* we set the position here and when showing the dialog
-               for the first time in idle time */
-            gtk_widget_set_uposition( m_widget, m_x, m_y );
+            gtk_window_move( GTK_WINDOW(m_widget), m_x, m_y );

         }
     }
 
     if ((m_width != old_width) || (m_height != old_height))
     {
         }
     }
 
     if ((m_width != old_width) || (m_height != old_height))
     {

+        // gtk_window_resize does not work for GTK_WINDOW_POPUP

         gtk_widget_set_size_request( m_widget, m_width, m_height );
         gtk_widget_set_size_request( m_widget, m_width, m_height );

-
-        /* actual resizing is deferred to GtkOnSize in idle time and
-           when showing the dialog */
-        m_sizeSet = FALSE;
-
+        wxSizeEvent event(GetSize(), GetId());
+        event.SetEventObject(this);
+        HandleWindowEvent(event);

     }
     }

-
-    m_resizing = FALSE;
-}
-
-void wxPopupWindow::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height )
-{
-    // due to a bug in gtk, x,y are always 0
-    // m_x = x;
-    // m_y = y;
-
-    if ((m_height == height) && (m_width == width) && (m_sizeSet)) return;
-    if (!m_wxwindow) return;
-
-    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. Also set the to that minsize since resizing isn't possible
-       anyway. */
-
-    /* set size hints */
-    gint flag = GDK_HINT_MAX_SIZE | GDK_HINT_MIN_SIZE; // GDK_HINT_POS;
-    GdkGeometry geom;
-    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() );
-    event.SetEventObject( this );
-    GetEventHandler()->ProcessEvent( event );
-}
-
-void wxPopupWindow::OnInternalIdle()
-{
-    if (!m_sizeSet && GTK_WIDGET_REALIZED(m_wxwindow))
-        GtkOnSize( m_x, m_y, m_width, m_height );
-
-    wxWindow::OnInternalIdle();

 }
 
 bool wxPopupWindow::Show( bool show )
 {
 }
 
 bool wxPopupWindow::Show( bool show )
 {

-    if (show && !m_sizeSet)
+    if (show && !IsShown())

     {
     {

-        /* by calling GtkOnSize here, we don't have to call
-           either after showing the frame, which would entail
-           much ugly flicker nor from within the size_allocate
-           handler, because GTK 1.1.X forbids that. */
-
-        GtkOnSize( m_x, m_y, m_width, m_height );
+        wxSizeEvent event(GetSize(), GetId());
+        event.SetEventObject(this);
+        HandleWindowEvent(event);

     }
 
     bool ret = wxWindow::Show( show );
     }
 
     bool ret = wxWindow::Show( show );