Clear columns on destruction

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

diff --git a/include/wx/mac/carbon/app.h b/include/wx/mac/carbon/app.h
index 00d42f2ad8eb353041eb47bf293512786dee3b45..66796866a4ba8428daf73e014095d394065cdcaa 100644 (file)
--- a/include/wx/mac/carbon/app.h
+++ b/include/wx/mac/carbon/app.h
@@ -17,25 +17,21 @@
 #include "wx/gdicmn.h"
 #include "wx/event.h"
 
 #include "wx/gdicmn.h"
 #include "wx/event.h"
 

-#ifdef __WXMAC_OSX__
-typedef struct __CFRunLoopSource * CFRunLoopSourceRef;
-#endif
-

 class WXDLLIMPEXP_FWD_CORE wxFrame;
 class WXDLLIMPEXP_FWD_CORE wxWindowMac;
 class WXDLLIMPEXP_FWD_CORE wxApp ;
 class WXDLLIMPEXP_FWD_CORE wxKeyEvent;
 class WXDLLIMPEXP_FWD_CORE wxFrame;
 class WXDLLIMPEXP_FWD_CORE wxWindowMac;
 class WXDLLIMPEXP_FWD_CORE wxApp ;
 class WXDLLIMPEXP_FWD_CORE wxKeyEvent;

-class WXDLLIMPEXP_FWD_CORE wxLog;
+class WXDLLIMPEXP_FWD_BASE wxLog;

 
 // Force an exit from main loop
 
 // Force an exit from main loop

-void WXDLLEXPORT wxExit();
+void WXDLLIMPEXP_CORE wxExit();

 
 // Yield to other apps/messages
 
 // Yield to other apps/messages

-bool WXDLLEXPORT wxYield();
+bool WXDLLIMPEXP_CORE wxYield();

 
 // Represents the application. Derive OnInit and declare
 // a new App object to start application
 
 // Represents the application. Derive OnInit and declare
 // a new App object to start application

-class WXDLLEXPORT wxApp: public wxAppBase
+class WXDLLIMPEXP_CORE wxApp: public wxAppBase

 {
     DECLARE_DYNAMIC_CLASS(wxApp)
 
 {
     DECLARE_DYNAMIC_CLASS(wxApp)
 


@@ -78,6 +74,7 @@ public:
     // adding a CFType object to be released only at the end of the current event cycle (increases the
     // refcount of the object passed), needed in case we are in the middle of an event concering an object
     // we want to delete and cannot do it immediately
     // adding a CFType object to be released only at the end of the current event cycle (increases the
     // refcount of the object passed), needed in case we are in the middle of an event concering an object
     // 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 );
 public:
     static wxWindow*      s_captureWindow ;
     void                  MacAddToAutorelease( void* cfrefobj );
 public:
     static wxWindow*      s_captureWindow ;


@@ -91,9 +88,7 @@ private:
     WXEVENTHANDLERREF     m_macEventHandler ;
     WXEVENTHANDLERCALLREF m_macCurrentEventHandlerCallRef ;
     WXEVENTREF            m_macCurrentEvent ;
     WXEVENTHANDLERREF     m_macEventHandler ;
     WXEVENTHANDLERCALLREF m_macCurrentEventHandlerCallRef ;
     WXEVENTREF            m_macCurrentEvent ;

-#ifdef __WXMAC_OSX__

     CFRunLoopSourceRef    m_macEventPosted ;
     CFRunLoopSourceRef    m_macEventPosted ;

-#endif

 
 public:
     static long           s_macAboutMenuItemId ;
 
 public:
     static long           s_macAboutMenuItemId ;


@@ -129,6 +124,9 @@ public:
     // in response of a reopen-application apple event
     virtual void         MacReopenApp() ;
 
     // in response of a reopen-application apple event
     virtual void         MacReopenApp() ;
 

+    // Hide the application windows the same as the system hide command would do it.
+    void MacHideApp();
+

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };