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

avoid gdk_cursor_new(), deprecated in GTK+ 3.16

Browse Source
This commit is contained in:
Paul Cornett
2015-11-02 08:28:18 -08:00
parent ed817dd366
commit 9f8deb74a7
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gtk/assertdlg_gtk.cpp
View File

@@ -113,7 +113,8 @@ void gtk_assert_dialog_process_backtrace (GtkAssertDialog *dlg)
{ {
/* set busy cursor */ /* set busy cursor */
GdkWindow *parent = gtk_widget_get_window(GTK_WIDGET(dlg)); GdkWindow *parent = gtk_widget_get_window(GTK_WIDGET(dlg));
GdkCursor *cur = gdk_cursor_new (GDK_WATCH); GdkDisplay* display = gdk_window_get_display(parent);
GdkCursor* cur = gdk_cursor_new_for_display(display, GDK_WATCH);
gdk_window_set_cursor (parent, cur); gdk_window_set_cursor (parent, cur);
gdk_flush (); gdk_flush ();

3
src/gtk/cursor.cpp
View File

@@ -265,7 +265,8 @@ void wxCursor::InitFromStock( wxStockCursor cursorId )
break; break;
} }
M_CURSORDATA->m_cursor = gdk_cursor_new( gdk_cur ); GdkDisplay* display = gdk_window_get_display(wxGetTopLevelGDK());
M_CURSORDATA->m_cursor = gdk_cursor_new_for_display(display, gdk_cur);
} }
#if wxUSE_IMAGE #if wxUSE_IMAGE

10
src/gtk/minifram.cpp
View File

@@ -280,10 +280,14 @@ gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event,
{ {
if (win->GetWindowStyle() & wxRESIZE_BORDER) if (win->GetWindowStyle() & wxRESIZE_BORDER)
{ {
GdkCursor* cursor = NULL;
GdkWindow* window = gtk_widget_get_window(widget);
if ((x > win->m_width-14) && (y > win->m_height-14)) if ((x > win->m_width-14) && (y > win->m_height-14))
gdk_window_set_cursor(gtk_widget_get_window(widget), gdk_cursor_new(GDK_BOTTOM_RIGHT_CORNER)); {
else GdkDisplay* display = gdk_window_get_display(window);
gdk_window_set_cursor(gtk_widget_get_window(widget), NULL); cursor = gdk_cursor_new_for_display(display, GDK_BOTTOM_RIGHT_CORNER);
}
gdk_window_set_cursor(window, cursor);
} }
return TRUE; return TRUE;
} }