Fix double deletion bug in wxGTK wxDVC dnd code.

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

diff --git a/src/gtk/minifram.cpp b/src/gtk/minifram.cpp
index 9febe6584f69dc900adf48144b7f4882c1edb912..e7b8f70cb30a9e1d86b0373fbfe756318ea2f162 100644 (file)
--- a/src/gtk/minifram.cpp
+++ b/src/gtk/minifram.cpp
@@ -13,7 +13,6 @@
 #if wxUSE_MINIFRAME
 
 #include "wx/minifram.h"
-#include "wx/gtk/dcclient.h"
 
 #ifndef WX_PRECOMP
     #include "wx/settings.h"
@@ -21,7 +20,10 @@
     #include "wx/image.h"
 #endif
 
+#include "wx/gtk/dcclient.h"
+
 #include <gtk/gtk.h>
+#include "wx/gtk/private/gtk2-compat.h"
 
 //-----------------------------------------------------------------------------
 // data
@@ -59,11 +61,14 @@ static wxColor LightContrastColour(const wxColour& c)
 extern "C" {
 static gboolean gtk_window_own_expose_callback(GtkWidget* widget, GdkEventExpose* gdk_event, wxMiniFrame* win)
 {
-    if (!win->m_hasVMT || gdk_event->count > 0)
+    if (!win->m_hasVMT || gdk_event->count > 0 ||
+        gdk_event->window != gtk_widget_get_window(widget))
+    {
         return false;
+    }
 
-    gtk_paint_shadow (widget->style,
-                      widget->window,
+    gtk_paint_shadow (gtk_widget_get_style(widget),
+                      gtk_widget_get_window(widget),
                       GTK_STATE_NORMAL,
                       GTK_SHADOW_OUT,
                       NULL, NULL, NULL, // FIXME: No clipping?
@@ -76,7 +81,7 @@ static gboolean gtk_window_own_expose_callback(GtkWidget* widget, GdkEventExpose
 
     wxDCImpl *impl = dc.GetImpl();
     wxClientDCImpl *gtk_impl = wxDynamicCast( impl, wxClientDCImpl );
-    gtk_impl->m_gdkwindow = widget->window; // Hack alert
+    gtk_impl->m_gdkwindow = gtk_widget_get_window(widget); // Hack alert
 
     if (style & wxRESIZE_BORDER)
     {
@@ -85,18 +90,15 @@ static gboolean gtk_window_own_expose_callback(GtkWidget* widget, GdkEventExpose
         dc.DrawRectangle( win->m_width - 14, win->m_height-14, 14, 14 );
     }
 
-    if (!win->GetTitle().empty() &&
-        ((style & wxCAPTION) ||
-         (style & wxTINY_CAPTION_HORIZ) ||
-         (style & wxTINY_CAPTION_VERT)))
+    if (win->m_miniTitle && !win->GetTitle().empty())
     {
         dc.SetFont( *wxSMALL_FONT );
 
         wxBrush brush( LightContrastColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT) ) );
         dc.SetBrush( brush );
         dc.SetPen( *wxTRANSPARENT_PEN );
-        dc.DrawRectangle( win->m_miniEdge-1, 
-                          win->m_miniEdge-1, 
+        dc.DrawRectangle( win->m_miniEdge-1,
+                          win->m_miniEdge-1,
                           win->m_width - (2*(win->m_miniEdge-1)),
                           15  );
 
@@ -106,7 +108,7 @@ static gboolean gtk_window_own_expose_callback(GtkWidget* widget, GdkEventExpose
         if (style & wxCLOSE_BOX)
             dc.DrawBitmap( win->m_closeButton, win->m_width-18, 3, true );
     }
-    
+
     return false;
 }
 }
@@ -116,9 +118,11 @@ static gboolean gtk_window_own_expose_callback(GtkWidget* widget, GdkEventExpose
 //-----------------------------------------------------------------------------
 
 extern "C" {
-static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxMiniFrame *win )
+static gboolean
+gtk_window_button_press_callback(GtkWidget* widget, GdkEventButton* gdk_event, wxMiniFrame* win)
 {
-    if (!win->m_hasVMT) return FALSE;
+    if (!win->m_hasVMT || gdk_event->window != gtk_widget_get_window(widget))
+        return false;
     if (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;
 
@@ -134,7 +138,7 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
     {
         GtkWidget *ancestor = gtk_widget_get_toplevel( widget );
 
-        GdkWindow *source = widget->window;
+        GdkWindow *source = gtk_widget_get_window(widget);
 
         int org_x = 0;
         int org_y = 0;
@@ -150,8 +154,7 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
         return TRUE;
     }
 
-    if ((style & wxCLOSE_BOX) &&
-        ((style & wxCAPTION) || (style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_VERT)))
+    if (win->m_miniTitle && (style & wxCLOSE_BOX))
     {
         if ((y > 3) && (y < 19) && (x > win->m_width-19) && (x < win->m_width-3))
         {
@@ -160,11 +163,12 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
         }
     }
 
-    if (y > win->m_miniEdge-1 + 15) return TRUE;
+    if (y >= win->m_miniEdge + win->m_miniTitle)
+        return true;
 
-    gdk_window_raise( win->m_widget->window );
+    gdk_window_raise(gtk_widget_get_window(win->m_widget));
 
-    gdk_pointer_grab( widget->window, FALSE,
+    gdk_pointer_grab( gtk_widget_get_window(widget), false,
                       (GdkEventMask)
                          (GDK_BUTTON_PRESS_MASK |
                           GDK_BUTTON_RELEASE_MASK |
@@ -172,8 +176,8 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
                           GDK_POINTER_MOTION_HINT_MASK  |
                           GDK_BUTTON_MOTION_MASK        |
                           GDK_BUTTON1_MOTION_MASK),
-                      (GdkWindow *) NULL,
-                      (GdkCursor *) NULL,
+                      NULL,
+                      NULL,
                       (unsigned int) GDK_CURRENT_TIME );
 
     win->m_diffX = x;
@@ -192,12 +196,13 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
 //-----------------------------------------------------------------------------
 
 extern "C" {
-static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxMiniFrame *win )
+static gboolean
+gtk_window_button_release_callback(GtkWidget* widget, GdkEventButton* gdk_event, wxMiniFrame* win)
 {
-    if (!win->m_hasVMT) return FALSE;
+    if (!win->m_hasVMT || gdk_event->window != gtk_widget_get_window(widget))
+        return false;
     if (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;
-
     if (!win->m_isDragging) return TRUE;
 
     win->m_isDragging = false;
@@ -208,7 +213,7 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto
     gdk_pointer_ungrab ( (guint32)GDK_CURRENT_TIME );
     int org_x = 0;
     int org_y = 0;
-    gdk_window_get_origin( widget->window, &org_x, &org_y );
+    gdk_window_get_origin(gtk_widget_get_window(widget), &org_x, &org_y);
     x += org_x - win->m_diffX;
     y += org_y - win->m_diffY;
     win->m_x = x;
@@ -226,13 +231,15 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto
 extern "C" {
 static gboolean
 gtk_window_leave_callback(GtkWidget *widget,
-                          GdkEventCrossing * WXUNUSED(gdk_event),
+                          GdkEventCrossing* gdk_event,
                           wxMiniFrame *win)
 {
     if (!win->m_hasVMT) return FALSE;
     if (g_blockEventsOnDrag) return FALSE;
+    if (gdk_event->window != gtk_widget_get_window(widget))
+        return false;
 
-    gdk_window_set_cursor( widget->window, NULL );
+    gdk_window_set_cursor(gtk_widget_get_window(widget), NULL);
 
     return FALSE;
 }
@@ -243,10 +250,11 @@ gtk_window_leave_callback(GtkWidget *widget,
 //-----------------------------------------------------------------------------
 
 extern "C" {
-static gint
+static gboolean
 gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event, wxMiniFrame *win )
 {
-    if (!win->m_hasVMT) return FALSE;
+    if (!win->m_hasVMT || gdk_event->window != gtk_widget_get_window(widget))
+        return false;
     if (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;
 
@@ -271,9 +279,10 @@ gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event,
         if (style & wxRESIZE_BORDER)
         {
             if ((x > win->m_width-14) && (y > win->m_height-14))
-               gdk_window_set_cursor( widget->window, gdk_cursor_new( GDK_BOTTOM_RIGHT_CORNER ) );
+               gdk_window_set_cursor(gtk_widget_get_window(widget), gdk_cursor_new(GDK_BOTTOM_RIGHT_CORNER));
             else
-               gdk_window_set_cursor( widget->window, NULL );
+               gdk_window_set_cursor(gtk_widget_get_window(widget), NULL);
+            win->GTKUpdateCursor(false);
         }
         return TRUE;
     }
@@ -283,7 +292,7 @@ gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event,
 
     int org_x = 0;
     int org_y = 0;
-    gdk_window_get_origin( widget->window, &org_x, &org_y );
+    gdk_window_get_origin(gtk_widget_get_window(widget), &org_x, &org_y);
     x += org_x - win->m_diffX;
     y += org_y - win->m_diffY;
     win->m_x = x;
@@ -310,7 +319,8 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
       const wxPoint &pos, const wxSize &size,
       long style, const wxString &name )
 {
-    if ((style & wxCAPTION) || (style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_VERT))
+    m_miniTitle = 0;
+    if (style & wxCAPTION)
         m_miniTitle = 16;
 
     if (style & wxRESIZE_BORDER)
@@ -346,10 +356,9 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
     m_gdkFunc = 0;
     if (style & wxRESIZE_BORDER)
        m_gdkFunc = GDK_FUNC_RESIZE;
-
-    // need to reset default size after changing m_gdkDecor
     gtk_window_set_default_size(GTK_WINDOW(m_widget), m_width, m_height);
     m_decorSize.Set(0, 0);
+    m_deferShow = false;
 
     // don't allow sizing smaller than decorations
     GdkGeometry geom;
@@ -362,8 +371,7 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
         gtk_window_set_transient_for( GTK_WINDOW(m_widget), GTK_WINDOW(m_parent->m_widget) );
     }
 
-    if ((style & wxCLOSE_BOX) &&
-        ((style & wxCAPTION) || (style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_VERT)))
+    if (m_miniTitle && (style & wxCLOSE_BOX))
     {
         wxImage img = wxBitmap((const char*)close_bits, 16, 16).ConvertToImage();
         img.Replace(0,0,0,123,123,123);
@@ -416,9 +424,9 @@ void wxMiniFrame::SetTitle( const wxString &title )
 {
     wxFrame::SetTitle( title );
 
-    GtkWidget* widget = GTK_BIN(m_widget)->child;
-    if (widget->window)
-        gdk_window_invalidate_rect(widget->window, NULL, false);
+    GdkWindow* window = gtk_widget_get_window(gtk_bin_get_child(GTK_BIN(m_widget)));
+    if (window)
+        gdk_window_invalidate_rect(window, NULL, false);
 }
 
 #endif // wxUSE_MINIFRAME