From 168c08ae117edaebb51ea1a8f6597374dc9f551e Mon Sep 17 00:00:00 2001
From: riccardom <riccardom@users.sf.net>
Date: Mon, 5 Apr 2010 14:30:46 +0000
Subject: [PATCH] Remove wx integration demo from gtk frontend

It works but since we have the 3d viewer available in the
wx frontend it does little sense to keep this here.
---
 desmume/src/gtk/Makefile.am |  5 -----
 desmume/src/gtk/main.cpp    | 45 -------------------------------------
 2 files changed, 50 deletions(-)

diff --git a/desmume/src/gtk/Makefile.am b/desmume/src/gtk/Makefile.am
index 220247a24..36fda312a 100644
--- a/desmume/src/gtk/Makefile.am
+++ b/desmume/src/gtk/Makefile.am
@@ -27,11 +27,6 @@ endif
 if HAVE_LIBOSMESA
 desmume_LDADD += $(OSMESA_LIBS)
 endif
-if HAVE_WX
-AM_CPPFLAGS += -DHAVE_WX=1 $(WX_CPPFLAGS)
-desmume_LDADD += $(WX_LIBS)
-desmume_SOURCES += ../wxdlg/wxdlg3dViewer.cpp
-endif
 
 UPDATE_DESKTOP = \
   appsdir=$(DESTDIR)$(datadir)/applications ; \
diff --git a/desmume/src/gtk/main.cpp b/desmume/src/gtk/main.cpp
index a6e71e1d0..3282009b6 100644
--- a/desmume/src/gtk/main.cpp
+++ b/desmume/src/gtk/main.cpp
@@ -57,26 +57,6 @@
 #include "gdbstub.h"
 #endif
 
-
-#ifdef HAVE_WX
-#include "wx/wx.h"
-class wxDesmumeApp : public wxApp
-{
-public:
-    //call me each frame or something.
-    //sort of an idle routine
-    static void frameUpdate()
-    {
-        if(!wxTheApp)
-            return;
-        wxDesmumeApp* self = ((wxDesmumeApp*)wxTheApp);
-        self->DeletePendingObjects();
-    }
-};
-
-IMPLEMENT_APP_NO_MAIN( wxDesmumeApp )
-#endif
-
 #ifdef HAVE_LIBOSMESA
 #include <GL/gl.h>
 #include <GL/glu.h>
@@ -129,9 +109,6 @@ static void LoadStateDialog();
 void Launch();
 void Pause();
 static void Printscreen();
-#ifdef HAVE_WX
-static void View3d();
-#endif
 static void Reset();
 static void Edit_Controls();
 static void Edit_Joystick_Controls();
@@ -261,9 +238,6 @@ static const char *ui_description =
 "    </menu>"
 "    <menu action='ToolsMenu'>"
 "      <menuitem action='ioregs'/>"
-#ifdef HAVE_WX
-"      <menuitem action='view3d'/>"
-#endif
 "    </menu>"
 "    <menu action='HelpMenu'>"
 "      <menuitem action='about'/>"
@@ -319,9 +293,6 @@ static const GtkActionEntry action_entries[] = {
       { "ViewMenu", NULL, "_View" },
 
     { "ToolsMenu", NULL, "_Tools" },
-#ifdef HAVE_WX
-      { "view3d",      NULL,      "View 3d",        NULL,       NULL,   View3d },
-#endif
 
     { "HelpMenu", NULL, "_Help" },
       { "about",      "gtk-about",        "_About",        NULL,       NULL,   About }
@@ -983,14 +954,6 @@ static void OpenRecent(GtkRecentChooser *chooser, gpointer user_data)
 }
 #endif
 
-#ifdef HAVE_WX
-static void View3d()
-{
-    driver->VIEW3D_Init();
-    driver->view3d->Launch();
-}
-#endif
-
 static void Reset()
 {
     NDS_Reset();
@@ -1809,10 +1772,6 @@ gboolean EmuLoop(gpointer data)
         }
     }
 
-#ifdef HAVE_WX
-    wxDesmumeApp::frameUpdate();
-#endif
-
     return TRUE;
 }
 
@@ -2272,10 +2231,6 @@ int main (int argc, char *argv[])
     exit(0);
   }
 
-#ifdef HAVE_WX
-  wxInitialize();
-#endif
-
   return common_gtk_main( &my_config);
 }