define MIIM_BITMAP &c in wx/msw/missing.h instead of msw/menu.cpp as menuitem.cpp...

[wxWidgets.git] / src / osx / cocoa / utils.mm

diff --git a/src/osx/cocoa/utils.mm b/src/osx/cocoa/utils.mm
index c60da586584be33019b619287824e495b91daea2..48bc5c9a96732c2ff631ea075b5bb4ee4e22dc50 100644 (file)
--- a/src/osx/cocoa/utils.mm
+++ b/src/osx/cocoa/utils.mm
@@ -56,7 +56,7 @@ void wxMacWakeUp()
 }
 
 #endif // wxUSE_BASE
 }
 
 #endif // wxUSE_BASE

- 
+

 #if wxUSE_GUI
 
 @interface wxNSAppController : NSObject
 #if wxUSE_GUI
 
 @interface wxNSAppController : NSObject


@@ -100,7 +100,7 @@ void wxMacWakeUp()
     return YES;
 }
 
     return YES;
 }
 

-/* 
+/*

     Allowable return values are:
         NSTerminateNow - it is ok to proceed with termination
         NSTerminateCancel - the application should not be terminated
     Allowable return values are:
         NSTerminateNow - it is ok to proceed with termination
         NSTerminateCancel - the application should not be terminated


@@ -113,7 +113,7 @@ void wxMacWakeUp()
     if ( win )
     {
         wxCommandEvent exitEvent(wxEVT_COMMAND_MENU_SELECTED, wxApp::s_macExitMenuItemId);
     if ( win )
     {
         wxCommandEvent exitEvent(wxEVT_COMMAND_MENU_SELECTED, wxApp::s_macExitMenuItemId);

-        if (!win->ProcessEvent(exitEvent))
+        if (!win->GetEventHandler()->ProcessEvent(exitEvent))

             win->Close(true) ;
     }
     else
             win->Close(true) ;
     }
     else


@@ -146,7 +146,7 @@ bool wxApp::DoInitGui()
     {
         wxNSAppController* controller = [[wxNSAppController alloc] init];
         [[NSApplication sharedApplication] setDelegate:controller];
     {
         wxNSAppController* controller = [[wxNSAppController alloc] init];
         [[NSApplication sharedApplication] setDelegate:controller];

-        
+

         NSAppleEventManager *appleEventManager = [NSAppleEventManager sharedAppleEventManager];
         [appleEventManager setEventHandler:controller andSelector:@selector(handleGetURLEvent:withReplyEvent:)
             forEventClass:kInternetEventClass andEventID:kAEGetURL];
         NSAppleEventManager *appleEventManager = [NSAppleEventManager sharedAppleEventManager];
         [appleEventManager setEventHandler:controller andSelector:@selector(handleGetURLEvent:withReplyEvent:)
             forEventClass:kInternetEventClass andEventID:kAEGetURL];


@@ -171,12 +171,16 @@ void wxClientDisplayRect(int *x, int *y, int *width, int *height)
         *width = r.GetWidth();
     if ( height )
         *height = r.GetHeight();
         *width = r.GetWidth();
     if ( height )
         *height = r.GetHeight();

-    
+

 }
 
 void wxGetMousePosition( int* x, int* y )
 {
     wxPoint pt = wxFromNSPoint(NULL, [NSEvent mouseLocation]);
 }
 
 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)
 };
 
 wxTimerImpl* wxGUIAppTraits::CreateTimerImpl(wxTimer *timer)


@@ -236,23 +240,23 @@ wxBitmap wxWindowDCImpl::DoGetAsBitmap(const wxRect *subrect) const
     // call this method when a Blit is performed with it as a source.
     if (!m_window)
         return wxNullBitmap;
     // call this method when a Blit is performed with it as a source.
     if (!m_window)
         return wxNullBitmap;

-        
+

     wxSize sz = m_window->GetSize();
     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 ;
     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];
     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];
     // 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]; 
+
+    CGImageRef cgImageRef = (CGImageRef)[rep CGImage];

 
     wxBitmap bitmap(CGImageGetWidth(cgImageRef)  , CGImageGetHeight(cgImageRef) );
     CGRect r = CGRectMake( 0 , 0 , CGImageGetWidth(cgImageRef)  , CGImageGetHeight(cgImageRef) );
 
     wxBitmap bitmap(CGImageGetWidth(cgImageRef)  , CGImageGetHeight(cgImageRef) );
     CGRect r = CGRectMake( 0 , 0 , CGImageGetWidth(cgImageRef)  , CGImageGetHeight(cgImageRef) );


@@ -261,12 +265,10 @@ wxBitmap wxWindowDCImpl::DoGetAsBitmap(const wxRect *subrect) const
     CGImageRelease(cgImageRef);
     cgImageRef = NULL;
     [rep release];
     CGImageRelease(cgImageRef);
     cgImageRef = NULL;
     [rep release];

-        
+

     return bitmap;
 }
 
 #endif // wxUSE_GUI
 
     return bitmap;
 }
 
 #endif // wxUSE_GUI
 

-
-

 #endif // wxOSX_USE_COCOA
\ No newline at end of file
 #endif // wxOSX_USE_COCOA
\ No newline at end of file