support CGGraphics Masks, switch xbm interpretation to be in line with msw

[wxWidgets.git] / src / mac / carbon / app.cpp

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index 080f0dcb35b83d7113f90e50d2d6b4029607c182..e4a20d93757fff44a164f9c0231f713da7051ab4 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -71,10 +71,6 @@
 // Keep linker from discarding wxStockGDIMac
 wxFORCE_LINK_MODULE(gdiobj)
 
-#if wxUSE_THREADS
-extern size_t g_numberOfThreads;
-#endif
-
 // statics for implementation
 static bool s_inYield = false;
 static bool s_inReceiveEvent = false ;
@@ -90,17 +86,11 @@ END_EVENT_TABLE()
 
 
 // platform specific static variables
-const short kMacMinHeap = (29 * 1024) ;
-const short kwxMacMenuBarResource = 1 ;
-const short kwxMacAppleMenuId = 1 ;
+static const short kwxMacAppleMenuId = 1 ;
 
-WXHRGN    wxApp::s_macCursorRgn = NULL;
 wxWindow* wxApp::s_captureWindow = NULL ;
-int       wxApp::s_lastMouseDown = 0 ;
-long      wxApp::sm_lastMessageTime = 0;
 long      wxApp::s_lastModifiers = 0 ;
 
-bool      wxApp::s_macSupportPCMenuShortcuts = true ;
 long      wxApp::s_macAboutMenuItemId = wxID_ABOUT ;
 long      wxApp::s_macPreferencesMenuItemId = wxID_PREFERENCES ;
 long      wxApp::s_macExitMenuItemId = wxID_EXIT ;
@@ -814,8 +804,6 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
 
 #endif
 
-    s_macCursorRgn = ::NewRgn() ;
-
     // Mac OS X passes a process serial number command line argument when
     // the application is launched from the Finder. This argument must be
     // removed from the command line arguments before being handled by the
@@ -937,8 +925,6 @@ void wxApp::CleanUp()
 #endif
 
     UMACleanupToolbox() ;
-    if (s_macCursorRgn)
-        ::DisposeRgn((RgnHandle)s_macCursorRgn);
 
     if (!sm_isEmbedded)
         RemoveEventHandler( (EventHandlerRef)(wxTheApp->m_macEventHandler) );