diff options
| author | nyamatongwe <devnull@localhost> | 2015-06-05 09:13:08 +1000 |
|---|---|---|
| committer | nyamatongwe <devnull@localhost> | 2015-06-05 09:13:08 +1000 |
| commit | 5936c8959bd782a79f6215c12d5235454e82aa2f (patch) | |
| tree | 2d38ed03d1e9df404b196893bd3068dccf5068cc | |
| parent | aac2be8ef9583ddccbb18ed281d7cf525ddb7b09 (diff) | |
| download | scintilla-mirror-5936c8959bd782a79f6215c12d5235454e82aa2f.tar.gz | |
Simplified retrieval of correct display for widget and ensure works on older versions of GTK+.
| -rw-r--r-- | gtk/PlatGTK.cxx | 11 | ||||
| -rw-r--r-- | gtk/ScintillaGTK.cxx | 6 |
2 files changed, 2 insertions, 15 deletions
diff --git a/gtk/PlatGTK.cxx b/gtk/PlatGTK.cxx index 742f4ce9b..91f35a189 100644 --- a/gtk/PlatGTK.cxx +++ b/gtk/PlatGTK.cxx @@ -1338,16 +1338,7 @@ void Window::SetCursor(Cursor curs) { return; cursorLast = curs; -#if GTK_CHECK_VERSION(2,24,0) - GdkWindow *pwin = WindowFromWidget(PWidget(wid)); - if (!pwin) - return; - GdkDisplay *pdisplay = gdk_window_get_display(pwin); -#else - GdkDisplay *pdisplay = gdk_display_get_default(); -#endif - if (!pdisplay) - return; + GdkDisplay *pdisplay = gtk_widget_get_display(PWidget(wid)); GdkCursor *gdkCurs; switch (curs) { diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx index b69f5a2da..294ba975f 100644 --- a/gtk/ScintillaGTK.cxx +++ b/gtk/ScintillaGTK.cxx @@ -474,11 +474,7 @@ void ScintillaGTK::RealizeThis(GtkWidget *widget) { attrs.colormap = gtk_widget_get_colormap(widget); #endif attrs.event_mask = gtk_widget_get_events(widget) | GDK_EXPOSURE_MASK; -#if GTK_CHECK_VERSION(2,24,0) - GdkDisplay *pdisplay = gdk_window_get_display(gtk_widget_get_parent_window(widget)); -#else - GdkDisplay *pdisplay = gdk_display_get_default(); -#endif + GdkDisplay *pdisplay = gtk_widget_get_display(widget); GdkCursor *cursor = gdk_cursor_new_for_display(pdisplay, GDK_XTERM); attrs.cursor = cursor; #if GTK_CHECK_VERSION(3,0,0) |