X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9dc44eff0235c5f30940f32ccc6d9d82a236e7d2..9142a5ec3f9e9232d47ef09fe4a3c96f39816dc4:/src/gtk/minifram.cpp

diff --git a/src/gtk/minifram.cpp b/src/gtk/minifram.cpp
index bd3261e2b1..6d07a6d893 100644
--- a/src/gtk/minifram.cpp
+++ b/src/gtk/minifram.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/minifram.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -81,7 +80,7 @@ static gboolean expose_event(GtkWidget* widget, GdkEventExpose* gdk_event, wxMin
 
     wxGTKCairoDC dc(cr);
 #else
-    if (!win->m_hasVMT || gdk_event->count > 0 ||
+    if (gdk_event->count > 0 ||
         gdk_event->window != gtk_widget_get_window(widget))
     {
         return false;
@@ -104,14 +103,12 @@ static gboolean expose_event(GtkWidget* widget, GdkEventExpose* gdk_event, wxMin
 
     int style = win->GetWindowStyle();
 
-#ifndef __WXGTK3__
     if (style & wxRESIZE_BORDER)
     {
         dc.SetBrush( *wxGREY_BRUSH );
         dc.SetPen( *wxTRANSPARENT_PEN );
         dc.DrawRectangle( win->m_width - 14, win->m_height-14, 14, 14 );
     }
-#endif
 
     if (win->m_miniTitle && !win->GetTitle().empty())
     {
@@ -144,7 +141,7 @@ extern "C" {
 static gboolean
 gtk_window_button_press_callback(GtkWidget* widget, GdkEventButton* gdk_event, wxMiniFrame* win)
 {
-    if (!win->m_hasVMT || gdk_event->window != gtk_widget_get_window(widget))
+    if (gdk_event->window != gtk_widget_get_window(widget))
         return false;
     if (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;
@@ -156,7 +153,6 @@ gtk_window_button_press_callback(GtkWidget* widget, GdkEventButton* gdk_event, w
     int y = (int)gdk_event->y;
     int x = (int)gdk_event->x;
 
-#ifndef __WXGTK3__
     if ((style & wxRESIZE_BORDER) &&
         (x > win->m_width-14) && (y > win->m_height-14))
     {
@@ -177,7 +173,6 @@ gtk_window_button_press_callback(GtkWidget* widget, GdkEventButton* gdk_event, w
 
         return TRUE;
     }
-#endif
 
     if (win->m_miniTitle && (style & wxCLOSE_BOX))
     {
@@ -193,17 +188,20 @@ gtk_window_button_press_callback(GtkWidget* widget, GdkEventButton* gdk_event, w
 
     gdk_window_raise(gtk_widget_get_window(win->m_widget));
 
-    gdk_pointer_grab( gtk_widget_get_window(widget), false,
-                      (GdkEventMask)
-                         (GDK_BUTTON_PRESS_MASK |
-                          GDK_BUTTON_RELEASE_MASK |
-                          GDK_POINTER_MOTION_MASK        |
-                          GDK_POINTER_MOTION_HINT_MASK  |
-                          GDK_BUTTON_MOTION_MASK        |
-                          GDK_BUTTON1_MOTION_MASK),
-                      NULL,
-                      NULL,
-                      (unsigned int) GDK_CURRENT_TIME );
+    const GdkEventMask mask = GdkEventMask(
+        GDK_BUTTON_PRESS_MASK |
+        GDK_BUTTON_RELEASE_MASK |
+        GDK_POINTER_MOTION_MASK |
+        GDK_POINTER_MOTION_HINT_MASK |
+        GDK_BUTTON_MOTION_MASK |
+        GDK_BUTTON1_MOTION_MASK);
+#ifdef __WXGTK3__
+    gdk_device_grab(
+        gdk_event->device, gdk_event->window, GDK_OWNERSHIP_NONE,
+        false, mask, NULL, gdk_event->time);
+#else
+    gdk_pointer_grab(gdk_event->window, false, mask, NULL, NULL, gdk_event->time);
+#endif
 
     win->m_diffX = x;
     win->m_diffY = y;
@@ -224,7 +222,7 @@ extern "C" {
 static gboolean
 gtk_window_button_release_callback(GtkWidget* widget, GdkEventButton* gdk_event, wxMiniFrame* win)
 {
-    if (!win->m_hasVMT || gdk_event->window != gtk_widget_get_window(widget))
+    if (gdk_event->window != gtk_widget_get_window(widget))
         return false;
     if (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;
@@ -235,7 +233,11 @@ gtk_window_button_release_callback(GtkWidget* widget, GdkEventButton* gdk_event,
     int x = (int)gdk_event->x;
     int y = (int)gdk_event->y;
 
-    gdk_pointer_ungrab ( (guint32)GDK_CURRENT_TIME );
+#ifdef __WXGTK3__
+    gdk_device_ungrab(gdk_event->device, gdk_event->time);
+#else
+    gdk_pointer_ungrab(gdk_event->time);
+#endif
     int org_x = 0;
     int org_y = 0;
     gdk_window_get_origin(gtk_widget_get_window(widget), &org_x, &org_y);
@@ -257,9 +259,8 @@ extern "C" {
 static gboolean
 gtk_window_leave_callback(GtkWidget *widget,
                           GdkEventCrossing* gdk_event,
-                          wxMiniFrame *win)
+                          wxMiniFrame*)
 {
-    if (!win->m_hasVMT) return FALSE;
     if (g_blockEventsOnDrag) return FALSE;
     if (gdk_event->window != gtk_widget_get_window(widget))
         return false;
@@ -278,28 +279,25 @@ extern "C" {
 static gboolean
 gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event, wxMiniFrame *win )
 {
-    if (!win->m_hasVMT || gdk_event->window != gtk_widget_get_window(widget))
+    if (gdk_event->window != gtk_widget_get_window(widget))
         return false;
     if (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;
 
+    int x = int(gdk_event->x);
+    int y = int(gdk_event->y);
+
     if (gdk_event->is_hint)
     {
-       int x = 0;
-       int y = 0;
-       GdkModifierType state;
-       gdk_window_get_pointer(gdk_event->window, &x, &y, &state);
-       gdk_event->x = x;
-       gdk_event->y = y;
-       gdk_event->state = state;
+#ifdef __WXGTK3__
+       gdk_window_get_device_position(gdk_event->window, gdk_event->device, &x, &y, NULL);
+#else
+       gdk_window_get_pointer(gdk_event->window, &x, &y, NULL);
+#endif
     }
 
-    int x = (int)gdk_event->x;
-    int y = (int)gdk_event->y;
-
     if (!win->m_isDragging)
     {
-#ifndef __WXGTK3__
         if (win->GetWindowStyle() & wxRESIZE_BORDER)
         {
             if ((x > win->m_width-14) && (y > win->m_height-14))
@@ -308,7 +306,6 @@ gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event,
                gdk_window_set_cursor(gtk_widget_get_window(widget), NULL);
             win->GTKUpdateCursor(false);
         }
-#endif
         return TRUE;
     }
 
@@ -340,6 +337,15 @@ static unsigned char close_bits[]={
 
 IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame,wxFrame)
 
+wxMiniFrame::~wxMiniFrame()
+{
+    if (m_widget)
+    {
+        GtkWidget* eventbox = gtk_bin_get_child(GTK_BIN(m_widget));
+        GTKDisconnect(eventbox);
+    }
+}
+
 bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
       const wxPoint &pos, const wxSize &size,
       long style, const wxString &name )
@@ -390,7 +396,7 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
     if (style & wxRESIZE_BORDER)
        m_gdkFunc = GDK_FUNC_RESIZE;
     gtk_window_set_default_size(GTK_WINDOW(m_widget), m_width, m_height);
-    m_decorSize.Set(0, 0);
+    memset(&m_decorSize, 0, sizeof(m_decorSize));
     m_deferShow = false;
 
     if (m_parent && (GTK_IS_WINDOW(m_parent->m_widget)))
@@ -428,6 +434,10 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
 void wxMiniFrame::DoGetClientSize(int* width, int* height) const
 {
     wxFrame::DoGetClientSize(width, height);
+
+    if (m_useCachedClientSize)
+        return;
+
     if (width)
     {
         *width -= 2 * m_miniEdge;