added wakeup implementation for osx_cocoa

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

diff --git a/src/osx/cocoa/nonownedwnd.mm b/src/osx/cocoa/nonownedwnd.mm
index 2328590c819a718a52c8d1cace14b783fc99c6a8..c37765cd5c0dff309a5eb39e0e8a408d00d7e8ce 100644 (file)
--- a/src/osx/cocoa/nonownedwnd.mm
+++ b/src/osx/cocoa/nonownedwnd.mm
@@ -23,18 +23,18 @@ NSRect wxToNSRect( NSView* parent, const wxRect& r )
     int y = r.y;
     int x = r.x ;
     if ( parent == NULL || ![ parent isFlipped ] )
-        y = frame.size.height - ( r.y + r.height );
+        y = (int)(frame.size.height - ( r.y + r.height ));
     return NSMakeRect(x, y, r.width , r.height);
 }
 
 wxRect wxFromNSRect( NSView* parent, const NSRect& rect )
 {
     NSRect frame = parent ? [parent bounds] : [[NSScreen mainScreen] frame];
-    int y = rect.origin.y;
-    int x = rect.origin.x;
+    int y = (int)rect.origin.y;
+    int x = (int)rect.origin.x;
     if ( parent == NULL || ![ parent isFlipped ] )
-        y = frame.size.height - (rect.origin.y + rect.size.height);
-    return wxRect( x, y, rect.size.width, rect.size.height );
+        y = (int)(frame.size.height - (rect.origin.y + rect.size.height));
+    return wxRect( x, y, (int)rect.size.width, (int)rect.size.height );
 }
 
 NSPoint wxToNSPoint( NSView* parent, const wxPoint& p )
@@ -43,17 +43,17 @@ NSPoint wxToNSPoint( NSView* parent, const wxPoint& p )
     int x = p.x ;
     int y = p.y;
     if ( parent == NULL || ![ parent isFlipped ] )
-        y = frame.size.height - ( p.y );
+        y = (int)(frame.size.height - ( p.y ));
     return NSMakePoint(x, y);
 }
 
 wxPoint wxFromNSPoint( NSView* parent, const NSPoint& p )
 {
     NSRect frame = parent ? [parent bounds] : [[NSScreen mainScreen] frame];
-    int x = p.x;
-    int y = p.y;
+    int x = (int)p.x;
+    int y = (int)p.y;
     if ( parent == NULL || ![ parent isFlipped ] )
-        y = frame.size.height - ( p.y );
+        y = (int)(frame.size.height - ( p.y ));
     return wxPoint( x, y);
 }
 
@@ -118,8 +118,9 @@ typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector
 {
     if (selector != @selector(keyDown:) && selector != @selector(keyUp:))
     {
-        wxOSX_NoResponderHandlerPtr superimpl = (wxOSX_NoResponderHandlerPtr) [[self superclass] instanceMethodForSelector:@selector(noResponderFor:)];
-        superimpl(self, @selector(noResponderFor:), selector);
+        [super noResponderFor:selector];
+//        wxOSX_NoResponderHandlerPtr superimpl = (wxOSX_NoResponderHandlerPtr) [[self superclass] instanceMethodForSelector:@selector(noResponderFor:)];
+//        superimpl(self, @selector(noResponderFor:), selector);
     }
 }
 
@@ -164,8 +165,9 @@ typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector
 {
     if (selector != @selector(keyDown:) && selector != @selector(keyUp:))
     {
-        wxOSX_NoResponderHandlerPtr superimpl = (wxOSX_NoResponderHandlerPtr) [[self superclass] instanceMethodForSelector:@selector(noResponderFor:)];
-        superimpl(self, @selector(noResponderFor:), selector);
+        [super noResponderFor:selector];
+//        wxOSX_NoResponderHandlerPtr superimpl = (wxOSX_NoResponderHandlerPtr) [[self superclass] instanceMethodForSelector:@selector(noResponderFor:)];
+//        superimpl(self, @selector(noResponderFor:), selector);
     }
 }
 
@@ -215,8 +217,8 @@ typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector
 {
     NSRect frame = [win frame];
     wxRect wxframe = wxFromNSRect( NULL, frame );
-    wxframe.SetWidth( proposedFrameSize.width );
-    wxframe.SetHeight( proposedFrameSize.height );
+    wxframe.SetWidth( (int)proposedFrameSize.width );
+    wxframe.SetHeight( (int)proposedFrameSize.height );
     wxNSWindow* window = (wxNSWindow*) win;
     wxNonOwnedWindowCocoaImpl* windowimpl = [window implementation];
     if ( windowimpl )
@@ -289,6 +291,26 @@ typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector
     }
 }
 
+- (id)windowWillReturnFieldEditor:(NSWindow *)sender toObject:(id)anObject
+{
+    wxUnusedVar(sender);
+
+    if ([anObject isKindOfClass:[wxNSTextField class]])
+    {
+        wxNSTextField* tf = (wxNSTextField*) anObject;
+        wxNSTextFieldEditor* editor = [tf fieldEditor];
+        if ( editor == nil )
+        {
+            editor = [[wxNSTextFieldEditor alloc] init];
+            [editor setFieldEditor:YES];
+            [tf setFieldEditor:editor];
+        }
+        return editor;
+    }
+
+    return nil;
+}
+
 @end
 
 IMPLEMENT_DYNAMIC_CLASS( wxNonOwnedWindowCocoaImpl , wxNonOwnedWindowImpl )
