X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9482617091b084d4ee006679a450176715d465e0..32c19f25fce3a38f9e4cf1497761fd7364d7bc62:/include/wx/mgl/app.h?ds=sidebyside

diff --git a/include/wx/mgl/app.h b/include/wx/mgl/app.h
index ea3a377ab6..d0bedefdf4 100644
--- a/include/wx/mgl/app.h
+++ b/include/wx/mgl/app.h
@@ -10,7 +10,7 @@
 #ifndef __WX_APP_H__
 #define __WX_APP_H__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "app.h"
 #endif
 
@@ -42,34 +42,22 @@ public:
     virtual bool OnInitGui();
 
     // override base class (pure) virtuals
-    virtual int MainLoop();
-    virtual void ExitMainLoop();
-    virtual bool Initialized();
-    virtual bool Pending();
-    virtual void Dispatch();
-    virtual bool ProcessIdle();
-
-    // implementation only from now on
-    void OnIdle(wxIdleEvent &event);
-    bool SendIdleEvents();
-    bool SendIdleEvents(wxWindow* win);
-
-    virtual bool Initialize(int argc, wxChar **argv);
+    virtual bool Initialize(int& argc, wxChar **argv);
     virtual void CleanUp();
-
+    
+    virtual void Exit();
+    virtual void WakeUpIdle();
     virtual bool Yield(bool onlyIfNeeded = FALSE);
 
-    virtual wxDisplayModeInfo GetDisplayMode() const { return m_displayMode; }
-    virtual bool SetDisplayMode(const wxDisplayModeInfo& mode);
+    virtual wxVideoMode GetDisplayMode() const { return m_displayMode; }
+    virtual bool SetDisplayMode(const wxVideoMode& mode);
 
 private:
     DECLARE_DYNAMIC_CLASS(wxApp)
     DECLARE_EVENT_TABLE()
-    
-    wxEventLoop *m_mainLoop;
-    wxDisplayModeInfo m_displayMode;
-};
 
-int WXDLLEXPORT wxEntry(int argc, char *argv[]);
+    wxVideoMode m_displayMode;
+};
 
 #endif // __WX_APP_H__
+