wxWindow* wxApp::s_captureWindow = NULL ;
int wxApp::s_lastMouseDown = 0 ;
long wxApp::sm_lastMessageTime = 0;
+long wxApp::s_lastModifiers = 0 ;
+
bool wxApp::s_macDefaultEncodingIsPC = true ;
bool wxApp::s_macSupportPCMenuShortcuts = true ;
return wxTheApp->MacHandleAEQuit( (AppleEvent*) event , reply) ;
}
-short wxApp::MacHandleAEODoc(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNUSED(reply))
+// new virtual public method in wxApp
+void wxApp::MacOpenFile(const wxString & WXUNUSED(fileName) )
+{
+}
+
+void wxApp::MacPrintFile(const wxString & WXUNUSED(fileName) )
+{
+}
+
+void wxApp::MacNewFile()
+{
+}
+
+// new implementation, which parses the event and calls
+// MacOpenFile on each of the files it's passed
+short wxApp::MacHandleAEODoc(const WXEVENTREF event, WXEVENTREF WXUNUSED(reply))
{
- SysBeep(40) ;
+ AEDescList docList;
+ AEKeyword keywd;
+ DescType returnedType;
+ Size actualSize;
+ long itemsInList;
+ FSSpec theSpec;
+ OSErr err;
+ short i;
+ 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 ) ;
- return noErr ;
-}
-
-short wxApp::MacHandleAEPDoc(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNUSED(reply))
-{
- return noErr ;
+
+ for (i = 1; i <= itemsInList; i++) {
+ AEGetNthPtr(&docList, i, typeFSS, &keywd, &returnedType,
+ (Ptr) & theSpec, sizeof(theSpec), &actualSize);
+ wxString fName = wxMacFSSpec2MacFilename(&theSpec);
+ MacOpenFile(fName);
+ }
+ return noErr;
+}
+
+short wxApp::MacHandleAEPDoc(const WXEVENTREF event , WXEVENTREF WXUNUSED(reply))
+{
+ AEDescList docList;
+ AEKeyword keywd;
+ DescType returnedType;
+ Size actualSize;
+ long itemsInList;
+ FSSpec theSpec;
+ OSErr err;
+ short i;
+ 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);
+ wxString fName = wxMacFSSpec2MacFilename(&theSpec);
+ MacPrintFile(fName);
+ }
+ return noErr;
}
short wxApp::MacHandleAEOApp(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNUSED(reply))
{
+ MacNewFile() ;
return noErr ;
}
// __wxinitialize in Mach-O shared libraries
wxStAppResource::OpenSharedLibraryResource(NULL);
#endif
-
+
#if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340)
AEInstallEventHandler( kCoreEventClass , kAEOpenDocuments ,
NewAEEventHandlerUPP(AEHandleODoc) ,
s_macCursorRgn = ::NewRgn() ;
wxBuffer = new char[BUFSIZ + 512];
-
+
wxClassInfo::InitializeClasses();
#if wxUSE_RESOURCES
#if wxUSE_THREADS
wxPendingEventsLocker = new wxCriticalSection;
#endif
-
+
wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
wxTheColourDatabase->Initialize();
delete wxWinMacControlList ;
}
delete wxPendingEvents;
-
+
#if wxUSE_THREADS
delete wxPendingEventsLocker;
// If we don't do the following, we get an apparent memory leak.
// __wxterminate in Mach-O shared libraries
wxStAppResource::CloseSharedLibraryResource();
#endif
-
+
UMACleanupToolbox() ;
if (s_macCursorRgn) {
::DisposeRgn((RgnHandle)s_macCursorRgn);
}
-
+
#if 0
TerminateAE() ;
#endif
if ( initBlock != NULL ) {
const CFragInitBlock *theInitBlock = (const CFragInitBlock *)initBlock;
FSSpec *fileSpec = NULL;
-
+
if (theInitBlock->fragLocator.where == kDataForkCFragLocator) {
fileSpec = theInitBlock->fragLocator.u.onDisk.fileSpec;
}
else if (theInitBlock->fragLocator.where == kResourceCFragLocator) {
fileSpec = theInitBlock->fragLocator.u.inSegs.fileSpec;
}
-
+
if (fileSpec != NULL) {
gSharedLibraryResource = FSpOpenResFile(fileSpec, fsRdPerm);
}
NSSymbol theSymbol;
NSModule theModule;
const char *theLibPath;
-
+
gSharedLibraryBundle = CFBundleGetBundleWithIdentifier(CFSTR("com.wxwindows.wxWindows"));
if (gSharedLibraryBundle != NULL) {
// wxWindows has been bundled into a framework
// load the framework resources
-
+
gSharedLibraryResource = CFBundleOpenBundleResourceMap(gSharedLibraryBundle);
}
else {
char *theExt;
FSRef theResRef;
OSErr theErr = noErr;
-
+
// get the library path
theSymbol = NSLookupAndBindSymbol("_gSharedLibraryResource");
theModule = NSModuleForSymbol(theSymbol);
theExt = strstr(theName, ".dylib");
// overwrite extension with ".rsrc"
strcpy(theExt, ".rsrc");
-
+
wxLogDebug( theResPath );
theErr = FSPathMakeRef((UInt8 *) theResPath, &theResRef, false);
// try in current directory (using name only)
theErr = FSPathMakeRef((UInt8 *) theName, &theResRef, false);
}
-
+
// free duplicated resource file path
free(theResPath);
CloseResFile(gSharedLibraryResource);
}
gSharedLibraryResource = kResFileNotOpened;
- }
+ }
#endif /* WXMAKINGDLL */
}
if (argc > 1) {
char theArg[6] = "";
strncpy(theArg, argv[1], 5);
-
+
if (strcmp(theArg, "-psn_") == 0) {
// assume the argument is always the only one and remove it
--argc;
}
- }
+ }
#else
argc = 0 ; // currently we don't support files as parameters
#endif
case kEventClassKeyboard :
{
converted = true ;
- switch( GetEventKind(event) )
+ switch( GetEventKind(event) )
{
case kEventRawKeyDown :
rec->what = keyDown ;
break ;
}
}
-
+
return converted ;
}
pascal OSStatus wxMacApplicationEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
{
OSStatus result = eventNotHandledErr ;
-
+
EventRecord rec ;
switch ( GetEventClass( event ) )
{
case kEventClassKeyboard :
if ( wxMacConvertEventToRecord( event , &rec ) )
{
+ wxTheApp->MacHandleModifierEvents( &rec ) ;
wxTheApp->MacHandleOneEvent( &rec ) ;
result = noErr ;
}
case kEventClassTextInput :
if ( wxMacConvertEventToRecord( event , &rec ) )
{
+ wxTheApp->MacHandleModifierEvents( &rec ) ;
wxTheApp->MacHandleOneEvent( &rec ) ;
result = noErr ;
}
{
if ( ! wxAppBase::OnInit() )
return FALSE ;
-
+
#if 0 // TARGET_CARBON
- static const EventTypeSpec eventList[] =
+ static const EventTypeSpec eventList[] =
{
{ kEventClassKeyboard, kEventRawKeyDown } ,
{ kEventClassKeyboard, kEventRawKeyRepeat } ,
{ kEventClassKeyboard, kEventRawKeyUp } ,
{ kEventClassKeyboard, kEventRawKeyModifiersChanged } ,
-
+
{ kEventClassTextInput , kEventTextInputUnicodeForKeyEvent } ,
} ;
-
+
InstallApplicationEventHandler(NewEventHandlerUPP(wxMacApplicationEventHandler)
- , WXSIZEOF(eventList), eventList, this, NULL);
+ , WXSIZEOF(eventList), eventList, this, NULL);
#endif
return TRUE ;
}
argv = NULL;
m_printMode = wxPRINT_WINDOWS;
- m_exitOnFrameDelete = TRUE;
m_auto3D = TRUE;
}
while ( !wxTheApp->IsExiting() && WaitNextEvent(everyEvent, &event,sleepTime, (RgnHandle) wxApp::s_macCursorRgn))
{
+ wxTheApp->MacHandleModifierEvents( &event ) ;
wxTheApp->MacHandleOneEvent( &event );
if ( event.what != kHighLevelEvent )
SetRectRgn( (RgnHandle) wxApp::s_macCursorRgn , event.where.h , event.where.v , event.where.h + 1 , event.where.v + 1 ) ;
}
+ wxTheApp->MacHandleModifierEvents( &event ) ;
wxMacProcessNotifierAndPendingEvents() ;
node = node->Next();
}
-
+
s_lastMouseDown = 0 ;
if( convertClipboard )
{
MacConvertPrivateToPublicScrap() ;
}
-
+
::HideFloatingWindows() ;
}
{
MacConvertPublicToPrivateScrap() ;
}
-
+
::ShowFloatingWindows() ;
-
+
// raise modal dialogs in case a non modal window was selected to activate the app
wxNode* node = wxModalDialogs.First();
{
wxDialog* dialog = (wxDialog *) node->Data();
dialog->Raise();
-
+
node = node->Next();
}
}
if (WaitNextEvent(everyEvent, &event, sleepTime, (RgnHandle) s_macCursorRgn))
{
+ MacHandleModifierEvents( &event ) ;
MacHandleOneEvent( &event );
}
else
{
+ MacHandleModifierEvents( &event ) ;
// idlers
WindowPtr window = ::FrontWindow() ;
if ( window )
wxMacProcessNotifierAndPendingEvents() ;
}
+void wxApp::MacHandleModifierEvents( WXEVENTREF evr )
+{
+ EventRecord* ev = (EventRecord*) evr ;
+#if TARGET_CARBON
+ if ( ev->what == mouseDown || ev->what == mouseUp || ev->what == activateEvt ||
+ ev->what == keyDown || ev->what == autoKey || ev->what == keyUp || ev->what == nullEvent )
+ {
+ // in these cases the modifiers are already correctly setup by carbon
+ }
+ else
+ {
+ EventRecord nev ;
+ WaitNextEvent( 0 , &nev , 0 , NULL ) ;
+ ev->modifiers = nev.modifiers ;
+ // KeyModifiers unfortunately don't include btnState...
+// ev->modifiers = GetCurrentKeyModifiers() ;
+ }
+#endif
+ if ( ev->modifiers != s_lastModifiers && wxWindow::FindFocus() != NULL )
+ {
+ wxKeyEvent event(wxEVT_KEY_DOWN);
+
+ event.m_shiftDown = ev->modifiers & shiftKey;
+ event.m_controlDown = ev->modifiers & controlKey;
+ event.m_altDown = ev->modifiers & optionKey;
+ event.m_metaDown = ev->modifiers & cmdKey;
+
+ event.m_x = ev->where.h;
+ event.m_y = ev->where.v;
+ event.m_timeStamp = ev->when;
+ wxWindow* focus = wxWindow::FindFocus() ;
+ event.SetEventObject(focus);
+
+ if ( (ev->modifiers ^ s_lastModifiers ) & controlKey )
+ {
+ event.m_keyCode = WXK_CONTROL ;
+ event.SetEventType( ( ev->modifiers & controlKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;
+ focus->GetEventHandler()->ProcessEvent( event ) ;
+ }
+ if ( (ev->modifiers ^ s_lastModifiers ) & shiftKey )
+ {
+ event.m_keyCode = WXK_SHIFT ;
+ event.SetEventType( ( ev->modifiers & shiftKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;
+ focus->GetEventHandler()->ProcessEvent( event ) ;
+ }
+ if ( (ev->modifiers ^ s_lastModifiers ) & optionKey )
+ {
+ event.m_keyCode = WXK_ALT ;
+ event.SetEventType( ( ev->modifiers & optionKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;
+ focus->GetEventHandler()->ProcessEvent( event ) ;
+ }
+ s_lastModifiers = ev->modifiers ;
+ }
+}
+
void wxApp::MacHandleOneEvent( WXEVENTREF evr )
{
EventRecord* ev = (EventRecord*) evr ;
newWidth = oldWidth;
if (newHeight == 0)
newHeight = oldHeight;
- win->SetSize( -1, -1, newWidth, newHeight, wxSIZE_USE_EXISTING);
+ win->SetSize( -1, -1 , newWidth, newHeight, wxSIZE_USE_EXISTING);
}
}
s_lastMouseDown = 0;
if (win)
{
Rect tempRect ;
+ GrafPtr port ;
+ GetPort( &port ) ;
+ Point pt = { 0, 0 } ;
+ SetPortWindowPort(window) ;
+ LocalToGlobal( &pt ) ;
+ SetPort( port ) ;
GetWindowPortBounds(window, &tempRect ) ;
- win->SetSize( -1, -1, tempRect.right-tempRect.left ,
+ win->SetSize( pt.h , pt.v , tempRect.right-tempRect.left ,
tempRect.bottom-tempRect.top, wxSIZE_USE_EXISTING);
}
}
{
window = (WindowRef) s_captureWindow->MacGetRootWindow() ;
windowPart = inContent ;
- }
+ }
else
{
windowPart = ::FindWindow(ev->where, &window) ;
long retval = key ;
switch (key)
{
- case 0x01 :
+ case kHomeCharCode :
retval = WXK_HOME;
break;
- case 0x03 :
+ case kEnterCharCode :
retval = WXK_RETURN;
break;
- case 0x04 :
+ case kEndCharCode :
retval = WXK_END;
break;
- case 0x05 :
+ case kHelpCharCode :
retval = WXK_HELP;
break;
- case 0x08 :
+ case kBackspaceCharCode :
retval = WXK_BACK;
break;
- case 0x09 :
+ case kTabCharCode :
retval = WXK_TAB;
break;
- case 0x0b :
+ case kPageUpCharCode :
retval = WXK_PAGEUP;
break;
- case 0x0c :
+ case kPageDownCharCode :
retval = WXK_PAGEDOWN;
break;
- case 0x0d :
+ case kReturnCharCode :
retval = WXK_RETURN;
break;
- case 0x10 :
+ case kFunctionKeyCharCode :
{
switch( code )
{
}
}
break ;
- case 0x1b :
+ case kEscapeCharCode :
retval = WXK_ESCAPE ;
break ;
- case 0x1c :
+ case kLeftArrowCharCode :
retval = WXK_LEFT ;
break ;
- case 0x1d :
+ case kRightArrowCharCode :
retval = WXK_RIGHT ;
break ;
- case 0x1e :
+ case kUpArrowCharCode :
retval = WXK_UP ;
break ;
- case 0x1f :
+ case kDownArrowCharCode :
retval = WXK_DOWN ;
break ;
- case 0x7F :
+ case kDeleteCharCode :
retval = WXK_DELETE ;
default:
break ;
}
else
{
- short keycode ;
- short keychar ;
- keychar = short(ev->message & charCodeMask);
- keycode = short(ev->message & keyCodeMask) >> 8 ;
- long keyval = wxMacTranslateKey(keychar, keycode) ;
- wxWindow* focus = wxWindow::FindFocus() ;
-
- if ( MacSendKeyDownEvent( focus , keyval , ev->modifiers , ev->when , ev->where.h , ev->where.v ) == false )
+ 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
wxControl* control = wxDynamicCast( focus , wxControl ) ;
if ( control && control->GetMacControl() != NULL )
{
+ short keycode ;
+ short keychar ;
+ keychar = short(ev->message & charCodeMask);
+ keycode = short(ev->message & keyCodeMask) >> 8 ;
::HandleControlKey( (ControlHandle) control->GetMacControl() , keycode , keychar , ev->modifiers ) ;
}
}
}
}
-bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keyval , long modifiers , long when , short wherex , short wherey )
+bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey )
{
- bool handled = false ;
- // it is wxWindows Convention to have Ctrl Key Combinations at ASCII char value
- if ( modifiers & controlKey && keyval >= 0 && keyval < 0x20 )
+ if ( !focus )
+ return false ;
+
+ short keycode ;
+ short keychar ;
+ keychar = short(keymessage & charCodeMask);
+ keycode = short(keymessage & keyCodeMask) >> 8 ;
+
+ if ( modifiers & ( controlKey|shiftKey|optionKey ) )
{
- keyval += 0x40 ;
- }
+ // control interferes with some built-in keys like pgdown, return etc. therefore we remove the controlKey modifier
+ // and look at the character after
+ UInt32 state = 0;
+ UInt32 keyInfo = KeyTranslate((Ptr)GetScriptManagerVariable(smKCHRCache), ( modifiers & (~(controlKey|shiftKey|optionKey))) | keycode, &state);
+ keychar = short(keyInfo & charCodeMask);
+ keycode = short(keyInfo & keyCodeMask) >> 8 ;
+ }
+ long keyval = wxMacTranslateKey(keychar, keycode) ;
+ long realkeyval = keyval ;
+ if ( keyval == keychar )
+ {
+ // we are not on a special character combo -> pass the real os event-value to EVT_CHAR, but not to EVT_KEY (make upper first)
+ realkeyval = short(keymessage & charCodeMask) ;
+ keyval = wxToupper( keyval ) ;
+ }
+
wxKeyEvent event(wxEVT_KEY_DOWN);
+ bool handled = false ;
event.m_shiftDown = modifiers & shiftKey;
event.m_controlDown = modifiers & controlKey;
event.m_altDown = modifiers & optionKey;
event.m_metaDown = modifiers & cmdKey;
- event.m_keyCode = keyval;
+ event.m_keyCode = keyval ;
event.m_x = wherex;
event.m_y = wherey;
{
event.Skip( FALSE ) ;
event.SetEventType( wxEVT_CHAR ) ;
+ // raw value again
+ event.m_keyCode = realkeyval ;
handled = focus->GetEventHandler()->ProcessEvent( event ) ;
if ( handled && event.GetSkipped() )
}
else
{
- short keycode ;
- short keychar ;
- keychar = short(ev->message & charCodeMask);
- keycode = short(ev->message & keyCodeMask) >> 8 ;
- long keyval = wxMacTranslateKey(keychar, keycode) ;
-
- wxWindow* focus = wxWindow::FindFocus() ;
- bool handled = MacSendKeyUpEvent( focus , keyval , ev->modifiers , ev->when , ev->where.h , ev->where.v ) ;
- // we don't have to do anything under classic here
+ MacSendKeyUpEvent( wxWindow::FindFocus() , ev->message , ev->modifiers , ev->when , ev->where.h , ev->where.v ) ;
}
}
-bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keyval , long modifiers , long when , short wherex , short wherey )
+bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey )
{
- bool handled = false ;
- // it is wxWindows Convention to have Ctrl Key Combinations at ASCII char value
- if ( modifiers & controlKey && keyval >= 0 && keyval < 0x20 )
+ if ( !focus )
+ return false ;
+
+ short keycode ;
+ short keychar ;
+ keychar = short(keymessage & charCodeMask);
+ keycode = short(keymessage & keyCodeMask) >> 8 ;
+ if ( modifiers & ( controlKey|shiftKey|optionKey ) )
{
- keyval += 0x40 ;
+ // control interferes with some built-in keys like pgdown, return etc. therefore we remove the controlKey modifier
+ // and look at the character after
+ UInt32 state = 0;
+ UInt32 keyInfo = KeyTranslate((Ptr)GetScriptManagerVariable(smKCHRCache), ( modifiers & (~(controlKey|shiftKey|optionKey))) | keycode, &state);
+ keychar = short(keyInfo & charCodeMask);
+ keycode = short(keyInfo & keyCodeMask) >> 8 ;
}
- if ( focus )
- {
- wxKeyEvent event(wxEVT_KEY_UP);
- event.m_shiftDown = modifiers & shiftKey;
- event.m_controlDown = modifiers & controlKey;
- event.m_altDown = modifiers & optionKey;
- event.m_metaDown = modifiers & cmdKey;
- event.m_keyCode = keyval;
+ long keyval = wxMacTranslateKey(keychar, keycode) ;
+
+ if ( keyval == keychar )
+ {
+ keyval = wxToupper( keyval ) ;
+ }
+ bool handled = false ;
+
+ wxKeyEvent event(wxEVT_KEY_UP);
+ event.m_shiftDown = modifiers & shiftKey;
+ event.m_controlDown = modifiers & controlKey;
+ event.m_altDown = modifiers & optionKey;
+ event.m_metaDown = modifiers & cmdKey;
+ event.m_keyCode = keyval ;
+
+ event.m_x = wherex;
+ event.m_y = wherey;
+ event.m_timeStamp = when;
+ event.SetEventObject(focus);
+ handled = focus->GetEventHandler()->ProcessEvent( event ) ;
- event.m_x = wherex;
- event.m_y = wherey;
- event.m_timeStamp = when;
- event.SetEventObject(focus);
- handled = focus->GetEventHandler()->ProcessEvent( event ) ;
- }
return handled ;
}
void wxApp::MacHandleActivateEvent( WXEVENTREF evr )
wxWindow* currentMouseWindow = NULL ;
- wxWindow::MacGetWindowFromPoint( wxPoint( ev->where.h , ev->where.v ) ,
- ¤tMouseWindow ) ;
+ if (s_captureWindow )
+ {
+ currentMouseWindow = s_captureWindow ;
+ }
+ else
+ {
+ wxWindow::MacGetWindowFromPoint( wxPoint( ev->where.h , ev->where.v ) ,
+ ¤tMouseWindow ) ;
+ }
+
if ( currentMouseWindow != wxWindow::s_lastMouseWindow )
{
wxMouseEvent event ;
event.m_y = ev->where.v;
event.m_timeStamp = ev->when;
event.SetEventObject(this);
-
+
if ( wxWindow::s_lastMouseWindow )
{
wxMouseEvent eventleave(event);
eventleave.SetEventType( wxEVT_LEAVE_WINDOW );
wxWindow::s_lastMouseWindow->ScreenToClient( &eventleave.m_x, &eventleave.m_y );
eventleave.SetEventObject( wxWindow::s_lastMouseWindow ) ;
-
+
wxWindow::s_lastMouseWindow->GetEventHandler()->ProcessEvent(eventleave);
}
if ( currentMouseWindow )
wxWindow::s_lastMouseWindow = currentMouseWindow ;
}
- short windowPart = ::FindWindow(ev->where, &window);
-
+ short windowPart = inNoWindow ;
+
+ if ( s_captureWindow )
+ {
+ window = (WindowRef) s_captureWindow->MacGetRootWindow() ;
+ windowPart = inContent ;
+ }
+ else
+ {
+ windowPart = ::FindWindow(ev->where, &window);
+ }
+
switch (windowPart)
{
- // fixes for setting the cursor back from dominic mazzoni
- case inMenuBar :
- UMAShowArrowCursor();
- break ;
- case inSysWindow :
- UMAShowArrowCursor();
- break ;
- default:
+ case inContent :
{
- // if ( s_lastMouseDown == 0 )
- // ev->modifiers |= btnState ;
-
- // Calling GetNextEvent with a zero event mask will always
- // pass back a null event. However, it fills the EventRecord
- // with the state of the modifier keys. This is needed since
- // the modifier state returned by WaitForNextEvent often is
- // wrong mouse move events. The attempt above to correct this
- // didn't always work (under OS X at least).
-
- EventRecord tmp;
- ::GetNextEvent(0, &tmp);
- ev->modifiers = tmp.modifiers;
-
wxTopLevelWindowMac* win = wxFindWinFromMacWindow( window ) ;
if ( win )
win->MacMouseMoved( ev , windowPart ) ;
else
- UMAShowArrowCursor();
-
+ {
+ if ( wxIsBusy() )
+ {
+ }
+ else
+ UMAShowArrowCursor();
+ }
}
break;
+ default :
+ {
+ if ( wxIsBusy() )
+ {
+ }
+ else
+ UMAShowArrowCursor();
+ }
+ break ;
}
}
break ;
projects / wxWidgets.git / blobdiff