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

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.
This commit is contained in:
riccardom 2010-04-05 14:30:46 +00:00
parent b12c226333
commit 168c08ae11
2 changed files with 0 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
desmume/src/gtk/Makefile.am
View File

@ -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 ; \

45
desmume/src/gtk/main.cpp
View File

@ -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);
}