From 3ea1fd363fd222252b7538a639cd9d170a117d03 Mon Sep 17 00:00:00 2001 From: punkrockguy318 Date: Mon, 17 Oct 2011 18:59:18 +0000 Subject: [PATCH] sdl: fixed issue introduced with preivous commit --- src/drivers/sdl/gui.h | 2 +- src/drivers/sdl/input.cpp | 4 ++-- src/drivers/sdl/sdl-video.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/drivers/sdl/gui.h b/src/drivers/sdl/gui.h index 7345c930..a5eb1528 100644 --- a/src/drivers/sdl/gui.h +++ b/src/drivers/sdl/gui.h @@ -22,7 +22,7 @@ #define GTK #include extern GtkWidget* MainWindow; -extern GtkWidget* socket; +extern GtkWidget* evbox; extern GtkRadioAction* stateSlot; extern int GtkMouseData[3]; int InitGTKSubsystem(int argc, char** argv); diff --git a/src/drivers/sdl/input.cpp b/src/drivers/sdl/input.cpp index a9baf247..e6e15af5 100644 --- a/src/drivers/sdl/input.cpp +++ b/src/drivers/sdl/input.cpp @@ -828,8 +828,8 @@ ButtonConfigBegin() gtk_main_iteration_do(FALSE); char SDL_windowhack[128]; - if(gtk_widget_get_window(socket)) - sprintf(SDL_windowhack, "SDL_WINDOWID=%u", (unsigned int)GDK_WINDOW_XWINDOW(gtk_widget_get_window(socket))); + if(gtk_widget_get_window(evbox)) + sprintf(SDL_windowhack, "SDL_WINDOWID=%u", (unsigned int)GDK_WINDOW_XWINDOW(gtk_widget_get_window(evbox))); SDL_putenv(SDL_windowhack); } #endif diff --git a/src/drivers/sdl/sdl-video.cpp b/src/drivers/sdl/sdl-video.cpp index a59947f2..0152cbd0 100644 --- a/src/drivers/sdl/sdl-video.cpp +++ b/src/drivers/sdl/sdl-video.cpp @@ -382,7 +382,7 @@ InitVideo(FCEUGI *gi) gtk_main_iteration_do(FALSE); char SDL_windowhack[128]; - sprintf(SDL_windowhack, "SDL_WINDOWID=%u", (unsigned int)GDK_WINDOW_XWINDOW(gtk_widget_get_window(socket))); + sprintf(SDL_windowhack, "SDL_WINDOWID=%u", (unsigned int)GDK_WINDOW_XWINDOW(gtk_widget_get_window(evbox))); SDL_putenv(SDL_windowhack); // init SDL video