#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
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];
+ // ensure that we have an auto release pool in place because the event will
+ // be autoreleased from NSEvent:otherEventWithType and we might not have a
+ // global pool during startup or shutdown and we actually never have it if
+ // we're called from another thread
+ //
+ // FIXME: we can't use wxMacAutoreleasePool here because it's in core and
+ // we're in base
+ NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+
+ 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];
+
+ [pool release];
}
#endif // wxUSE_BASE
#if wxUSE_GUI
-@interface wxNSAppController : NSObject
+@interface wxNSAppController : NSObject wxOSX_10_6_AND_LATER(<NSApplicationDelegate>)
{
}
-- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender;
+- (void)applicationWillFinishLaunching:(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;
+ withReplyEvent:(NSAppleEventDescriptor *)replyEvent;
+
+- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender;
+- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender;
+- (void)applicationWillTerminate:(NSApplication *)sender;
@end
@implementation wxNSAppController
-- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender
-{
- wxUnusedVar(sender);
- // let wx do this, not cocoa
- return NO;
+- (void)applicationWillFinishLaunching:(NSApplication *)application {
+ wxUnusedVar(application);
+ wxTheApp->OnInit();
}
- (BOOL)application:(NSApplication *)sender openFile:(NSString *)filename;
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:(NSApplication *)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
-/*
+/*
allows ShowModal to work when using sheets.
- see include/wx/osx/cocoa/private.h for more info
+ see include/wx/osx/cocoa/private.h for more info
*/
@implementation ModalDialogDelegate
- (id)init
[super init];
sheetFinished = NO;
resultCode = -1;
+ impl = 0;
return self;
}
-- (BOOL)finished
+- (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
+bool wxApp::CallOnInit()
+{
+ if ( sm_isEmbedded )
+ return OnInit();
+
+ return true;
+}
+
bool wxApp::DoInitGui()
{
wxMacAutoreleasePool pool;
NSAppleEventManager *appleEventManager = [NSAppleEventManager sharedAppleEventManager];
[appleEventManager setEventHandler:controller andSelector:@selector(handleGetURLEvent:withReplyEvent:)
forEventClass:kInternetEventClass andEventID:kAEGetURL];
- [NSApp finishLaunching];
}
return true;
}
*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);
// called from OnPaint, even with the window's paint dc as source (see wxHTMLWindow)
NSBitmapImageRep *rep = [[[NSBitmapImageRep alloc] initWithFocusedViewRect: [view bounds]] retain];
[view unlockFocus];
-
+
wxBitmap bitmap(width, height);
if ( [rep respondsToSelector:@selector(CGImage)] )
{
#endif // wxUSE_GUI
-#endif // wxOSX_USE_COCOA
\ No newline at end of file
+#endif // wxOSX_USE_COCOA
projects / wxWidgets.git / blobdiff