Adding SetFocus to wxABI_VERSION.

[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 96a293e5483381f802c8f165cb1f24988280d481..492a71300478060951ca0c10ccd4df30caf7e619 100644 (file)
--- a/include/wx/mac/carbon/app.h
+++ b/include/wx/mac/carbon/app.h
@@ -27,11 +27,6 @@ class WXDLLEXPORT wxApp ;
 class WXDLLEXPORT wxKeyEvent;
 class WXDLLEXPORT wxLog;
 
-#define wxPRINT_WINDOWS         1
-#define wxPRINT_POSTSCRIPT      2
-
-WXDLLEXPORT_DATA(extern wxApp*) wxTheApp;
-
 // Force an exit from main loop
 void WXDLLEXPORT wxExit();
 
@@ -65,7 +60,6 @@ class WXDLLEXPORT wxApp: public wxAppBase
     void                  MacDoOneEvent() ;
 
 protected:
-    bool                  m_showOnInit;
     int                   m_printMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT
 
 public:
@@ -81,11 +75,12 @@ public:
     void MacSetCurrentEvent( WXEVENTREF event , WXEVENTHANDLERCALLREF handler )
     { m_macCurrentEvent = event ; m_macCurrentEventHandlerCallRef = handler ; }
 
+    // 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
+    void                  MacAddToAutorelease( void* cfrefobj );
 public:
-    static long           sm_lastMessageTime;
     static wxWindow*      s_captureWindow ;
-    static int            s_lastMouseDown ; // 0 = none , 1 = left , 2 = right
-    static WXHRGN         s_macCursorRgn ;
     static long           s_lastModifiers ;
 
     int                   m_nCmdShow;
@@ -101,27 +96,11 @@ private:
 #endif
 
 public:
-    static bool           s_macSupportPCMenuShortcuts ;
     static long           s_macAboutMenuItemId ;
     static long           s_macPreferencesMenuItemId ;
     static long           s_macExitMenuItemId ;
     static wxString       s_macHelpMenuTitleName ;
 
-    static bool           s_macHasAppearance ;
-    static long           s_macAppearanceVersion ;
-    static bool           s_macHasNavigation ;
-    static bool           s_macNavigationVersion ;
-    static bool           s_macHasWindowManager ;
-    static long           s_macWindowManagerVersion ;
-    static bool           s_macHasMenuManager ;
-    static long           s_macMenuManagerVersion ;
-    static bool           s_macHasDialogManager ;
-    static long           s_macDialogManagerVersion ;
-    
-    WXHRGN                m_macCursorRgn ;
-    WXHRGN                m_macSleepRgn ;
-    WXHRGN                m_macHelpRgn ;
-
     WXEVENTREF            MacGetCurrentEvent() { return m_macCurrentEvent ; }
     void                  MacHandleOneEvent( WXEVENTREF ev ) ;