diff --git a/desmume/src/gtk-glade/callbacks.c b/desmume/src/gtk-glade/callbacks.c index 3b4f11120..eeb062b55 100755 --- a/desmume/src/gtk-glade/callbacks.c +++ b/desmume/src/gtk-glade/callbacks.c @@ -1,5 +1,4 @@ #include "callbacks.h" -#include "DeSmuME.xpm" /* globals */ uint Frameskip = 0; @@ -167,7 +166,8 @@ void on_menu_rightscreen_activate (GtkMenuItem *menuitem, gpointer user_data) /* MENU TOOLS ***** ***** ***** ***** */ void on_menu_IO_regs_activate (GtkMenuItem *menuitem, gpointer user_data) { - + GtkWidget * dlg = glade_xml_get_widget(xml_tools, "wtools_1_IOregs"); + gtk_widget_show(dlg); } diff --git a/desmume/src/gtk-glade/callbacks.h b/desmume/src/gtk-glade/callbacks.h index c71b37b89..25477e09a 100755 --- a/desmume/src/gtk-glade/callbacks.h +++ b/desmume/src/gtk-glade/callbacks.h @@ -57,5 +57,4 @@ void on_wc_2b_BG0_toggled (GtkToggleButton *togglebutton, gpointer user_data); void on_wc_2b_BG1_toggled (GtkToggleButton *togglebutton, gpointer user_data); void on_wc_2b_BG2_toggled (GtkToggleButton *togglebutton, gpointer user_data); void on_wc_2b_BG3_toggled (GtkToggleButton *togglebutton, gpointer user_data); -void on_wc_2b_BG4_toggled (GtkToggleButton *togglebutton, gpointer user_data); void on_wc_2b_OBJ_toggled (GtkToggleButton *togglebutton, gpointer user_data); diff --git a/desmume/src/gtk-glade/callbacks_IO.c b/desmume/src/gtk-glade/callbacks_IO.c index 51d23afd5..f653a67cb 100755 --- a/desmume/src/gtk-glade/callbacks_IO.c +++ b/desmume/src/gtk-glade/callbacks_IO.c @@ -68,8 +68,8 @@ int screen (GtkWidget * widget, int offset_pix) { //TODO : use pixbuf for scaling... gdk_draw_rgb_image (widget->window, - widget->style->fg_gc[widget->state],0,0,screenImage->w, screenImage->h, - GDK_RGB_DITHER_NONE,(guchar*)screenImage->pixels,screenImage->pitch); + widget->style->fg_gc[widget->state],0,0,screenImage->w, screenImage->h, + GDK_RGB_DITHER_NONE,(guchar*)screenImage->pixels,screenImage->pitch); SDL_FreeSurface(screenImage); SDL_FreeSurface(rawImage); diff --git a/desmume/src/gtk-glade/globals.h b/desmume/src/gtk-glade/globals.h index f366cb368..b37157ee6 100755 --- a/desmume/src/gtk-glade/globals.h +++ b/desmume/src/gtk-glade/globals.h @@ -28,7 +28,7 @@ gint Keypad_Temp[DESMUME_NB_KEYS]; GtkWidget * pWindow; GtkWidget * pDrawingArea; GtkWidget * pDrawingArea2; -GladeXML * xml; +GladeXML * xml, * xml_tools; /* callbacks_IO.c */ void edit_controls(); diff --git a/desmume/src/gtk-glade/main.c b/desmume/src/gtk-glade/main.c index 712ec5947..a8f9d5650 100755 --- a/desmume/src/gtk-glade/main.c +++ b/desmume/src/gtk-glade/main.c @@ -2,12 +2,13 @@ #include "callbacks.h" #include "callbacks_IO.h" +#include "dtools/callbacks_dtools.h" #include "globals.h" GtkWidget * pWindow; GtkWidget * pDrawingArea; GtkWidget * pDrawingArea2; -GladeXML * xml; +GladeXML * xml, * xml_tools; SoundInterface_struct *SNDCoreList[] = { &SNDDummy, @@ -141,13 +142,15 @@ int main(int argc, char *argv[]) { Read_ConfigFile(); /* load the interface */ - xml = glade_xml_new("DeSmuMe.glade", NULL, NULL); + xml = glade_xml_new("glade/DeSmuMe.glade", NULL, NULL); + xml_tools = glade_xml_new("glade/DeSmuMe_Dtools.glade", NULL, NULL); pWindow = glade_xml_get_widget(xml, "wMainW"); pDrawingArea = glade_xml_get_widget(xml, "wDraw_Main"); pDrawingArea2 = glade_xml_get_widget(xml, "wDraw_Sub"); /* connect the signals in the interface */ glade_xml_signal_autoconnect(xml); + glade_xml_signal_autoconnect(xml_tools); /* Vérifie la ligne de commandes */ if(commandLine_File) {