Removed conflicting wxEntry prototype

[wxWidgets.git] / include / wx / mac / app.h

diff --git a/include/wx/mac/app.h b/include/wx/mac/app.h
index 23b4cb0a60c638fe90ce4a403dfd8ddae495d304..99556638d1eeb04640fa3daa1b142fd39996cf71 100644 (file)
--- a/include/wx/mac/app.h
+++ b/include/wx/mac/app.h
@@ -52,8 +52,12 @@ class WXDLLEXPORT wxApp: public wxAppBase
     virtual bool Initialized();
     virtual bool Pending() ;
     virtual void Dispatch() ;
+
+    virtual void Exit();
+
     virtual bool Yield(bool onlyIfNeeded = FALSE);
     virtual bool ProcessIdle();
+    virtual void WakeUpIdle();
     
     virtual void SetPrintMode(int mode) { m_printMode = mode; }
     virtual int GetPrintMode() const { return m_printMode; }
@@ -87,10 +91,9 @@ protected:
 public:
 
     // Implementation
-    static bool Initialize();
-    static void CleanUp();
+    virtual bool Initialize(int& argc, wxChar **argv);
+    virtual void CleanUp();
     
-    void DeletePendingObjects();
     bool IsExiting() { return !m_keepGoing ; }
 #if TARGET_CARBON
     WXEVENTHANDLERREF    MacGetEventHandler() { return m_macEventHandler ; }