void wxMacWakeUp()
{
- // TODO
+ 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
{
+ wxUnusedVar(sender);
// let wx do this, not cocoa
return NO;
}
- (BOOL)application:(NSApplication *)sender openFile:(NSString *)filename;
{
+ wxUnusedVar(sender);
wxCFStringRef cf(wxCFRetain(filename));
wxTheApp->MacOpenFile(cf.AsString()) ;
return YES;
- (BOOL)applicationShouldOpenUntitledFile:(NSApplication *)sender;
{
+ wxUnusedVar(sender);
wxTheApp->MacNewFile() ;
return NO;
}
- (BOOL)application:(NSApplication *)sender printFile:(NSString *)filename
{
+ wxUnusedVar(sender);
wxCFStringRef cf(wxCFRetain(filename));
wxTheApp->MacPrintFile(cf.AsString()) ;
return YES;
}
-/*
+/*
Allowable return values are:
NSTerminateNow - it is ok to proceed with termination
NSTerminateCancel - the application should not be terminated
*/
- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender
{
+ wxUnusedVar(sender);
wxWindow* win = wxTheApp->GetTopWindow() ;
if ( win )
{
wxCommandEvent exitEvent(wxEVT_COMMAND_MENU_SELECTED, wxApp::s_macExitMenuItemId);
- if (!win->ProcessEvent(exitEvent))
+ if (!win->GetEventHandler()->ProcessEvent(exitEvent))
win->Close(true) ;
}
else
- (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()) ;
}
@end
+/*
+ allows ShowModal to work when using sheets.
+ see include/wx/osx/cocoa/private.h for more info
+*/
+@implementation ModalDialogDelegate
+- (id)init
+{
+ [super init];
+ sheetFinished = NO;
+ resultCode = -1;
+ return self;
+}
+
+- (BOOL)finished
+{
+ return sheetFinished;
+}
+
+- (int)code
+{
+ return resultCode;
+}
+
+- (void)waitForSheetToFinish
+{
+ while (!sheetFinished)
+ {
+ wxSafeYield();
+ }
+}
+
+- (void)sheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo
+{
+ wxUnusedVar(contextInfo);
+ resultCode = returnCode;
+ sheetFinished = YES;
+ // NSAlerts don't need nor respond to orderOut
+ if ([sheet respondsToSelector:@selector(orderOut:)])
+ [sheet orderOut: self];
+}
+@end
+
bool wxApp::DoInitGui()
{
+ wxMacAutoreleasePool pool;
[NSApplication sharedApplication];
if (!sm_isEmbedded)
{
wxNSAppController* controller = [[wxNSAppController alloc] init];
[[NSApplication sharedApplication] setDelegate:controller];
-
+
NSAppleEventManager *appleEventManager = [NSAppleEventManager sharedAppleEventManager];
[appleEventManager setEventHandler:controller andSelector:@selector(handleGetURLEvent:withReplyEvent:)
forEventClass:kInternetEventClass andEventID:kAEGetURL];
+ [NSApp finishLaunching];
}
- [NSApp finishLaunching];
return true;
}
*width = r.GetWidth();
if ( height )
*height = r.GetHeight();
-
+
}
void wxGetMousePosition( int* x, int* y )
{
wxPoint pt = wxFromNSPoint(NULL, [NSEvent mouseLocation]);
+ if ( x )
+ *x = pt.x;
+ if ( y )
+ *y = pt.y;
};
wxTimerImpl* wxGUIAppTraits::CreateTimerImpl(wxTimer *timer)
return (gs_wxBusyCursorCount > 0);
}
-void wxMacGlobalToLocal( WindowRef window , Point*pt )
-{
-}
-
-void wxMacLocalToGlobal( WindowRef window , Point*pt )
-{
-}
-
wxBitmap wxWindowDCImpl::DoGetAsBitmap(const wxRect *subrect) const
{
// wxScreenDC is derived from wxWindowDC, so a screen dc will
// call this method when a Blit is performed with it as a source.
if (!m_window)
return wxNullBitmap;
-
+
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
+ // we use this method as other methods force a repaint, and this method can be
// called from OnPaint, even with the window's paint dc as source (see wxHTMLWindow)
NSBitmapImageRep *rep = [[[NSBitmapImageRep alloc] initWithFocusedViewRect: [view bounds]] retain];
[view unlockFocus];
-
- CGImageRef cgImageRef = (CGImageRef)[rep CGImage];
-
- wxBitmap bitmap(CGImageGetWidth(cgImageRef) , CGImageGetHeight(cgImageRef) );
- CGRect r = CGRectMake( 0 , 0 , CGImageGetWidth(cgImageRef) , CGImageGetHeight(cgImageRef) );
- // since our context is upside down we dont use CGContextDrawImage
- wxMacDrawCGImage( (CGContextRef) bitmap.GetHBITMAP() , &r, cgImageRef ) ;
- CGImageRelease(cgImageRef);
- cgImageRef = NULL;
+
+ wxBitmap bitmap(width, height);
+ if ( [rep respondsToSelector:@selector(CGImage)] )
+ {
+ CGImageRef cgImageRef = (CGImageRef)[rep CGImage];
+
+ CGRect r = CGRectMake( 0 , 0 , CGImageGetWidth(cgImageRef) , CGImageGetHeight(cgImageRef) );
+ // since our context is upside down we dont use CGContextDrawImage
+ wxMacDrawCGImage( (CGContextRef) bitmap.GetHBITMAP() , &r, cgImageRef ) ;
+ CGImageRelease(cgImageRef);
+ cgImageRef = NULL;
+ }
+ else
+ {
+ // TODO for 10.4 in case we can support this for osx_cocoa
+ }
[rep release];
-
+
return bitmap;
}
#endif // wxUSE_GUI
-
-
#endif // wxOSX_USE_COCOA
\ No newline at end of file
projects / wxWidgets.git / blobdiff