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

preferences menu implementation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2003-01-16 07:04:04 +00:00
parent ec96a73450
commit 762f58ab21
2 changed files with 106 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/mac/app.cpp
View File

@@ -109,6 +109,7 @@ pascal OSErr AEHandleODoc( const AppleEvent *event , AppleEvent *reply , long re
pascal OSErr AEHandleOApp( const AppleEvent *event , AppleEvent *reply , long refcon ) ; pascal OSErr AEHandleOApp( const AppleEvent *event , AppleEvent *reply , long refcon ) ;
pascal OSErr AEHandlePDoc( const AppleEvent *event , AppleEvent *reply , long refcon ) ; pascal OSErr AEHandlePDoc( const AppleEvent *event , AppleEvent *reply , long refcon ) ;
pascal OSErr AEHandleQuit( const AppleEvent *event , AppleEvent *reply , long refcon ) ; pascal OSErr AEHandleQuit( const AppleEvent *event , AppleEvent *reply , long refcon ) ;
pascal OSErr AEHandlePreferences( const AppleEvent *event , AppleEvent *reply , long refcon ) ;
pascal OSErr AEHandleODoc( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) ) pascal OSErr AEHandleODoc( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) )
@@ -135,6 +136,22 @@ pascal OSErr AEHandleQuit( const AppleEvent *event , AppleEvent *reply , long WX
return wxTheApp->MacHandleAEQuit( (AppleEvent*) event , reply) ; return wxTheApp->MacHandleAEQuit( (AppleEvent*) event , reply) ;
} }
pascal OSErr AEHandlePreferences( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) )
{
// GD: UNUSED wxApp* app = (wxApp*) refcon ;
wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar() ;
wxMenu* menu = NULL ;
wxMenuItem* item = NULL ;
if ( mbar )
{
item = mbar->FindItem( wxApp::s_macPreferencesMenuItemId , &menu ) ;
}
if ( item != NULL && menu != NULL && mbar != NULL )
menu->SendEvent( wxApp::s_macPreferencesMenuItemId , -1 ) ;
return noErr ;
}
// new virtual public method in wxApp // new virtual public method in wxApp
void wxApp::MacOpenFile(const wxString & WXUNUSED(fileName) ) void wxApp::MacOpenFile(const wxString & WXUNUSED(fileName) )
{ {
@@ -1154,6 +1171,18 @@ int wxApp::MainLoop()
{ {
m_keepGoing = TRUE; m_keepGoing = TRUE;
#if TARGET_CARBON
if ( UMAGetSystemVersion() >= 0x1000 )
{
if ( s_macPreferencesMenuItemId )
{
EnableMenuCommand( NULL , kHICommandPreferences ) ;
AEInstallEventHandler( kCoreEventClass , kAEShowPreferences ,
NewAEEventHandlerUPP(AEHandlePreferences) ,
(long) wxTheApp , FALSE ) ;
}
}
#endif
while (m_keepGoing) while (m_keepGoing)
{ {
MacDoOneEvent() ; MacDoOneEvent() ;
@@ -1696,31 +1725,32 @@ void wxApp::MacHandleMouseDownEvent( WXEVENTREF evr )
GrafPtr port ; GrafPtr port ;
GetPort( &port ) ; GetPort( &port ) ;
SetPortWindowPort(window) ; SetPortWindowPort(window) ;
if ( window != frontWindow && wxTheApp->s_captureWindow == NULL )
{
if ( s_macIsInModalLoop )
{
SysBeep ( 30 ) ;
}
else if ( UMAIsWindowFloating( window ) )
{
if ( win )
win->MacMouseDown( ev , windowPart ) ;
}
else
{
if ( win )
win->MacMouseDown( ev , windowPart ) ;
::SelectWindow( window ) ;
}
}
else
{
if ( win )
win->MacMouseDown( ev , windowPart ) ;
}
SetPort( port ) ; SetPort( port ) ;
} }
if ( window != frontWindow && wxTheApp->s_captureWindow == NULL )
{
if ( s_macIsInModalLoop )
{
SysBeep ( 30 ) ;
}
else if ( UMAIsWindowFloating( window ) )
{
if ( win )
win->MacMouseDown( ev , windowPart ) ;
}
else
{
if ( win )
win->MacMouseDown( ev , windowPart ) ;
::SelectWindow( window ) ;
}
}
else
{
if ( win )
win->MacMouseDown( ev , windowPart ) ;
}
break ; break ;
default: default:

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

@@ -109,6 +109,7 @@ pascal OSErr AEHandleODoc( const AppleEvent *event , AppleEvent *reply , long re
pascal OSErr AEHandleOApp( const AppleEvent *event , AppleEvent *reply , long refcon ) ; pascal OSErr AEHandleOApp( const AppleEvent *event , AppleEvent *reply , long refcon ) ;
pascal OSErr AEHandlePDoc( const AppleEvent *event , AppleEvent *reply , long refcon ) ; pascal OSErr AEHandlePDoc( const AppleEvent *event , AppleEvent *reply , long refcon ) ;
pascal OSErr AEHandleQuit( const AppleEvent *event , AppleEvent *reply , long refcon ) ; pascal OSErr AEHandleQuit( const AppleEvent *event , AppleEvent *reply , long refcon ) ;
pascal OSErr AEHandlePreferences( const AppleEvent *event , AppleEvent *reply , long refcon ) ;
pascal OSErr AEHandleODoc( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) ) pascal OSErr AEHandleODoc( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) )
@@ -135,6 +136,22 @@ pascal OSErr AEHandleQuit( const AppleEvent *event , AppleEvent *reply , long WX
return wxTheApp->MacHandleAEQuit( (AppleEvent*) event , reply) ; return wxTheApp->MacHandleAEQuit( (AppleEvent*) event , reply) ;
} }
pascal OSErr AEHandlePreferences( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) )
{
// GD: UNUSED wxApp* app = (wxApp*) refcon ;
wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar() ;
wxMenu* menu = NULL ;
wxMenuItem* item = NULL ;
if ( mbar )
{
item = mbar->FindItem( wxApp::s_macPreferencesMenuItemId , &menu ) ;
}
if ( item != NULL && menu != NULL && mbar != NULL )
menu->SendEvent( wxApp::s_macPreferencesMenuItemId , -1 ) ;
return noErr ;
}
// new virtual public method in wxApp // new virtual public method in wxApp
void wxApp::MacOpenFile(const wxString & WXUNUSED(fileName) ) void wxApp::MacOpenFile(const wxString & WXUNUSED(fileName) )
{ {
@@ -1154,6 +1171,18 @@ int wxApp::MainLoop()
{ {
m_keepGoing = TRUE; m_keepGoing = TRUE;
#if TARGET_CARBON
if ( UMAGetSystemVersion() >= 0x1000 )
{
if ( s_macPreferencesMenuItemId )
{
EnableMenuCommand( NULL , kHICommandPreferences ) ;
AEInstallEventHandler( kCoreEventClass , kAEShowPreferences ,
NewAEEventHandlerUPP(AEHandlePreferences) ,
(long) wxTheApp , FALSE ) ;
}
}
#endif
while (m_keepGoing) while (m_keepGoing)
{ {
MacDoOneEvent() ; MacDoOneEvent() ;
@@ -1696,31 +1725,32 @@ void wxApp::MacHandleMouseDownEvent( WXEVENTREF evr )
GrafPtr port ; GrafPtr port ;
GetPort( &port ) ; GetPort( &port ) ;
SetPortWindowPort(window) ; SetPortWindowPort(window) ;
if ( window != frontWindow && wxTheApp->s_captureWindow == NULL )
{
if ( s_macIsInModalLoop )
{
SysBeep ( 30 ) ;
}
else if ( UMAIsWindowFloating( window ) )
{
if ( win )
win->MacMouseDown( ev , windowPart ) ;
}
else
{
if ( win )
win->MacMouseDown( ev , windowPart ) ;
::SelectWindow( window ) ;
}
}
else
{
if ( win )
win->MacMouseDown( ev , windowPart ) ;
}
SetPort( port ) ; SetPort( port ) ;
} }
if ( window != frontWindow && wxTheApp->s_captureWindow == NULL )
{
if ( s_macIsInModalLoop )
{
SysBeep ( 30 ) ;
}
else if ( UMAIsWindowFloating( window ) )
{
if ( win )
win->MacMouseDown( ev , windowPart ) ;
}
else
{
if ( win )
win->MacMouseDown( ev , windowPart ) ;
::SelectWindow( window ) ;
}
}
else
{
if ( win )
win->MacMouseDown( ev , windowPart ) ;
}
break ; break ;
default: default: