rearranging contentview, adding toolbar

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

diff --git a/include/wx/osx/app.h b/include/wx/osx/app.h
index ad80d008a5f1be8cee2352f441832b1b6fd313b0..24b2504b1886fa54bc493f1463b551c78f458b27 100644 (file)
--- a/include/wx/osx/app.h
+++ b/include/wx/osx/app.h
@@ -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 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();
 
 // Force an exit from main loop
 void WXDLLIMPEXP_CORE wxExit();


@@ -36,7 +37,7 @@ class WXDLLIMPEXP_CORE wxApp: public wxAppBase
     DECLARE_DYNAMIC_CLASS(wxApp)
 
     wxApp();
     DECLARE_DYNAMIC_CLASS(wxApp)
 
     wxApp();

-    virtual ~wxApp() {}
+    virtual ~wxApp();

 
     virtual void WakeUpIdle();
 
 
     virtual void WakeUpIdle();
 


@@ -50,6 +51,8 @@ class WXDLLIMPEXP_CORE wxApp: public wxAppBase
     virtual bool OnInitGui();
 #endif // wxUSE_GUI
 
     virtual bool OnInitGui();
 #endif // wxUSE_GUI
 

+    virtual int OnRun();
+

     virtual bool ProcessIdle();
 
     // implementation only
     virtual bool ProcessIdle();
 
     // implementation only


@@ -59,6 +62,7 @@ class WXDLLIMPEXP_CORE wxApp: public wxAppBase
 
 protected:
     int                   m_printMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT
 
 protected:
     int                   m_printMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT

+    wxMacAutoreleasePool* m_macPool;

 
 public:
 
 
 public:
 


@@ -66,7 +70,6 @@ public:
     // Implementation
     virtual bool Initialize(int& argc, wxChar **argv);
     virtual void CleanUp();
     // Implementation
     virtual bool Initialize(int& argc, wxChar **argv);
     virtual void CleanUp();

-    virtual bool DoYield(bool onlyIfNeeded, long eventsToProcess);

 
     // the installed application event handler
     WXEVENTHANDLERREF    MacGetEventHandler() { return m_macEventHandler ; }
 
     // the installed application event handler
     WXEVENTHANDLERREF    MacGetEventHandler() { return m_macEventHandler ; }


@@ -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 );
     // 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 ;
 public:
     static wxWindow*      s_captureWindow ;
     static long           s_lastModifiers ;