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 154369334d552aa03a7661534254c59dcbbfaae1..e4a20d93757fff44a164f9c0231f713da7051ab4 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -32,21 +32,22 @@
     #include "wx/textctrl.h"
     #include "wx/memory.h"
     #include "wx/gdicmn.h"
+    #include "wx/module.h"
 #endif
 
-#include "wx/module.h"
 #include "wx/tooltip.h"
 #include "wx/docview.h"
 #include "wx/filename.h"
+#include "wx/link.h"
 
 #include <string.h>
 
 // mac
 
 #ifndef __DARWIN__
-  #if __option(profile)
-    #include <profiler.h>
-  #endif
+    #if __option(profile)
+        #include <profiler.h>
+    #endif
 #endif
 
 // #include "apprsrc.h"
@@ -67,9 +68,8 @@
 #  include <Devices.h>
 #endif
 
-#if wxUSE_THREADS
-extern size_t g_numberOfThreads;
-#endif
+// Keep linker from discarding wxStockGDIMac
+wxFORCE_LINK_MODULE(gdiobj)
 
 // statics for implementation
 static bool s_inYield = false;
@@ -86,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 ;
@@ -810,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
@@ -933,8 +925,6 @@ void wxApp::CleanUp()
 #endif
 
     UMACleanupToolbox() ;
-    if (s_macCursorRgn)
-        ::DisposeRgn((RgnHandle)s_macCursorRgn);
 
     if (!sm_isEmbedded)
         RemoveEventHandler( (EventHandlerRef)(wxTheApp->m_macEventHandler) );