#include "wx/menu.h"
#include "wx/docview.h"
-#if wxUSE_WX_RESOURCES
-# include "wx/resource.h"
-#endif
-
#include <string.h>
// mac
long wxApp::s_macAboutMenuItemId = wxID_ABOUT ;
long wxApp::s_macPreferencesMenuItemId = 0 ;
long wxApp::s_macExitMenuItemId = wxID_EXIT ;
-wxString wxApp::s_macHelpMenuTitleName = "&Help" ;
+wxString wxApp::s_macHelpMenuTitleName = wxT("&Help") ;
//----------------------------------------------------------------------
// Core Apple Event Support
err = AEGetParamDesc((AppleEvent *)event, keyDirectObject, typeAEList,&docList);
if (err != noErr)
return err;
-
+
err = AECountItems(&docList, &itemsInList);
if (err != noErr)
return err;
-
+
ProcessSerialNumber PSN ;
PSN.highLongOfPSN = 0 ;
PSN.lowLongOfPSN = kCurrentProcess ;
SetFrontProcess( &PSN ) ;
-
+
for (i = 1; i <= itemsInList; i++) {
AEGetNthPtr(&docList, i, typeFSS, &keywd, &returnedType,
(Ptr) & theSpec, sizeof(theSpec), &actualSize);
err = AEGetParamDesc((AppleEvent *)event, keyDirectObject, typeAEList,&docList);
if (err != noErr)
return err;
-
+
err = AECountItems(&docList, &itemsInList);
if (err != noErr)
return err;
-
+
ProcessSerialNumber PSN ;
PSN.highLongOfPSN = 0 ;
PSN.lowLongOfPSN = kCurrentProcess ;
SetFrontProcess( &PSN ) ;
-
+
for (i = 1; i <= itemsInList; i++) {
AEGetNthPtr(&docList, i, typeFSS, &keywd, &returnedType,
(Ptr) & theSpec, sizeof(theSpec), &actualSize);
return noErr ;
}
-// AEQuit attempts to quite the application
+// AEQuit attempts to quite the application
short wxApp::MacHandleAEQuit(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNUSED(reply))
{
#if TARGET_CARBON
- static const EventTypeSpec eventList[] =
+ static const EventTypeSpec eventList[] =
{
{ kEventClassCommand, kEventProcessCommand } ,
{ kEventClassCommand, kEventCommandUpdateStatus } ,
-
+
{ kEventClassApplication , kEventAppActivated } ,
{ kEventClassApplication , kEventAppDeactivated } ,
// handling the quit event is not recommended by apple
// rather using the quit apple event - which we do
-
+
{ kEventClassAppleEvent , kEventAppleEvent } ,
-
+
{ kEventClassMouse , kEventMouseDown } ,
{ 'WXMC' , 'WXMC' }
} ;
{
OSStatus result = eventNotHandledErr ;
UInt32 kind = GetEventKind( event ) ;
-
+
return result ;
}
-// due to the rather low-level event API of wxWindows, we cannot use RunApplicationEventLoop
+// due to the rather low-level event API of wxWindows, we cannot use RunApplicationEventLoop
// but have to use ReceiveNextEvent dealing with events manually, therefore we also have
// deal with clicks in the menu bar explicitely
static pascal OSStatus MouseEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
{
OSStatus result = eventNotHandledErr ;
-
+
switch( GetEventKind(event) )
{
case kEventMouseDown :
{
Point point ;
WindowRef window ;
-
+
GetEventParameter( event, kEventParamMouseLocation, typeQDPoint, NULL,
sizeof( Point ), NULL, &point );
short windowPart = ::FindWindow(point, &window);
}
}
break ;
- }
+ }
return result ;
}
OSStatus result = eventNotHandledErr ;
HICommand command ;
-
+
GetEventParameter( event, kEventParamDirectObject, typeHICommand, NULL,
sizeof( HICommand ), NULL, &command );
MenuCommand id = command.commandID ;
if ( id == kHICommandPreferences )
id = wxApp::s_macPreferencesMenuItemId ;
-
+
wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar() ;
wxMenu* menu = NULL ;
wxMenuItem* item = NULL ;
if ( item == NULL || menu == NULL || mbar == NULL )
return result ;
-
+
switch( GetEventKind( event ) )
{
case kEventProcessCommand :
{
item->Check( !item->IsChecked() ) ;
}
-
+
menu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ;
result = noErr ;
}
break ;
default :
break ;
- }
-
+ }
+
return result ;
}
{
case kEventAppActivated :
{
- wxTheApp->MacResume( true ) ;
+ if ( wxTheApp )
+ wxTheApp->MacResume( true ) ;
result = noErr ;
}
break ;
case kEventAppDeactivated :
{
- wxTheApp->MacSuspend( true ) ;
+ if ( wxTheApp )
+ wxTheApp->MacSuspend( true ) ;
result = noErr ;
}
break ;
#endif
#endif
+ wxMacSetupConverters() ;
s_macCursorRgn = ::NewRgn() ;
wxInitializeStockLists();
wxInitializeStockObjects();
-#if wxUSE_WX_RESOURCES
- wxInitializeResourceSystem();
-#endif
-
wxBitmap::InitStandardHandlers();
wxModule::RegisterModules();
{
if( !wxAppBase::OnInitGui() )
return false ;
-
-#if TARGET_CARBON
+
+#if TARGET_CARBON
InstallStandardEventHandler( GetApplicationEventTarget() ) ;
-
+
InstallApplicationEventHandler(
- GetwxAppEventHandlerUPP(),
- GetEventTypeCount(eventList), eventList, wxTheApp, &((EventHandlerRef)wxTheApp->m_macEventHandler));
+ GetwxAppEventHandlerUPP(),
+ GetEventTypeCount(eventList), eventList, wxTheApp, &((EventHandlerRef)wxTheApp->m_macEventHandler));
#endif
-
+
#if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340)
AEInstallEventHandler( kCoreEventClass , kAEOpenDocuments ,
NewAEEventHandlerUPP(AEHandleODoc) ,
wxModule::CleanUpModules();
-#if wxUSE_WX_RESOURCES
- wxCleanUpResourceSystem();
-#endif
-
wxDeleteStockObjects() ;
// Destroy all GDI lists, etc.
// __wxterminate in Mach-O shared libraries
wxStAppResource::CloseSharedLibraryResource();
#endif
+ wxMacCleanupConverters() ;
UMACleanupToolbox() ;
if (s_macCursorRgn) {
// we could try to get the open apple events here to adjust argc and argv better
wxTheApp->argc = argc;
+#if wxUSE_UNICODE
+ wxTheApp->argv = new wxChar*[argc+1];
+ int mb_argc ;
+ for ( mb_argc = 0; mb_argc < argc; mb_argc++ )
+ {
+ wxTheApp->argv[mb_argc] = wxStrdup(wxConvLocal.cMB2WX(argv[mb_argc]));
+ }
+ wxTheApp->argv[mb_argc] = (wxChar *)NULL;
+#else
wxTheApp->argv = argv;
+#endif
// GUI-specific initialization, such as creating an app context.
wxEntryInitGui();
bool wxApp::SendIdleEvents()
{
bool needMore = FALSE;
- wxNode* node = wxTopLevelWindows.First();
+ wxWindowListNode* node = wxTopLevelWindows.GetFirst();
while (node)
{
- wxWindow* win = (wxWindow*) node->Data();
+ wxWindow* win = node->GetData();
if (SendIdleEvents(win))
needMore = TRUE;
- node = node->Next();
+ node = node->GetNext();
}
return needMore;
}
if (event.MoreRequested())
needMore = TRUE;
- wxNode* node = win->GetChildren().First();
+ wxWindowListNode* node = win->GetChildren().GetFirst();
while (node)
{
- wxWindow* win = (wxWindow*) node->Data();
+ wxWindow* win = node->GetData();
if (SendIdleEvents(win))
needMore = TRUE;
- node = node->Next();
+ node = node->GetNext();
}
return needMore ;
}
void wxApp::DeletePendingObjects()
{
- wxNode *node = wxPendingDelete.First();
+ wxNode *node = wxPendingDelete.GetFirst();
while (node)
{
- wxObject *obj = (wxObject *)node->Data();
+ wxObject *obj = (wxObject *)node->GetData();
delete obj;
// Deleting one object may have deleted other pending
// objects, so start from beginning of list again.
- node = wxPendingDelete.First();
+ node = wxPendingDelete.GetFirst();
}
}
s_inReceiveEvent = true ;
status = ReceiveNextEvent(0, NULL,kEventDurationNoWait,true,&theEvent) ;
s_inReceiveEvent = false ;
-
+
if ( status == eventLoopTimedOutErr )
{
// make sure next time the event loop will trigger idle events
// having a larger value here leads to large performance slowdowns
// so we cannot give background apps more processor time here
// we do so however having a large sleep value in the main event loop
- sleepTime = 0 ;
+ sleepTime = 0 ;
while ( !IsExiting() && WaitNextEvent(everyEvent, &event,sleepTime, (RgnHandle) wxApp::s_macCursorRgn))
{
#if !TARGET_CARBON
// we have to deactive the top level windows manually
- wxNode* node = wxTopLevelWindows.First();
+ wxWindowListNode* node = wxTopLevelWindows.GetFirst();
while (node)
{
wxTopLevelWindow* win = (wxTopLevelWindow*) node->Data();
win->MacActivate( ((EventRecord*) MacGetCurrentEvent())->when , false ) ;
- node = node->Next();
+ node = node->GetNext();
}
::HideFloatingWindows() ;
::ShowFloatingWindows() ;
// raise modal dialogs in case a non modal window was selected to activate the app
- wxNode* node = wxModalDialogs.First();
+ wxNode* node = wxModalDialogs.GetFirst();
while (node)
{
- wxDialog* dialog = (wxDialog *) node->Data();
+ wxDialog* dialog = (wxDialog *) node->GetData();
dialog->Raise();
- node = node->Next();
+ node = node->GetNext();
}
#endif
}
{
MacHandleOneEvent( theEvent ) ;
ReleaseEvent(theEvent);
+ sleepTime = kEventDurationNoWait ;
}
#else
EventRecord event ;
&constraintRect , &newContentRect ) ;
if ( growResult )
{
- win->SetSize( newContentRect.left , newContentRect.top ,
- newContentRect.right - newContentRect.left ,
+ win->SetSize( newContentRect.left , newContentRect.top ,
+ newContentRect.right - newContentRect.left ,
newContentRect.bottom - newContentRect.top, wxSIZE_USE_EXISTING);
}
s_lastMouseDown = 0;
}
}
-#endif
+#endif
long wxMacTranslateKey(unsigned char key, unsigned char code) ;
long wxMacTranslateKey(unsigned char key, unsigned char code)
else
{
wxWindow* focus = wxWindow::FindFocus() ;
-
+
if ( MacSendKeyDownEvent( focus , ev->message , ev->modifiers , ev->when , ev->where.h , ev->where.v ) == false )
{
// has not been handled -> perform default
{
if ( !focus )
return false ;
-
+
short keycode ;
short keychar ;
keychar = short(keymessage & charCodeMask);
keycode = short(keymessage & keyCodeMask) >> 8 ;
-
+
if ( modifiers & ( controlKey|shiftKey|optionKey ) )
{
// control interferes with some built-in keys like pgdown, return etc. therefore we remove the controlKey modifier
realkeyval = short(keymessage & charCodeMask) ;
keyval = wxToupper( keyval ) ;
}
-
+
wxKeyEvent event(wxEVT_KEY_DOWN);
bool handled = false ;
event.m_shiftDown = modifiers & shiftKey;
if ( keyval == keychar )
{
- keyval = wxToupper( keyval ) ;
+ keyval = wxToupper( keyval ) ;
}
bool handled = false ;
}
else
{
- windowPart = ::FindWindow(ev->where, &window);
+ windowPart = ::FindWindow(ev->where, &window);
}
-
+
switch (windowPart)
{
case inContent :
item = mbar->FindItem( id , &menu ) ;
}
wxCHECK_RET( item != NULL && menu != NULL && mbar != NULL, wxT("error in menu item callback") );
-
+
if (item->IsCheckable())
{
item->Check( !item->IsChecked() ) ;
}
-
+
menu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ;
}
}
HiliteMenu(0);
}
-#endif
\ No newline at end of file
+#endif
projects / wxWidgets.git / blobdiff