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

Merge pull request #238 from megari/gtk_no_deprecated 

Move away from deprecated functions in the GTK port
This commit is contained in:
bearoso 2017-10-03 15:19:50 -05:00 committed by GitHub
parent a2aacf78a0 5d6a7199bb
commit d174b82134
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gtk/src/gtk_netplay.cpp
View File

@ -149,10 +149,7 @@ S9xNetplayStartServer (void)
NPServer.SyncByReset = gui_config->netplay_sync_reset; NPServer.SyncByReset = gui_config->netplay_sync_reset;
NPServer.SendROMImageOnConnect = gui_config->netplay_send_rom; NPServer.SendROMImageOnConnect = gui_config->netplay_send_rom;
npthread = g_thread_create (S9xNetplayServerThread, npthread = g_thread_new (NULL, S9xNetplayServerThread, NULL);
NULL,
TRUE,
NULL);
/* Sleep to let the server create itself */ /* Sleep to let the server create itself */
usleep (10000); usleep (10000);

1
gtk/src/gtk_s9x.cpp
View File

@ -45,7 +45,6 @@ main (int argc, char *argv[])
{ {
struct sigaction sig_callback; struct sigaction sig_callback;
g_thread_init (NULL);
gdk_threads_init (); gdk_threads_init ();
gdk_threads_enter (); gdk_threads_enter ();

8
gtk/src/gtk_s9xwindow.cpp
View File

@ -607,9 +607,15 @@ Snes9xWindow::Snes9xWindow (Snes9xConfig *config) :
} }
else else
{ {
icon = gdk_pixbuf_new_from_inline (-1, app_icon, FALSE, NULL); GdkPixbufLoader *loader = gdk_pixbuf_loader_new ();
if (gdk_pixbuf_loader_write (loader, (const guchar *)app_icon, sizeof (app_icon), NULL) &&
gdk_pixbuf_loader_close (loader, NULL) &&
(icon = gdk_pixbuf_loader_get_pixbuf (loader)))
{
gtk_window_set_default_icon (icon); gtk_window_set_default_icon (icon);
} }
g_object_unref(loader);
}
drawing_area = GTK_DRAWING_AREA (get_widget ("drawingarea")); drawing_area = GTK_DRAWING_AREA (get_widget ("drawingarea"));
gtk_widget_set_double_buffered (GTK_WIDGET (drawing_area), FALSE); gtk_widget_set_double_buffered (GTK_WIDGET (drawing_area), FALSE);