From 02915ec2d65b7d56492dfc2dde7604db607d9759 Mon Sep 17 00:00:00 2001 From: riccardom Date: Fri, 3 Jul 2009 19:06:13 +0000 Subject: [PATCH] The tileview depends on gtkglext so just make it a stub, not nice but works. gtk-glade is such a mess this isn't goind to be noticed :) This should fix sf.net #2813691. --- desmume/src/gtk-glade/callbacks.cpp | 6 ++++++ .../gtk-glade/dTools/callbacks_4_tileview.cpp | 20 +++++++++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/desmume/src/gtk-glade/callbacks.cpp b/desmume/src/gtk-glade/callbacks.cpp index a879a2a1d..bd5f5ee7a 100755 --- a/desmume/src/gtk-glade/callbacks.cpp +++ b/desmume/src/gtk-glade/callbacks.cpp @@ -478,10 +478,16 @@ void on_menu_palview_activate (GtkMenuItem *menuitem, gpointer user_data) GtkWidget * dlg = glade_xml_get_widget(xml_tools, "wtools_3_PalView"); gtk_widget_show(dlg); } +#ifdef GTKGLEXT_AVAILABLE void on_menu_tileview_activate (GtkMenuItem *menuitem, gpointer user_data) { GtkWidget * dlg = glade_xml_get_widget(xml_tools, "wtools_4_TileView"); gtk_widget_show(dlg); } +#else +void on_menu_tileview_activate (GtkMenuItem *menuitem, gpointer user_data) { + g_printerr("You need gtkglext for the tile viewer\n"); +} +#endif void on_menu_wtoolsXX_activate (GtkMenuItem *menuitem, gpointer user_data) { GtkWidget * w = (GtkWidget *) user_data; gtk_widget_show(w); diff --git a/desmume/src/gtk-glade/dTools/callbacks_4_tileview.cpp b/desmume/src/gtk-glade/dTools/callbacks_4_tileview.cpp index 1702f491e..dbf979c09 100755 --- a/desmume/src/gtk-glade/dTools/callbacks_4_tileview.cpp +++ b/desmume/src/gtk-glade/dTools/callbacks_4_tileview.cpp @@ -19,8 +19,8 @@ * Boston, MA 02111-1307, USA. */ -#ifdef GTKGLEXT_AVAILABLE #include "callbacks_dtools.h" +#ifdef GTKGLEXT_AVAILABLE #include "../gdk_gl.h" void init_combo_memory(GtkComboBox *combo, u8 ** addresses) { @@ -309,5 +309,21 @@ gboolean on_wDraw_Tile_expose_event (GtkWidget * w, GdkEventExpose * e, gp refresh(); return TRUE; } - +#else +void on_wtools_4_TileView_show (GtkWidget *widget, gpointer data) { +} +gboolean on_wtools_4_TileView_close (GtkWidget *widget, ...) { + return FALSE; +} +void on_wtools_4_palette_changed (GtkComboBox *combo, gpointer user_data) { +} +void on_wtools_4_palnum_value_changed (GtkSpinButton *spin, gpointer user_data) { +} +void on_wtools_4_memory_changed (GtkComboBox *combo, gpointer user_data) { +} +void on_wtools_4_rXX_toggled (GtkToggleButton *togglebutton, gpointer user_data) { +} +gboolean on_wDraw_Tile_expose_event (GtkWidget * w, GdkEventExpose * e, gpointer user_data) { + return FALSE; +} #endif