typo fix

[wxWidgets.git] / include / wx / osx / carbon / app.h

diff --git a/include/wx/osx/carbon/app.h b/include/wx/osx/carbon/app.h
index c5b56e8e0bb83309c54940ada706bcb5689e3c0e..5f6321dc466c05e8fe4401c6d1e9bb29f7c53317 100644 (file)
--- a/include/wx/osx/carbon/app.h
+++ b/include/wx/osx/carbon/app.h
@@ -44,21 +44,20 @@ class WXDLLIMPEXP_CORE wxApp: public wxAppBase
     virtual void SetPrintMode(int mode) { m_printMode = mode; }
     virtual int GetPrintMode() const { return m_printMode; }
 
     virtual void SetPrintMode(int mode) { m_printMode = mode; }
     virtual int GetPrintMode() const { return m_printMode; }
 

+    // calling OnInit with an auto-release pool ready ...
+    virtual bool CallOnInit();

 #if wxUSE_GUI
     // setting up all MacOS Specific Event-Handlers etc
     virtual bool OnInitGui();
 #endif // wxUSE_GUI
 #if wxUSE_GUI
     // setting up all MacOS Specific Event-Handlers etc
     virtual bool OnInitGui();
 #endif // wxUSE_GUI

-#if wxOSX_USE_IPHONE
-    virtual bool CallOnInit();
-    virtual int OnRun();
-#endif
+
+    virtual bool ProcessIdle();
+

     // implementation only
     void OnIdle(wxIdleEvent& event);
     void OnEndSession(wxCloseEvent& event);
     void OnQueryEndSession(wxCloseEvent& event);
 
     // implementation only
     void OnIdle(wxIdleEvent& event);
     void OnEndSession(wxCloseEvent& event);
     void OnQueryEndSession(wxCloseEvent& event);
 

-    void                  MacDoOneEvent() ;
-

 protected:
     int                   m_printMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT
 
 protected:
     int                   m_printMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT
 


@@ -88,6 +87,8 @@ public:
 
 private:
     // mac specifics
 
 private:
     // mac specifics

+    virtual bool        DoInitGui();
+    virtual void        DoCleanUp();  

 
     WXEVENTHANDLERREF     m_macEventHandler ;
     WXEVENTHANDLERCALLREF m_macCurrentEventHandlerCallRef ;
 
     WXEVENTHANDLERREF     m_macEventHandler ;
     WXEVENTHANDLERCALLREF m_macCurrentEventHandlerCallRef ;


@@ -101,7 +102,6 @@ public:
     static wxString       s_macHelpMenuTitleName ;
 
     WXEVENTREF            MacGetCurrentEvent() { return m_macCurrentEvent ; }
     static wxString       s_macHelpMenuTitleName ;
 
     WXEVENTREF            MacGetCurrentEvent() { return m_macCurrentEvent ; }

-    void                  MacHandleOneEvent( WXEVENTREF ev ) ;

 
     // For embedded use. By default does nothing.
     virtual void          MacHandleUnhandledEvent( WXEVENTREF ev );
 
     // For embedded use. By default does nothing.
     virtual void          MacHandleUnhandledEvent( WXEVENTREF ev );