ShuriZma
/
snes9x
mirror of https://github.com/snes9xgit/snes9x.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GTK+: The build has never allowed GTK+3 < 22.

This commit is contained in:
Brandon Wright 2018-12-28 18:43:21 -06:00
parent e632740be3
commit 387d600147
2 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gtk/src/gtk_preferences.cpp
View File

@ -21,8 +21,8 @@ gboolean
snes9x_preferences_open (GtkWidget *widget, snes9x_preferences_open (GtkWidget *widget,
gpointer data) gpointer data)
{ {
Snes9xWindow *window = ((Snes9xWindow *) data); Snes9xWindow *window = ((Snes9xWindow *) data);
Snes9xConfig *config = window->config; Snes9xConfig *config = window->config;
window->pause_from_focus_change (); window->pause_from_focus_change ();
@ -58,10 +58,10 @@ event_calibrate (GtkButton *widget, gpointer data)
static void static void
event_control_toggle (GtkToggleButton *widget, gpointer data) event_control_toggle (GtkToggleButton *widget, gpointer data)
{ {
Snes9xPreferences *window = (Snes9xPreferences *) data; Snes9xPreferences *window = (Snes9xPreferences *) data;
static bool toggle_lock = false; static bool toggle_lock = false;
const gchar *name; const gchar *name;
bool state; bool state;
if (toggle_lock) if (toggle_lock)
{ {
@ -193,9 +193,9 @@ event_shader_select (GtkButton *widget, gpointer data)
{ {
#ifdef USE_OPENGL #ifdef USE_OPENGL
Snes9xPreferences *window = (Snes9xPreferences *) data; Snes9xPreferences *window = (Snes9xPreferences *) data;
GtkWidget *dialog; GtkWidget *dialog;
gint result; gint result;
GtkEntry *entry; GtkEntry *entry;
entry = GTK_ENTRY (window->get_widget ("fragment_shader")); entry = GTK_ENTRY (window->get_widget ("fragment_shader"));

14
gtk/src/gtk_s9xwindow.cpp
View File

@ -1820,11 +1820,6 @@ Snes9xWindow::center_mouse ()
#if GTK_MAJOR_VERSION < 3 #if GTK_MAJOR_VERSION < 3
gdk_display_warp_pointer (gdk_display, gdk_screen, mouse_reported_x, gdk_display_warp_pointer (gdk_display, gdk_screen, mouse_reported_x,
mouse_reported_y); mouse_reported_y);
#elif GTK_MINOR_VERSION < 20
GdkDeviceManager *manager = gdk_display_get_device_manager (gdk_display);
GdkDevice *pointer = gdk_device_manager_get_client_pointer (manager);
gdk_device_warp (pointer, gdk_screen, mouse_reported_x, mouse_reported_y);
#else #else
GdkSeat *seat = gdk_display_get_default_seat (gdk_display); GdkSeat *seat = gdk_display_get_default_seat (gdk_display);
GdkDevice *pointer = gdk_seat_get_pointer (seat); GdkDevice *pointer = gdk_seat_get_pointer (seat);
@ -1854,15 +1849,6 @@ Snes9xWindow::toggle_grab_mouse ()
if (config->pointer_is_visible) if (config->pointer_is_visible)
show_mouse_cursor (); show_mouse_cursor ();
} }
#elif GTK_MINOR_VERSION < 20
GdkDeviceManager *manager = gdk_display_get_device_manager (gdk_display);
GdkDevice *pointer = gdk_device_manager_get_client_pointer (manager);
if (!mouse_grabbed)
gdk_device_grab (pointer, gdk_window, GDK_OWNERSHIP_NONE, true,
(GdkEventMask) 1020, empty_cursor, GDK_CURRENT_TIME);
else
gdk_device_ungrab (pointer, GDK_CURRENT_TIME);
#else #else
GdkSeat *seat = gdk_display_get_default_seat (gdk_display); GdkSeat *seat = gdk_display_get_default_seat (gdk_display);