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

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.

This commit is contained in:
riccardom 2009-07-03 19:06:13 +00:00
parent 4c42b9ebaf
commit 02915ec2d6
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
desmume/src/gtk-glade/callbacks.cpp
View File

@ -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"); GtkWidget * dlg = glade_xml_get_widget(xml_tools, "wtools_3_PalView");
gtk_widget_show(dlg); gtk_widget_show(dlg);
} }
#ifdef GTKGLEXT_AVAILABLE
void on_menu_tileview_activate (GtkMenuItem *menuitem, gpointer user_data) { void on_menu_tileview_activate (GtkMenuItem *menuitem, gpointer user_data) {
GtkWidget * dlg = glade_xml_get_widget(xml_tools, "wtools_4_TileView"); GtkWidget * dlg = glade_xml_get_widget(xml_tools, "wtools_4_TileView");
gtk_widget_show(dlg); 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) { void on_menu_wtoolsXX_activate (GtkMenuItem *menuitem, gpointer user_data) {
GtkWidget * w = (GtkWidget *) user_data; GtkWidget * w = (GtkWidget *) user_data;
gtk_widget_show(w); gtk_widget_show(w);

20
desmume/src/gtk-glade/dTools/callbacks_4_tileview.cpp
View File

@ -19,8 +19,8 @@
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#ifdef GTKGLEXT_AVAILABLE
#include "callbacks_dtools.h" #include "callbacks_dtools.h"
#ifdef GTKGLEXT_AVAILABLE
#include "../gdk_gl.h" #include "../gdk_gl.h"
void init_combo_memory(GtkComboBox *combo, u8 ** addresses) { void init_combo_memory(GtkComboBox *combo, u8 ** addresses) {
@ -309,5 +309,21 @@ gboolean on_wDraw_Tile_expose_event (GtkWidget * w, GdkEventExpose * e, gp
refresh(); refresh();
return TRUE; 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 #endif