1 files changed, 7 insertions, 7 deletions
diff --git a/src/wx/main.h b/src/wx/main.h
index 8a46fa0..851a061 100644
--- a/src/wx/main.h
+++ b/src/wx/main.h
@@ -45,6 +45,9 @@ class wxApp_melonDS : public wxApp
 {
 public:
     virtual bool OnInit();
+    virtual int OnExit();
+    
+    EmuThread* emuthread;
 };
 
 class MainFrame : public wxFrame
@@ -59,8 +62,6 @@ public:
 
     wxString rompath;
 
-    void CloseFromOutside();
-
 private:
     wxDECLARE_EVENT_TABLE();
 
@@ -81,7 +82,7 @@ private:
 class EmuThread : public wxThread
 {
 public:
-    EmuThread(MainFrame* parent);
+    EmuThread();
     ~EmuThread();
 
     void EmuRun() { emustatus = 1; emupaused = false; SDL_RaiseWindow(sdlwin); }
@@ -90,13 +91,13 @@ public:
 
     bool EmuIsRunning() { return (emustatus == 1) || (emustatus == 2); }
     bool EmuIsPaused() { return (emustatus == 2) && emupaused; }
+    
+    MainFrame* parent;
 
 protected:
     virtual ExitCode Entry();
     void ProcessEvents();
 
-    MainFrame* parent;
-
     SDL_Window* sdlwin;
     SDL_Renderer* sdlrend;
     SDL_Texture* sdltex;
@@ -105,8 +106,7 @@ protected:
     SDL_Rect botsrc, botdst;
 
     bool Touching;
-
-    int WindowX, WindowY;
+    int txoffset, tyoffset;
 
     void* texpixels;
     int texstride;