adjust the toolbar tools bitmap size to fit the biggest bitmap used under wxOSX too...

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

diff --git a/src/osx/cocoa/nonownedwnd.mm b/src/osx/cocoa/nonownedwnd.mm
index e8431e76a8720d4b14a8f26c93edd7677930ed1e..f29cb787810bb22506d2c9d553ec9395f661d015 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 ] )
     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];
     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 ] )
     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 )
 }
 
 NSPoint wxToNSPoint( NSView* parent, const wxPoint& p )


@@ -43,20 +43,40 @@ NSPoint wxToNSPoint( NSView* parent, const wxPoint& p )
     int x = p.x ;
     int y = p.y;
     if ( parent == NULL || ![ parent isFlipped ] )
     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];
     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 ] )
     if ( parent == NULL || ![ parent isFlipped ] )

-        y = frame.size.height - ( p.y );
+        y = (int)(frame.size.height - ( p.y ));

     return wxPoint( x, y);
 }
 
     return wxPoint( x, y);
 }
 

+bool shouldHandleSelector(SEL selector)
+{
+    if (selector == @selector(noop:) 
+            || selector == @selector(complete:)
+            || selector == @selector(deleteBackward:)
+            || selector == @selector(deleteForward:)
+            || selector == @selector(insertNewline:)
+            || selector == @selector(insertTab:)
+            || selector == @selector(keyDown:)
+            || selector == @selector(keyUp:)
+            || selector == @selector(scrollPageUp:)
+            || selector == @selector(scrollPageDown:)
+            || selector == @selector(scrollToBeginningOfDocument:)
+            || selector == @selector(scrollToEndOfDocument:))
+        return false;
+        
+    return true;
+
+}
+

 //
 // wx native implementation classes
 //
 //
 // wx native implementation classes
 //


@@ -64,7 +84,6 @@ wxPoint wxFromNSPoint( NSView* parent, const NSPoint& p )
 typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector);
 
 @interface wxNSWindow : NSWindow
 typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector);
 
 @interface wxNSWindow : NSWindow

-

 {
     wxNonOwnedWindowCocoaImpl* impl;
 }
 {
     wxNonOwnedWindowCocoaImpl* impl;
 }


@@ -86,13 +105,22 @@ typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector
     return impl;
 }
 
     return impl;
 }
 

+- (void)doCommandBySelector:(SEL)selector
+{
+    if (shouldHandleSelector(selector) && 
+        !(selector == @selector(cancel:) || selector == @selector(cancelOperation:)) )
+        [super doCommandBySelector:selector];
+}
+
+

 // NB: if we don't do this, all key downs that get handled lead to a NSBeep
 - (void)noResponderFor: (SEL) selector
 {
 // NB: if we don't do this, all key downs that get handled lead to a NSBeep
 - (void)noResponderFor: (SEL) selector
 {

-    if (selector != @selector(keyDown:))
+    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);

     }
 }
 
     }
 }
 


@@ -116,18 +144,30 @@ typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector
     impl = theImplementation;
 }
 
     impl = theImplementation;
 }
 

+- (BOOL)canBecomeKeyWindow
+{
+    return YES;
+}
+

 - (wxNonOwnedWindowCocoaImpl*) implementation
 {
     return impl;
 }
 
 - (wxNonOwnedWindowCocoaImpl*) implementation
 {
     return impl;
 }
 

-// NB: if we don't do this, all key downs that get handled lead to a NSBeep
+- (void)doCommandBySelector:(SEL)selector
+{
+    if (shouldHandleSelector(selector))
+        [super doCommandBySelector:selector];
+}
+
+// NB: if we don't do this, it seems that all events that end here lead to a NSBeep

 - (void)noResponderFor: (SEL) selector
 {
 - (void)noResponderFor: (SEL) selector
 {

-    if (selector != @selector(keyDown:))
+    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);

     }
 }
 
     }
 }
 


