cleanup

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41341 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mac/carbon/app.h b/include/wx/mac/carbon/app.h
index 26c269e1e0bdcd97002ac9cb5c3bd7c9af34b6ce..0b253025bff3198b8306f2375ff5a7609a9a72a3 100644 (file)
--- a/include/wx/mac/carbon/app.h
+++ b/include/wx/mac/carbon/app.h
@@ -60,7 +60,6 @@ class WXDLLEXPORT wxApp: public wxAppBase
     void                  MacDoOneEvent() ;
 
 protected:
     void                  MacDoOneEvent() ;
 
 protected:

-    bool                  m_showOnInit;

     int                   m_printMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT
 
 public:
     int                   m_printMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT
 
 public:


@@ -77,10 +76,7 @@ public:
     { m_macCurrentEvent = event ; m_macCurrentEventHandlerCallRef = handler ; }
 
 public:
     { m_macCurrentEvent = event ; m_macCurrentEventHandlerCallRef = handler ; }
 
 public:

-    static long           sm_lastMessageTime;

     static wxWindow*      s_captureWindow ;
     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;
     static long           s_lastModifiers ;
 
     int                   m_nCmdShow;


@@ -96,27 +92,11 @@ private:
 #endif
 
 public:
 #endif
 
 public:

-    static bool           s_macSupportPCMenuShortcuts ;

     static long           s_macAboutMenuItemId ;
     static long           s_macPreferencesMenuItemId ;
     static long           s_macExitMenuItemId ;
     static wxString       s_macHelpMenuTitleName ;
 
     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 ) ;
 
     WXEVENTREF            MacGetCurrentEvent() { return m_macCurrentEvent ; }
     void                  MacHandleOneEvent( WXEVENTREF ev ) ;
 

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index 080f0dcb35b83d7113f90e50d2d6b4029607c182..abbe50cc3544ac68ee5b56e615761e0b3446f98f 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -94,13 +94,9 @@ const short kMacMinHeap = (29 * 1024) ;
 const short kwxMacMenuBarResource = 1 ;
 const short kwxMacAppleMenuId = 1 ;
 
 const short kwxMacMenuBarResource = 1 ;
 const short kwxMacAppleMenuId = 1 ;
 

-WXHRGN    wxApp::s_macCursorRgn = NULL;

 wxWindow* wxApp::s_captureWindow = NULL ;
 wxWindow* wxApp::s_captureWindow = NULL ;

-int       wxApp::s_lastMouseDown = 0 ;
-long      wxApp::sm_lastMessageTime = 0;

 long      wxApp::s_lastModifiers = 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 ;
 long      wxApp::s_macAboutMenuItemId = wxID_ABOUT ;
 long      wxApp::s_macPreferencesMenuItemId = wxID_PREFERENCES ;
 long      wxApp::s_macExitMenuItemId = wxID_EXIT ;


@@ -814,8 +810,6 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
 
 #endif
 
 
 #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
     // 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 +931,6 @@ void wxApp::CleanUp()
 #endif
 
     UMACleanupToolbox() ;
 #endif
 
     UMACleanupToolbox() ;

-    if (s_macCursorRgn)
-        ::DisposeRgn((RgnHandle)s_macCursorRgn);

 
     if (!sm_isEmbedded)
         RemoveEventHandler( (EventHandlerRef)(wxTheApp->m_macEventHandler) );
 
     if (!sm_isEmbedded)
         RemoveEventHandler( (EventHandlerRef)(wxTheApp->m_macEventHandler) );