#include "wx/wxprec.h"
-#include "wx/wxprec.h"
-
#include "wx/utils.h"
#ifndef WX_PRECOMP
#include "wx/intl.h"
#include "wx/app.h"
#if wxUSE_GUI
+ #include "wx/dialog.h"
#include "wx/toplevel.h"
#include "wx/font.h"
#endif
NSBeep();
}
-// ----------------------------------------------------------------------------
-// Common Event Support
-// ----------------------------------------------------------------------------
-
-void wxMacWakeUp()
-{
- NSEvent* wakeupEvent = [NSEvent otherEventWithType:NSApplicationDefined location:NSZeroPoint
- modifierFlags:NSAnyEventMask timestamp:0 windowNumber:0 context:nil subtype:0 data1:0 data2:0];
- [NSApp postEvent:wakeupEvent atStart:NO];
-}
-
#endif // wxUSE_BASE
#if wxUSE_GUI
-@interface wxNSAppController : NSObject
-{
-}
-
-- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender;
-- (BOOL)application:(NSApplication *)sender openFile:(NSString *)filename;
-- (BOOL)applicationShouldOpenUntitledFile:(NSApplication *)sender;
-- (BOOL)application:(NSApplication *)sender printFile:(NSString *)filename;
-- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender;
-- (void)handleGetURLEvent:(NSAppleEventDescriptor *)event
- withReplyEvent:(NSAppleEventDescriptor *)replyEvent;
-@end
-
@implementation wxNSAppController
-- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender
-{
- wxUnusedVar(sender);
- // let wx do this, not cocoa
- return NO;
+- (void)applicationWillFinishLaunching:(NSNotification *)application {
+ wxUnusedVar(application);
}
-- (BOOL)application:(NSApplication *)sender openFile:(NSString *)filename;
+- (BOOL)application:(NSApplication *)sender openFile:(NSString *)filename
{
wxUnusedVar(sender);
wxCFStringRef cf(wxCFRetain(filename));
return YES;
}
-- (BOOL)applicationShouldOpenUntitledFile:(NSApplication *)sender;
+- (BOOL)applicationShouldOpenUntitledFile:(NSApplication *)sender
{
wxUnusedVar(sender);
wxTheApp->MacNewFile() ;
return YES;
}
+- (BOOL)applicationShouldHandleReopen:(NSApplication *)sender hasVisibleWindows:(BOOL)flag
+{
+ wxUnusedVar(flag);
+ wxUnusedVar(sender);
+ wxTheApp->MacReopenApp() ;
+ return NO;
+}
+
+- (void)handleGetURLEvent:(NSAppleEventDescriptor *)event
+ withReplyEvent:(NSAppleEventDescriptor *)replyEvent
+{
+ wxUnusedVar(replyEvent);
+ NSString* url = [[event descriptorAtIndex:1] stringValue];
+ wxCFStringRef cf(wxCFRetain(url));
+ wxTheApp->MacOpenURL(cf.AsString()) ;
+}
+
/*
Allowable return values are:
NSTerminateNow - it is ok to proceed with termination
- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender
{
wxUnusedVar(sender);
- wxWindow* win = wxTheApp->GetTopWindow() ;
- if ( win )
- {
- wxCommandEvent exitEvent(wxEVT_COMMAND_MENU_SELECTED, wxApp::s_macExitMenuItemId);
- if (!win->GetEventHandler()->ProcessEvent(exitEvent))
- win->Close(true) ;
- }
- else
- {
- wxTheApp->ExitMainLoop() ;
- }
- return NSTerminateCancel;
+ wxCloseEvent event;
+ wxTheApp->OnQueryEndSession(event);
+ if ( event.GetVeto() )
+ return NSTerminateCancel;
+
+ return NSTerminateNow;
}
-- (BOOL)applicationShouldHandleReopen:(NSApplication *)sender hasVisibleWindows:(BOOL)flag
+- (void)applicationWillTerminate:(NSNotification *)application {
+ wxUnusedVar(application);
+ wxCloseEvent event;
+ event.SetCanVeto(false);
+ wxTheApp->OnEndSession(event);
+}
+
+- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender
{
- wxUnusedVar(flag);
wxUnusedVar(sender);
- wxTheApp->MacReopenApp() ;
+ // let wx do this, not cocoa
return NO;
}
-- (void)handleGetURLEvent:(NSAppleEventDescriptor *)event
- withReplyEvent:(NSAppleEventDescriptor *)replyEvent
-{
- wxUnusedVar(replyEvent);
- NSString* url = [[event descriptorAtIndex:1] stringValue];
- wxCFStringRef cf(wxCFRetain(url));
- wxTheApp->MacOpenURL(cf.AsString()) ;
-}
@end
/*
[super init];
sheetFinished = NO;
resultCode = -1;
+ impl = 0;
return self;
}
+- (void)setImplementation: (wxDialog *)dialog
+{
+ impl = dialog;
+}
+
- (BOOL)finished
{
return sheetFinished;
// NSAlerts don't need nor respond to orderOut
if ([sheet respondsToSelector:@selector(orderOut:)])
[sheet orderOut: self];
+
+ if (impl)
+ impl->ModalFinishedCallback(sheet, returnCode);
}
@end
if (!sm_isEmbedded)
{
wxNSAppController* controller = [[wxNSAppController alloc] init];
- [[NSApplication sharedApplication] setDelegate:controller];
+ [NSApp setDelegate:controller];
NSAppleEventManager *appleEventManager = [NSAppleEventManager sharedAppleEventManager];
[appleEventManager setEventHandler:controller andSelector:@selector(handleGetURLEvent:withReplyEvent:)
forEventClass:kInternetEventClass andEventID:kAEGetURL];
+
+ // calling finishLaunching so early before running the loop seems to trigger some 'MenuManager compatibility' which leads
+ // to the duplication of menus under 10.5 and a warning under 10.6
+#if 0
[NSApp finishLaunching];
+#endif
}
return true;
}
void wxClientDisplayRect(int *x, int *y, int *width, int *height)
{
- NSRect displayRect = [[NSScreen mainScreen] visibleFrame];
+ NSRect displayRect = [wxOSXGetMenuScreen() visibleFrame];
wxRect r = wxFromNSRect( NULL, displayRect );
if ( x )
*x = r.x;
*y = pt.y;
};
+#if wxOSX_USE_COCOA && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6
+
+wxMouseState wxGetMouseState()
+{
+ wxMouseState ms;
+
+ wxPoint pt = wxGetMousePosition();
+ ms.SetX(pt.x);
+ ms.SetY(pt.y);
+
+ NSUInteger modifiers = [NSEvent modifierFlags];
+ NSUInteger buttons = [NSEvent pressedMouseButtons];
+
+ ms.SetLeftDown( (buttons & 0x01) != 0 );
+ ms.SetMiddleDown( (buttons & 0x04) != 0 );
+ ms.SetRightDown( (buttons & 0x02) != 0 );
+
+ ms.SetControlDown(modifiers & NSControlKeyMask);
+ ms.SetShiftDown(modifiers & NSShiftKeyMask);
+ ms.SetAltDown(modifiers & NSAlternateKeyMask);
+ ms.SetMetaDown(modifiers & NSCommandKeyMask);
+
+ return ms;
+}
+
+
+#endif
+
wxTimerImpl* wxGUIAppTraits::CreateTimerImpl(wxTimer *timer)
{
return new wxOSXTimerImpl(timer);
{
if (gs_wxBusyCursorCount++ == 0)
{
+ NSEnumerator *enumerator = [[[NSApplication sharedApplication] windows] objectEnumerator];
+ id object;
+
+ while ((object = [enumerator nextObject])) {
+ [(NSWindow*) object disableCursorRects];
+ }
+
gMacStoredActiveCursor = gMacCurrentCursor;
cursor->MacInstall();
if (--gs_wxBusyCursorCount == 0)
{
- gMacStoredActiveCursor.MacInstall();
- gMacStoredActiveCursor = wxNullCursor;
+ NSEnumerator *enumerator = [[[NSApplication sharedApplication] windows] objectEnumerator];
+ id object;
+
+ while ((object = [enumerator nextObject])) {
+ [(NSWindow*) object enableCursorRects];
+ }
wxSetCursor(wxNullCursor);
+
+ gMacStoredActiveCursor.MacInstall();
+ gMacStoredActiveCursor = wxNullCursor;
}
}
wxSize sz = m_window->GetSize();
- int left = subrect != NULL ? subrect->x : 0 ;
- int top = subrect != NULL ? subrect->y : 0 ;
int width = subrect != NULL ? subrect->width : sz.x;
int height = subrect != NULL ? subrect->height : sz.y ;
- NSRect rect = NSMakeRect(left, top, width, height );
NSView* view = (NSView*) m_window->GetHandle();
[view lockFocus];
// we use this method as other methods force a repaint, and this method can be
#endif // wxUSE_GUI
-#endif // wxOSX_USE_COCOA
\ No newline at end of file
+#endif // wxOSX_USE_COCOA
projects / wxWidgets.git / blobdiff