@@ -144,8 +184,8 @@ typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector
 
 - (void)windowDidResize:(NSNotification *)notification;
 - (NSSize)windowWillResize:(NSWindow *)window toSize:(NSSize)proposedFrameSize;
 
 - (void)windowDidResize:(NSNotification *)notification;
 - (NSSize)windowWillResize:(NSWindow *)window toSize:(NSSize)proposedFrameSize;

-- (void)windowDidResignMain:(NSNotification *)notification;
-- (void)windowDidBecomeMain:(NSNotification *)notification;
+- (void)windowDidResignKey:(NSNotification *)notification;
+- (void)windowDidBecomeKey:(NSNotification *)notification;

 - (void)windowDidMove:(NSNotification *)notification;
 - (BOOL)windowShouldClose:(id)window;
 
 - (void)windowDidMove:(NSNotification *)notification;
 - (BOOL)windowShouldClose:(id)window;
 


@@ -177,8 +217,8 @@ typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector
 {
     NSRect frame = [win frame];
     wxRect wxframe = wxFromNSRect( NULL, frame );
 {
     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 )
     wxNSWindow* window = (wxNSWindow*) win;
     wxNonOwnedWindowCocoaImpl* windowimpl = [window implementation];
     if ( windowimpl )


@@ -219,7 +259,7 @@ typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector
     }
 }
 
     }
 }
 

-- (void)windowDidBecomeMain:(NSNotification *)notification
+- (void)windowDidBecomeKey:(NSNotification *)notification

 {
     wxNSWindow* window = (wxNSWindow*) [notification object];
     wxNonOwnedWindowCocoaImpl* windowimpl = [window implementation];
 {
     wxNSWindow* window = (wxNSWindow*) [notification object];
     wxNonOwnedWindowCocoaImpl* windowimpl = [window implementation];


@@ -231,7 +271,7 @@ typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector
     }
 }
 
     }
 }
 

-- (void)windowDidResignMain:(NSNotification *)notification
+- (void)windowDidResignKey:(NSNotification *)notification

 {
     wxNSWindow* window = (wxNSWindow*) [notification object];
     wxNonOwnedWindowCocoaImpl* windowimpl = [window implementation];
 {
     wxNSWindow* window = (wxNSWindow*) [notification object];
     wxNonOwnedWindowCocoaImpl* windowimpl = [window implementation];


@@ -239,8 +279,36 @@ typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector
     {
         wxNonOwnedWindow* wxpeer = windowimpl->GetWXPeer();
         if ( wxpeer )
     {
         wxNonOwnedWindow* wxpeer = windowimpl->GetWXPeer();
         if ( wxpeer )

+        {

             wxpeer->HandleActivated(0, false);
             wxpeer->HandleActivated(0, false);

+            // Needed for popup window since the firstResponder 
+            // (focus in wx) doesn't change when this 
+            // TLW becomes inactive.
+            wxFocusEvent event( wxEVT_KILL_FOCUS, wxpeer->GetId());
+            event.SetEventObject(wxpeer);
+            wxpeer->HandleWindowEvent(event);
+        }
+    }
+}
+
+- (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
 }
 
 @end


@@ -272,8 +340,8 @@ void wxNonOwnedWindowCocoaImpl::Destroy()
     wxPendingDelete.Append( new wxDeferredObjectDeleter( this ) );
 }
 
     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;
     
 {
     static wxNonOwnedWindowController* controller = NULL;
     


@@ -283,8 +351,11 @@ long style, long extraStyle, const wxString& name )
 
     int windowstyle = NSBorderlessWindowMask;
     
 
     int windowstyle = NSBorderlessWindowMask;
     

-    if ( style & wxFRAME_TOOL_WINDOW )
+    if ( style & wxFRAME_TOOL_WINDOW || ( style & wxPOPUP_WINDOW ) || 
+            GetWXPeer()->GetExtraStyle() & wxTOPLEVEL_EX_DIALOG )
+    {

         m_macWindow = [wxNSPanel alloc];
         m_macWindow = [wxNSPanel alloc];

+    }

     else
         m_macWindow = [wxNSWindow alloc];
     
     else
         m_macWindow = [wxNSWindow alloc];
     


@@ -382,8 +453,6 @@ long style, long extraStyle, const wxString& name )
     [m_macWindow setDelegate:controller];
     
     [m_macWindow setAcceptsMouseMovedEvents: YES];
     [m_macWindow setDelegate:controller];
     
     [m_macWindow setAcceptsMouseMovedEvents: YES];

