gens-gs/gens-gtk.patch

   1 diff -ru gens/src/gens/ui/gtk/about/about_window.cpp gens-build/src/gens/ui/gtk/about/about_window.cpp
   2 --- gens/src/gens/ui/gtk/about/about_window.cpp 2010-10-11 16:32:29.000000000 +0000
   3 +++ gens-build/src/gens/ui/gtk/about/about_window.cpp   2010-10-11 15:46:25.000000000 +0000
   4 @@ -84,7 +84,7 @@
   5         gtk_window_set_position(GTK_WINDOW(about_window), GTK_WIN_POS_CENTER);
   6         gtk_window_set_resizable(GTK_WINDOW(about_window), FALSE);
   7         gtk_window_set_type_hint(GTK_WINDOW(about_window), GDK_WINDOW_TYPE_HINT_DIALOG);
   8 -       gtk_dialog_set_has_separator(GTK_DIALOG(about_window), FALSE);
   9 +       g_object_set(GTK_DIALOG(about_window), "has-separator", FALSE, NULL);
  10
  11         // Callbacks for if the window is closed.
  12         g_signal_connect((gpointer)about_window, "delete_event",
  13 diff -ru gens/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp gens-build/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp
  14 --- gens/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp 2010-10-11 16:32:29.000000000 +0000
  15 +++ gens-build/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp   2010-10-11 15:33:03.000000000 +0000
  16 @@ -84,7 +84,7 @@
  17         gtk_window_set_position(GTK_WINDOW(bmf_window), GTK_WIN_POS_CENTER);
  18         gtk_window_set_resizable(GTK_WINDOW(bmf_window), FALSE);
  19         gtk_window_set_type_hint(GTK_WINDOW(bmf_window), GDK_WINDOW_TYPE_HINT_DIALOG);
  20 -       gtk_dialog_set_has_separator(GTK_DIALOG(bmf_window), FALSE);
  21 +       g_object_set(GTK_DIALOG(bmf_window), "has-separator", FALSE, NULL);
  22
  23         // Callbacks for if the window is closed.
  24         g_signal_connect((gpointer)bmf_window, "delete_event",
  25 diff -ru gens/src/gens/ui/gtk/directory_config/dir_window.cpp gens-build/src/gens/ui/gtk/directory_config/dir_window.cpp
  26 --- gens/src/gens/ui/gtk/directory_config/dir_window.cpp        2010-10-11 16:32:29.000000000 +0000
  27 +++ gens-build/src/gens/ui/gtk/directory_config/dir_window.cpp  2010-10-11 15:34:21.000000000 +0000
  28 @@ -109,7 +109,7 @@
  29         gtk_window_set_position(GTK_WINDOW(dir_window), GTK_WIN_POS_CENTER);
  30         gtk_window_set_resizable(GTK_WINDOW(dir_window), FALSE);
  31         gtk_window_set_type_hint(GTK_WINDOW(dir_window), GDK_WINDOW_TYPE_HINT_DIALOG);
  32 -       gtk_dialog_set_has_separator(GTK_DIALOG(dir_window), FALSE);
  33 +       g_object_set(GTK_DIALOG(dir_window), "has-separator", FALSE, NULL);
  34
  35         // Callbacks for if the window is closed.
  36         g_signal_connect((gpointer)(dir_window), "delete_event",
  37 diff -ru gens/src/gens/ui/gtk/general_options/genopt_window.cpp gens-build/src/gens/ui/gtk/general_options/genopt_window.cpp
  38 --- gens/src/gens/ui/gtk/general_options/genopt_window.cpp      2010-10-11 16:32:29.000000000 +0000
  39 +++ gens-build/src/gens/ui/gtk/general_options/genopt_window.cpp        2010-10-11 15:36:00.000000000 +0000
  40 @@ -140,7 +140,7 @@
  41         gtk_window_set_position(GTK_WINDOW(genopt_window), GTK_WIN_POS_CENTER);
  42         gtk_window_set_resizable(GTK_WINDOW(genopt_window), false);
  43         gtk_window_set_type_hint(GTK_WINDOW(genopt_window), GDK_WINDOW_TYPE_HINT_DIALOG);
  44 -       gtk_dialog_set_has_separator(GTK_DIALOG(genopt_window), false);
  45 +       g_object_set(GTK_DIALOG(genopt_window), "has-separator", false, NULL);
  46
  47         // Callbacks for if the window is closed.
  48         g_signal_connect((gpointer)genopt_window, "delete_event",
  49 @@ -458,11 +458,11 @@
  50         gtk_box_pack_start(GTK_BOX(vboxIntroEffect), lblIntroEffect, false, false, 0);
  51
  52         // Dropdown for intro effect.
  53 -       cboIntroEffect = gtk_combo_box_new_text();
  54 -       gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "None");
  55 -       gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "Gens Logo Effect");
  56 -       gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "\"Crazy\" Effect");
  57 -       //gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "Genesis TMSS"); // TODO: Broken.
  58 +       cboIntroEffect = gtk_combo_box_text_new();
  59 +       gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "None");
  60 +       gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "Gens Logo Effect");
  61 +       gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "\"Crazy\" Effect");
  62 +       //gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "Genesis TMSS"); // TODO: Broken.
  63         gtk_widget_show(cboIntroEffect);
  64         gtk_box_pack_start(GTK_BOX(vboxIntroEffect), cboIntroEffect, false, false, 0);
  65         g_signal_connect((gpointer)(cboIntroEffect), "changed",
  66 diff -ru gens/src/gens/ui/gtk/gens/gens_window_callbacks.cpp gens-build/src/gens/ui/gtk/gens/gens_window_callbacks.cpp
  67 --- gens/src/gens/ui/gtk/gens/gens_window_callbacks.cpp 2010-10-11 16:32:29.000000000 +0000
  68 +++ gens-build/src/gens/ui/gtk/gens/gens_window_callbacks.cpp   2010-10-11 15:21:28.000000000 +0000
  69 @@ -154,9 +154,9 @@
  70         GSFT_UNUSED_PARAMETER(y);
  71         GSFT_UNUSED_PARAMETER(user_data);
  72
  73 -       if (context->targets)
  74 +       if (gdk_drag_context_list_targets(context))
  75         {
  76 -               GdkAtom target_type = GDK_POINTER_TO_ATOM(g_list_nth_data(context->targets, 0));
  77 +               GdkAtom target_type = GDK_POINTER_TO_ATOM(g_list_nth_data(gdk_drag_context_list_targets(context), 0));
  78                 gtk_drag_get_data(widget, context, target_type, time);
  79                 return true;
  80         }
  81 diff -ru gens/src/gens/ui/gtk/opengl_resolution/glres_window.cpp gens-build/src/gens/ui/gtk/opengl_resolution/glres_window.cpp
  82 --- gens/src/gens/ui/gtk/opengl_resolution/glres_window.cpp     2010-10-11 16:32:29.000000000 +0000
  83 +++ gens-build/src/gens/ui/gtk/opengl_resolution/glres_window.cpp       2010-10-11 15:46:21.000000000 +0000
  84 @@ -75,7 +75,7 @@
  85         gtk_window_set_position(GTK_WINDOW(glres_window), GTK_WIN_POS_CENTER);
  86         gtk_window_set_resizable(GTK_WINDOW(glres_window), FALSE);
  87         gtk_window_set_type_hint(GTK_WINDOW(glres_window), GDK_WINDOW_TYPE_HINT_DIALOG);
  88 -       gtk_dialog_set_has_separator(GTK_DIALOG(glres_window), FALSE);
  89 +       g_object_set(GTK_DIALOG(glres_window), "has-separator", FALSE, NULL);
  90
  91         // Callbacks for if the window is closed.
  92         g_signal_connect((gpointer)(glres_window), "delete_event",
  93 diff -ru gens/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp gens-build/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp
  94 --- gens/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp 2010-10-11 16:32:29.000000000 +0000
  95 +++ gens-build/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp   2010-10-11 15:46:29.000000000 +0000
  96 @@ -80,8 +80,7 @@
  97  // Callbacks.
  98  static gboolean        pmgr_window_callback_close(GtkWidget *widget, GdkEvent *event, gpointer user_data);
  99  static void    pmgr_window_callback_response(GtkDialog *dialog, gint response_id, gpointer user_data);
 100 -static void    pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, GtkNotebookPage *page,
 101 -                                                              guint page_num, gpointer user_data);
 102 +static void    pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, guint page_num, gpointer user_data);
 103  static void    pmgr_window_callback_lstPluginList_cursor_changed(GtkTreeView *tree_view, gpointer user_data);
 104  static void    pmgr_window_callback_fraPluginDesc_size_allocate(GtkWidget *widget, GtkAllocation *allocation, gpointer user_data);
 105
 106 @@ -119,7 +118,7 @@
 107         gtk_window_set_position(GTK_WINDOW(pmgr_window), GTK_WIN_POS_CENTER);
 108         gtk_window_set_resizable(GTK_WINDOW(pmgr_window), FALSE);
 109         gtk_window_set_type_hint(GTK_WINDOW(pmgr_window), GDK_WINDOW_TYPE_HINT_DIALOG);
 110 -       gtk_dialog_set_has_separator(GTK_DIALOG(pmgr_window), FALSE);
 111 +       g_object_set(GTK_DIALOG(pmgr_window), "has-separator", FALSE, NULL);
 112
 113         // Callbacks for if the window is closed.
 114         g_signal_connect((gpointer)pmgr_window, "delete_event",
 115 @@ -559,11 +558,9 @@
 116   * @param page_num New notebook page index.
 117   * @param user_data User data.
 118   */
 119 -static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, GtkNotebookPage *page,
 120 -                                                          guint page_num, gpointer user_data)
 121 +static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, guint page_num, gpointer user_data)
 122  {
 123         GSFT_UNUSED_PARAMETER(notebook);
 124 -       GSFT_UNUSED_PARAMETER(page);
 125         GSFT_UNUSED_PARAMETER(user_data);
 126
 127         // Activate the "cursor-changed" callback for the page.
 128 diff -ru gens/src/gens/ui/gtk/select_cdrom/selcd_window.cpp gens-build/src/gens/ui/gtk/select_cdrom/selcd_window.cpp
 129 --- gens/src/gens/ui/gtk/select_cdrom/selcd_window.cpp  2010-10-11 16:32:29.000000000 +0000
 130 +++ gens-build/src/gens/ui/gtk/select_cdrom/selcd_window.cpp    2010-10-11 15:46:16.000000000 +0000
 131 @@ -94,7 +94,7 @@
 132         gtk_window_set_position(GTK_WINDOW(selcd_window), GTK_WIN_POS_CENTER);
 133         gtk_window_set_resizable(GTK_WINDOW(selcd_window), FALSE);
 134         gtk_window_set_type_hint(GTK_WINDOW(selcd_window), GDK_WINDOW_TYPE_HINT_DIALOG);
 135 -       gtk_dialog_set_has_separator(GTK_DIALOG(selcd_window), FALSE);
 136 +       g_object_set(GTK_DIALOG(selcd_window), "has-separator", FALSE, NULL);
 137
 138         // Callbacks for if the window is closed.
 139         g_signal_connect((gpointer)(selcd_window), "delete_event",
 140 @@ -128,7 +128,7 @@
 141         gtk_box_pack_start(GTK_BOX(hboxDeviceName), lblDeviceName, false, false, 0);
 142
 143         // Create the dropdown for the CD-ROM device name.
 144 -       cboDeviceName = gtk_combo_box_entry_new_text();
 145 +       cboDeviceName = gtk_combo_box_text_new_with_entry();
 146         gtk_entry_set_max_length(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(cboDeviceName))), 63);
 147         gtk_label_set_mnemonic_widget(GTK_LABEL(lblDeviceName), cboDeviceName);
 148         gtk_widget_show(cboDeviceName);
 149 @@ -156,7 +156,7 @@
 150         gtk_box_pack_start(GTK_BOX(hboxDriveSpeed), vboxDriveSpeedDropdown, true, true, 0);
 151
 152         // Create the dropdown for the CD-ROM drive speed selection.
 153 -       cboDriveSpeed = gtk_combo_box_new_text();
 154 +       cboDriveSpeed = gtk_combo_box_text_new();
 155         char tmpSpeed[16];
 156         for (unsigned int i = 0; i < ((sizeof(CD_DriveSpeed) / sizeof(CD_DriveSpeed[0])) - 1); i++)
 157         {
 158 @@ -167,7 +167,7 @@
 159                 else
 160                         szprintf(tmpSpeed, sizeof(tmpSpeed), "%dx", CD_DriveSpeed[i]);
 161
 162 -               gtk_combo_box_append_text(GTK_COMBO_BOX(cboDriveSpeed), tmpSpeed);
 163 +               gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboDriveSpeed), tmpSpeed);
 164         }
 165         gtk_widget_show(cboDriveSpeed);
 166         gtk_box_pack_start(GTK_BOX(vboxDriveSpeedDropdown), cboDriveSpeed, true, false, 0);
 167 @@ -252,7 +252,7 @@
 168                                 continue;
 169
 170                         // Add the device file.
 171 -                       gtk_combo_box_append_text(GTK_COMBO_BOX(cboDeviceName), tmpDeviceName);
 172 +                       gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboDeviceName), tmpDeviceName);
 173                 }
 174         }
 175
 176 diff -ru gens/src/mdp/misc/game_genie/gg_window_gtk2.cpp gens-build/src/mdp/misc/game_genie/gg_window_gtk2.cpp
 177 --- gens/src/mdp/misc/game_genie/gg_window_gtk2.cpp     2010-10-11 16:32:29.000000000 +0000
 178 +++ gens-build/src/mdp/misc/game_genie/gg_window_gtk2.cpp       2010-10-11 15:52:05.000000000 +0000
 179 @@ -111,7 +111,7 @@
 180         gtk_window_set_position(GTK_WINDOW(gg_window), GTK_WIN_POS_CENTER);
 181         gtk_window_set_resizable(GTK_WINDOW(gg_window), TRUE);
 182         gtk_window_set_type_hint(GTK_WINDOW(gg_window), GDK_WINDOW_TYPE_HINT_DIALOG);
 183 -       gtk_dialog_set_has_separator(GTK_DIALOG(gg_window), FALSE);
 184 +       g_object_set(GTK_DIALOG(gg_window), "has-separator", FALSE, NULL);
 185
 186         // Add the window icon.
 187         GList *icon_list = NULL;