Bring osx class naming into line with the other ports.

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

diff --git a/include/wx/osx/app.h b/include/wx/osx/app.h
index 2ebb72cc1a2577cae47f3d47ec1d7ee178733a79..47315c6b6277fee9210a6c84dde609fb2373cf30 100644 (file)
--- a/include/wx/osx/app.h
+++ b/include/wx/osx/app.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        app.h
+// Name:        wx/osx/app.h
 // Purpose:     wxApp class
 // Author:      Stefan Csomor
 // Modified by:
@@ -22,6 +22,7 @@ class WXDLLIMPEXP_FWD_CORE wxWindowMac;
 class WXDLLIMPEXP_FWD_CORE wxApp ;
 class WXDLLIMPEXP_FWD_CORE wxKeyEvent;
 class WXDLLIMPEXP_FWD_BASE wxLog;
+class WXDLLIMPEXP_FWD_CORE wxMacAutoreleasePool;
 
 // Force an exit from main loop
 void WXDLLIMPEXP_CORE wxExit();
@@ -36,9 +37,8 @@ class WXDLLIMPEXP_CORE wxApp: public wxAppBase
     DECLARE_DYNAMIC_CLASS(wxApp)
 
     wxApp();
-    virtual ~wxApp() {}
+    virtual ~wxApp();
 
-    virtual bool Yield(bool onlyIfNeeded = FALSE);
     virtual void WakeUpIdle();
 
     virtual void SetPrintMode(int mode) { m_printMode = mode; }
@@ -51,6 +51,8 @@ class WXDLLIMPEXP_CORE wxApp: public wxAppBase
     virtual bool OnInitGui();
 #endif // wxUSE_GUI
 
+    virtual int OnRun();
+
     virtual bool ProcessIdle();
 
     // implementation only
@@ -60,6 +62,7 @@ class WXDLLIMPEXP_CORE wxApp: public wxAppBase
 
 protected:
     int                   m_printMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT
+    wxMacAutoreleasePool* m_macPool;
 
 public:
 
@@ -79,6 +82,7 @@ public:
     // we want to delete and cannot do it immediately
     // TODO change semantics to be in line with cocoa (make autrelease NOT increase the count)
     void                  MacAddToAutorelease( void* cfrefobj );
+    void                  MacReleaseAutoreleasePool();
 public:
     static wxWindow*      s_captureWindow ;
     static long           s_lastModifiers ;
@@ -88,12 +92,11 @@ public:
 private:
     // mac specifics
     virtual bool        DoInitGui();
-    virtual void        DoCleanUp();  
+    virtual void        DoCleanUp();
 
     WXEVENTHANDLERREF     m_macEventHandler ;
     WXEVENTHANDLERCALLREF m_macCurrentEventHandlerCallRef ;
     WXEVENTREF            m_macCurrentEvent ;
-    CFRunLoopSourceRef    m_macEventPosted ;
 
 public:
     static long           s_macAboutMenuItemId ;