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/trunk@18766 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2003-01-16 06:54:47 +00:00
parent ce72eadb4d
commit 5ab6aab880
2 changed files with 70 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/mac/app.cpp
View File

@@ -113,6 +113,7 @@ pascal OSErr AEHandleODoc( const AppleEvent *event , AppleEvent *reply , long re
pascal OSErr AEHandleOApp( 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 AEHandlePreferences( const AppleEvent *event , AppleEvent *reply , long refcon ) ;
pascal OSErr AEHandleODoc( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) )
@@ -139,6 +140,22 @@ pascal OSErr AEHandleQuit( const AppleEvent *event , AppleEvent *reply , long WX
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
void wxApp::MacOpenFile(const wxString & fileName )
{
@@ -1183,14 +1200,26 @@ bool wxApp::Initialized()
int wxApp::MainLoop()
{
m_keepGoing = TRUE;
m_keepGoing = TRUE;
while (m_keepGoing)
{
MacDoOneEvent() ;
}
#if TARGET_CARBON
if ( UMAGetSystemVersion() >= 0x1000 )
{
if ( s_macPreferencesMenuItemId )
{
EnableMenuCommand( NULL , kHICommandPreferences ) ;
AEInstallEventHandler( kCoreEventClass , kAEShowPreferences ,
NewAEEventHandlerUPP(AEHandlePreferences) ,
(long) wxTheApp , FALSE ) ;
}
}
#endif
while (m_keepGoing)
{
MacDoOneEvent() ;
}
return 0;
return 0;
}
// Returns TRUE if more time is needed.

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

@@ -113,6 +113,7 @@ pascal OSErr AEHandleODoc( const AppleEvent *event , AppleEvent *reply , long re
pascal OSErr AEHandleOApp( 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 AEHandlePreferences( const AppleEvent *event , AppleEvent *reply , long refcon ) ;
pascal OSErr AEHandleODoc( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) )
@@ -139,6 +140,22 @@ pascal OSErr AEHandleQuit( const AppleEvent *event , AppleEvent *reply , long WX
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
void wxApp::MacOpenFile(const wxString & fileName )
{
@@ -1183,14 +1200,26 @@ bool wxApp::Initialized()
int wxApp::MainLoop()
{
m_keepGoing = TRUE;
m_keepGoing = TRUE;
while (m_keepGoing)
{
MacDoOneEvent() ;
}
#if TARGET_CARBON
if ( UMAGetSystemVersion() >= 0x1000 )
{
if ( s_macPreferencesMenuItemId )
{
EnableMenuCommand( NULL , kHICommandPreferences ) ;
AEInstallEventHandler( kCoreEventClass , kAEShowPreferences ,
NewAEEventHandlerUPP(AEHandlePreferences) ,
(long) wxTheApp , FALSE ) ;
}
}
#endif
while (m_keepGoing)
{
MacDoOneEvent() ;
}
return 0;
return 0;
}
// Returns TRUE if more time is needed.