adding 10.4 build compatibility for osx cocoa, see #10361

[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..2ebb72cc1a2577cae47f3d47ec1d7ee178733a79 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; }
 
+    // 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 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);
 
-    void                  MacDoOneEvent() ;
-
 protected:
     int                   m_printMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT
 
@@ -88,6 +87,8 @@ public:
 
 private:
     // mac specifics
+    virtual bool        DoInitGui();
+    virtual void        DoCleanUp();  
 
     WXEVENTHANDLERREF     m_macEventHandler ;
     WXEVENTHANDLERCALLREF m_macCurrentEventHandlerCallRef ;
@@ -101,7 +102,6 @@ public:
     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 );
@@ -110,7 +110,7 @@ public:
     bool    MacSendKeyUpEvent( wxWindow* focus , long keyval , long modifiers , long when , short wherex , short wherey , wxChar uniChar ) ;
     bool    MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar ) ;
     void    MacCreateKeyEvent( wxKeyEvent& event, wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar ) ;
-#if wxOSX_USE_COCOA_OR_CARBON
+#if wxOSX_USE_CARBON
     // we only have applescript on these
     virtual short         MacHandleAEODoc(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ;
     virtual short         MacHandleAEGURL(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ;