vertically centered miniframe close button

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

diff --git a/src/gtk/popupwin.cpp b/src/gtk/popupwin.cpp
index 47a877cd71a05740909db92095ae6a2a34c4190c..8d1a10b4f9cc78d04e7112466ee1238b0f8a3f2b 100644 (file)
--- a/src/gtk/popupwin.cpp
+++ b/src/gtk/popupwin.cpp
@@ -16,11 +16,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
+    #include "wx/frame.h"
+    #include "wx/cursor.h"
 #endif // WX_PRECOMP
 
-#include "wx/frame.h"
-#include "wx/cursor.h"
-
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
@@ -77,7 +76,6 @@ static gint gtk_dialog_focus_callback( GtkWidget *widget, GtkDirectionType WXUNU
         wxapp_install_idle_handler();
 
     /* This disables GTK's tab traversal */
-    g_signal_stop_emission_by_name (widget, "focus");
     return TRUE;
 }
 }
@@ -303,18 +301,11 @@ void wxPopupWindow::DoSetSize( int x, int y, int width, int height, int sizeFlag
     m_resizing = false;
 }
 
-void wxPopupWindow::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height )
+void wxPopupWindow::GtkOnSize()
 {
-    // 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_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
@@ -344,7 +335,7 @@ void wxPopupWindow::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int
 void wxPopupWindow::OnInternalIdle()
 {
     if (!m_sizeSet && GTK_WIDGET_REALIZED(m_wxwindow))
-        GtkOnSize( m_x, m_y, m_width, m_height );
+        GtkOnSize();
 
     wxWindow::OnInternalIdle();
 }
@@ -358,7 +349,7 @@ bool wxPopupWindow::Show( bool show )
            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 );
+        GtkOnSize();
     }
 
     bool ret = wxWindow::Show( show );