Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avoid deprecated functions with GTK3

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2012-11-09 06:17:11 +00:00
parent d4cb624111
commit c017416682
1 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/gtk/minifram.cpp
View File

@@ -193,17 +193,20 @@ gtk_window_button_press_callback(GtkWidget* widget, GdkEventButton* gdk_event, w
gdk_window_raise(gtk_widget_get_window(win->m_widget)); gdk_window_raise(gtk_widget_get_window(win->m_widget));
gdk_pointer_grab( gtk_widget_get_window(widget), false, const GdkEventMask mask = GdkEventMask(
(GdkEventMask) GDK_BUTTON_PRESS_MASK |
(GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_RELEASE_MASK |
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_POINTER_MOTION_HINT_MASK |
GDK_BUTTON_MOTION_MASK | GDK_BUTTON_MOTION_MASK |
GDK_BUTTON1_MOTION_MASK), GDK_BUTTON1_MOTION_MASK);
NULL, #ifdef __WXGTK3__
NULL, gdk_device_grab(
(unsigned int) GDK_CURRENT_TIME ); 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_diffX = x;
win->m_diffY = y; win->m_diffY = y;
@@ -235,7 +238,11 @@ gtk_window_button_release_callback(GtkWidget* widget, GdkEventButton* gdk_event,
int x = (int)gdk_event->x; int x = (int)gdk_event->x;
int y = (int)gdk_event->y; 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_x = 0;
int org_y = 0; int org_y = 0;
gdk_window_get_origin(gtk_widget_get_window(widget), &org_x, &org_y); gdk_window_get_origin(gtk_widget_get_window(widget), &org_x, &org_y);
@@ -282,20 +289,18 @@ gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event,
if (g_blockEventsOnDrag) return TRUE; if (g_blockEventsOnDrag) return TRUE;
if (g_blockEventsOnScroll) return TRUE; if (g_blockEventsOnScroll) return TRUE;
int x = int(gdk_event->x);
int y = int(gdk_event->y);
if (gdk_event->is_hint) if (gdk_event->is_hint)
{ {
int x = 0; #ifdef __WXGTK3__
int y = 0; gdk_window_get_device_position(gdk_event->window, gdk_event->device, &x, &y, NULL);
GdkModifierType state; #else
gdk_window_get_pointer(gdk_event->window, &x, &y, &state); gdk_window_get_pointer(gdk_event->window, &x, &y, NULL);
gdk_event->x = x; #endif
gdk_event->y = y;
gdk_event->state = state;
} }
int x = (int)gdk_event->x;
int y = (int)gdk_event->y;
if (!win->m_isDragging) if (!win->m_isDragging)
{ {
#ifndef __WXGTK3__ #ifndef __WXGTK3__