-    
-    // [m_macWindow makeKeyAndOrderFront:nil];

 }
 
 
 }
 
 


@@ -406,7 +475,7 @@ bool wxNonOwnedWindowCocoaImpl::Show(bool show)
 {
     if ( show )
     {
 {
     if ( show )
     {

-        [m_macWindow orderFront:nil];
+        [m_macWindow makeKeyAndOrderFront:nil];

         [[m_macWindow contentView] setNeedsDisplay:YES];
     }
     else 
         [[m_macWindow contentView] setNeedsDisplay:YES];
     }
     else 


@@ -414,7 +483,7 @@ bool wxNonOwnedWindowCocoaImpl::Show(bool show)
     return true;
 }
     
     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);
 }
 {
     return Show(show);
 }


@@ -430,7 +499,7 @@ bool wxNonOwnedWindowCocoaImpl::SetTransparent(wxByte alpha)
     return true;
 }
 
     return true;
 }
 

-bool wxNonOwnedWindowCocoaImpl::SetBackgroundColour(const wxColour& col )
+bool wxNonOwnedWindowCocoaImpl::SetBackgroundColour(const wxColour& WXUNUSED(col) )

 {
     return true;
 }
 {
     return true;
 }


@@ -452,7 +521,7 @@ void wxNonOwnedWindowCocoaImpl::SetExtraStyle( long exStyle )
     }
 }
     
     }
 }
     

-bool wxNonOwnedWindowCocoaImpl::SetBackgroundStyle(wxBackgroundStyle style)
+bool wxNonOwnedWindowCocoaImpl::SetBackgroundStyle(wxBackgroundStyle WXUNUSED(style))

 {
     return true;
 }
 {
     return true;
 }


@@ -479,20 +548,22 @@ void wxNonOwnedWindowCocoaImpl::GetPosition( int &x, int &y ) const
 void wxNonOwnedWindowCocoaImpl::GetSize( int &width, int &height ) const
 {
     NSRect rect = [m_macWindow frame];
 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 &right, int &width, int &height ) const
+void wxNonOwnedWindowCocoaImpl::GetContentArea( int& left, int &top, int &width, int &height ) const

 {
     NSRect outer = NSMakeRect(100,100,100,100);
     NSRect content = [NSWindow contentRectForFrameRect:outer styleMask:[m_macWindow styleMask] ];
     NSRect rect = [[m_macWindow contentView] frame];
 {
     NSRect outer = NSMakeRect(100,100,100,100);
     NSRect content = [NSWindow contentRectForFrameRect:outer styleMask:[m_macWindow styleMask] ];
     NSRect rect = [[m_macWindow contentView] frame];

-    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;
 }
 {
     return false;
 }


@@ -520,7 +591,7 @@ void wxNonOwnedWindowCocoaImpl::Iconize( bool iconize )
         [m_macWindow deminiaturize:nil];
 }
     
         [m_macWindow deminiaturize:nil];
 }
     

-void wxNonOwnedWindowCocoaImpl::Maximize(bool maximize)
+void wxNonOwnedWindowCocoaImpl::Maximize(bool WXUNUSED(maximize))

 {
     [m_macWindow zoom:nil];
 }
 {
     [m_macWindow zoom:nil];
 }


@@ -539,7 +610,7 @@ bool wxNonOwnedWindowCocoaImpl::IsFullScreen() const
     return m_macFullScreenData != NULL ;
 }
     
     return m_macFullScreenData != NULL ;
 }
     

-bool wxNonOwnedWindowCocoaImpl::ShowFullScreen(bool show, long style)
+bool wxNonOwnedWindowCocoaImpl::ShowFullScreen(bool show, long WXUNUSED(style))

 {
     if ( show )
     {
 {
     if ( show )
     {