@@ -318,8 +340,8 @@ void wxNonOwnedWindowCocoaImpl::Destroy()
     wxPendingDelete.Append( new wxDeferredObjectDeleter( this ) );
 }
 
-void wxNonOwnedWindowCocoaImpl::Create( wxWindow* parent, const wxPoint& pos, const wxSize& size,
-long style, long extraStyle, const wxString& name )
+void wxNonOwnedWindowCocoaImpl::Create( wxWindow* WXUNUSED(parent), const wxPoint& pos, const wxSize& size,
+long style, long extraStyle, const wxString& WXUNUSED(name) )
 {
     static wxNonOwnedWindowController* controller = NULL;
     
@@ -461,7 +483,7 @@ bool wxNonOwnedWindowCocoaImpl::Show(bool show)
     return true;
 }
     
-bool wxNonOwnedWindowCocoaImpl::ShowWithEffect(bool show, wxShowEffect effect, unsigned timeout)
+bool wxNonOwnedWindowCocoaImpl::ShowWithEffect(bool show, wxShowEffect WXUNUSED(effect), unsigned WXUNUSED(timeout))
 {
     return Show(show);
 }
@@ -477,7 +499,7 @@ bool wxNonOwnedWindowCocoaImpl::SetTransparent(wxByte alpha)
     return true;
 }
 
-bool wxNonOwnedWindowCocoaImpl::SetBackgroundColour(const wxColour& col )
+bool wxNonOwnedWindowCocoaImpl::SetBackgroundColour(const wxColour& WXUNUSED(col) )
 {
     return true;
 }
@@ -490,16 +512,16 @@ void wxNonOwnedWindowCocoaImpl::SetExtraStyle( long exStyle )
         int windowStyle = [ m_macWindow styleMask];
         if ( metal && !(windowStyle & NSTexturedBackgroundWindowMask) )
         {
-            wxFAIL_MSG( _T("Metal Style cannot be changed after creation") );
+            wxFAIL_MSG( wxT("Metal Style cannot be changed after creation") );
         }
         else if ( !metal && (windowStyle & NSTexturedBackgroundWindowMask ) )
         {
-            wxFAIL_MSG( _T("Metal Style cannot be changed after creation") );
+            wxFAIL_MSG( wxT("Metal Style cannot be changed after creation") );
         }        
     }
 }
     
-bool wxNonOwnedWindowCocoaImpl::SetBackgroundStyle(wxBackgroundStyle style)
+bool wxNonOwnedWindowCocoaImpl::SetBackgroundStyle(wxBackgroundStyle WXUNUSED(style))
 {
     return true;
 }
@@ -526,8 +548,8 @@ void wxNonOwnedWindowCocoaImpl::GetPosition( int &x, int &y ) const
 void wxNonOwnedWindowCocoaImpl::GetSize( int &width, int &height ) const
 {
     NSRect rect = [m_macWindow frame];
-    width = rect.size.width;
-    height = rect.size.height;
+    width = (int)rect.size.width;
+    height = (int)rect.size.height;
 }
 
 void wxNonOwnedWindowCocoaImpl::GetContentArea( int& left, int &top, int &width, int &height ) const
@@ -535,13 +557,13 @@ void wxNonOwnedWindowCocoaImpl::GetContentArea( int& left, int &top, int &width,
     NSRect outer = NSMakeRect(100,100,100,100);
     NSRect content = [NSWindow contentRectForFrameRect:outer styleMask:[m_macWindow styleMask] ];
     NSRect rect = [[m_macWindow contentView] frame];
-    left = rect.origin.x;
-    top = rect.origin.y;
-    width = rect.size.width;
-    height = rect.size.height;
+    left = (int)rect.origin.x;
+    top = (int)rect.origin.y;
+    width = (int)rect.size.width;
+    height = (int)rect.size.height;
 }
     
-bool wxNonOwnedWindowCocoaImpl::SetShape(const wxRegion& region)
+bool wxNonOwnedWindowCocoaImpl::SetShape(const wxRegion& WXUNUSED(region))
 {
     return false;
 }
@@ -569,7 +591,7 @@ void wxNonOwnedWindowCocoaImpl::Iconize( bool iconize )
         [m_macWindow deminiaturize:nil];
 }
     
-void wxNonOwnedWindowCocoaImpl::Maximize(bool maximize)
+void wxNonOwnedWindowCocoaImpl::Maximize(bool WXUNUSED(maximize))
 {
     [m_macWindow zoom:nil];
 }
@@ -588,7 +610,7 @@ bool wxNonOwnedWindowCocoaImpl::IsFullScreen() const
     return m_macFullScreenData != NULL ;
 }
     
-bool wxNonOwnedWindowCocoaImpl::ShowFullScreen(bool show, long style)
+bool wxNonOwnedWindowCocoaImpl::ShowFullScreen(bool show, long WXUNUSED(style))
 {
     if ( show )
     {