Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41341 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2006-09-21 06:27:58 +00:00
parent 0a5c89cfec
commit 3bf033e421
2 changed files with 0 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/wx/mac/carbon/app.h
View File

@@ -60,7 +60,6 @@ class WXDLLEXPORT wxApp: public wxAppBase
void MacDoOneEvent() ; void MacDoOneEvent() ;
protected: protected:
bool m_showOnInit;
int m_printMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT int m_printMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT
public: public:
@@ -77,10 +76,7 @@ public:
{ m_macCurrentEvent = event ; m_macCurrentEventHandlerCallRef = handler ; } { m_macCurrentEvent = event ; m_macCurrentEventHandlerCallRef = handler ; }
public: 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 ; static long s_lastModifiers ;
int m_nCmdShow; int m_nCmdShow;
@@ -96,27 +92,11 @@ private:
#endif #endif
public: public:
static bool s_macSupportPCMenuShortcuts ;
static long s_macAboutMenuItemId ; static long s_macAboutMenuItemId ;
static long s_macPreferencesMenuItemId ; static long s_macPreferencesMenuItemId ;
static long s_macExitMenuItemId ; static long s_macExitMenuItemId ;
static wxString s_macHelpMenuTitleName ; 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 ; } WXEVENTREF MacGetCurrentEvent() { return m_macCurrentEvent ; }
void MacHandleOneEvent( WXEVENTREF ev ) ; void MacHandleOneEvent( WXEVENTREF ev ) ;

8
src/mac/carbon/app.cpp
View File

@@ -94,13 +94,9 @@ const short kMacMinHeap = (29 * 1024) ;
const short kwxMacMenuBarResource = 1 ; const short kwxMacMenuBarResource = 1 ;
const short kwxMacAppleMenuId = 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_macAboutMenuItemId = wxID_ABOUT ;
long wxApp::s_macPreferencesMenuItemId = wxID_PREFERENCES ; long wxApp::s_macPreferencesMenuItemId = wxID_PREFERENCES ;
long wxApp::s_macExitMenuItemId = wxID_EXIT ; 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 // Mac OS X passes a process serial number command line argument when
// the application is launched from the Finder. This argument must be // the application is launched from the Finder. This argument must be
// removed from the command line arguments before being handled by the // removed from the command line arguments before being handled by the
@@ -937,8 +931,6 @@ void wxApp::CleanUp()
#endif #endif
UMACleanupToolbox() ; UMACleanupToolbox() ;
if (s_macCursorRgn)
::DisposeRgn((RgnHandle)s_macCursorRgn);
if (!sm_isEmbedded) if (!sm_isEmbedded)
RemoveEventHandler( (EventHandlerRef)(wxTheApp->m_macEventHandler) ); RemoveEventHandler( (EventHandlerRef)(wxTheApp->m_macEventHandler) );