X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/580616706f52835ee5ee48e6ef2ad15b822df971..9d9ad67384e5dc658c4de46e49113c321489bf81:/include/wx/mgl/app.h?ds=sidebyside

diff --git a/include/wx/mgl/app.h b/include/wx/mgl/app.h
index 526328c674..d0bedefdf4 100644
--- a/include/wx/mgl/app.h
+++ b/include/wx/mgl/app.h
@@ -3,14 +3,14 @@
 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$
-// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
+// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_APP_H__
 #define __WX_APP_H__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "app.h"
 #endif
 
@@ -24,7 +24,6 @@
 class WXDLLEXPORT wxApp;
 class WXDLLEXPORT wxLog;
 class WXDLLEXPORT wxEventLoop;
-class WXDLLEXPORT wxDesktopWindow;
 
 //-----------------------------------------------------------------------------
 // wxApp
@@ -43,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 wxIcon GetStdIcon(int which) const;
-
-    // implementation only from now on
-    void OnIdle(wxIdleEvent &event);
-    bool SendIdleEvents();
-    bool SendIdleEvents(wxWindow* win);
-
-    static bool Initialize();
-    static void CleanUp();
-
-    bool ProcessIdle();
-    void DeletePendingObjects();
-
+    virtual bool Initialize(int& argc, wxChar **argv);
+    virtual void CleanUp();
+    
+    virtual void Exit();
+    virtual void WakeUpIdle();
     virtual bool Yield(bool onlyIfNeeded = FALSE);
 
+    virtual wxVideoMode GetDisplayMode() const { return m_displayMode; }
+    virtual bool SetDisplayMode(const wxVideoMode& mode);
+
 private:
     DECLARE_DYNAMIC_CLASS(wxApp)
     DECLARE_EVENT_TABLE()
-    
-    wxEventLoop *m_mainLoop;
-};
 
-int WXDLLEXPORT wxEntry(int argc, char *argv[]);
+    wxVideoMode m_displayMode;
+};
 
 #endif // __WX_APP_H__
+