content must be changeable by wx even though control may be disabled

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

diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm
index ed2ddf329af34b3a7a81fd2493916c0d775e6834..cf91905014597db29faffaef5c3477cc0b2f96dd 100644 (file)
--- a/src/osx/cocoa/window.mm
+++ b/src/osx/cocoa/window.mm
@@ -31,6 +31,29 @@
 
 #include <objc/objc-runtime.h>
 
 
 #include <objc/objc-runtime.h>
 

+// Get the window with the focus
+
+WXWidget wxWidgetImpl::FindFocus()
+{
+    NSView* focusedView = nil;
+    NSWindow* keyWindow = [[NSApplication sharedApplication] keyWindow];
+    if ( keyWindow != nil )
+    {
+        NSResponder* responder = [keyWindow firstResponder];
+        if ( [responder isKindOfClass:[NSTextView class]] && 
+            [keyWindow fieldEditor:NO forObject:nil] != nil )
+        {
+            focusedView = [(NSTextView*)responder delegate];
+        }
+        else
+        {
+            if ( [responder isKindOfClass:[NSView class]] )
+                focusedView = (NSView*) responder;
+        }
+    }
+    return focusedView;
+}
+

 NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const wxSize &size , bool adjustForOrigin )
 {
     int x, y, w, h ;
 NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const wxSize &size , bool adjustForOrigin )
 {
     int x, y, w, h ;


@@ -47,7 +70,6 @@ NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const
     NSTrackingRectTag rectTag;
 }
 
     NSTrackingRectTag rectTag;
 }
 

-- (BOOL) canBecomeKeyView;

 // the tracking tag is needed to track mouse enter / exit events 
 - (void) setTrackingTag: (NSTrackingRectTag)tag;
 - (NSTrackingRectTag) trackingTag;
 // the tracking tag is needed to track mouse enter / exit events 
 - (void) setTrackingTag: (NSTrackingRectTag)tag;
 - (NSTrackingRectTag) trackingTag;


@@ -439,11 +461,6 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent )
     }
 }
 
     }
 }
 

-- (BOOL) canBecomeKeyView
-{
-    return YES;
-}
-

 - (void) setTrackingTag: (NSTrackingRectTag)tag
 {
     rectTag = tag;
 - (void) setTrackingTag: (NSTrackingRectTag)tag
 {
     rectTag = tag;


@@ -609,7 +626,7 @@ void wxOSX_controlDoubleAction(NSView* self, SEL _cmd, id sender)
     impl->controlDoubleAction(self, _cmd, sender);
 }
 
     impl->controlDoubleAction(self, _cmd, sender);
 }
 

-unsigned int wxWidgetCocoaImpl::draggingEntered(void* s, WXWidget slf, void *_cmd)
+unsigned int wxWidgetCocoaImpl::draggingEntered(void* s, WXWidget WXUNUSED(slf), void *WXUNUSED(_cmd))

 {
     id <NSDraggingInfo>sender = (id <NSDraggingInfo>) s;
     NSPasteboard *pboard = [sender draggingPasteboard];
 {
     id <NSDraggingInfo>sender = (id <NSDraggingInfo>) s;
     NSPasteboard *pboard = [sender draggingPasteboard];


@@ -654,7 +671,7 @@ unsigned int wxWidgetCocoaImpl::draggingEntered(void* s, WXWidget slf, void *_cm
     return nsresult;
 }
 
     return nsresult;
 }
 

-void wxWidgetCocoaImpl::draggingExited(void* s, WXWidget slf, void *_cmd)
+void wxWidgetCocoaImpl::draggingExited(void* s, WXWidget WXUNUSED(slf), void *WXUNUSED(_cmd))

 {
     id <NSDraggingInfo>sender = (id <NSDraggingInfo>) s;
     NSPasteboard *pboard = [sender draggingPasteboard];
 {
     id <NSDraggingInfo>sender = (id <NSDraggingInfo>) s;
     NSPasteboard *pboard = [sender draggingPasteboard];


@@ -674,7 +691,7 @@ void wxWidgetCocoaImpl::draggingExited(void* s, WXWidget slf, void *_cmd)
     CFRelease(pboardRef);
  }
 
     CFRelease(pboardRef);
  }
 

-unsigned int wxWidgetCocoaImpl::draggingUpdated(void* s, WXWidget slf, void *_cmd)
+unsigned int wxWidgetCocoaImpl::draggingUpdated(void* s, WXWidget WXUNUSED(slf), void *WXUNUSED(_cmd))

 {
     id <NSDraggingInfo>sender = (id <NSDraggingInfo>) s;
     NSPasteboard *pboard = [sender draggingPasteboard];
 {
     id <NSDraggingInfo>sender = (id <NSDraggingInfo>) s;
     NSPasteboard *pboard = [sender draggingPasteboard];


@@ -719,7 +736,7 @@ unsigned int wxWidgetCocoaImpl::draggingUpdated(void* s, WXWidget slf, void *_cm
     return nsresult;
 }
 
     return nsresult;
 }
 

-bool wxWidgetCocoaImpl::performDragOperation(void* s, WXWidget slf, void *_cmd)
+bool wxWidgetCocoaImpl::performDragOperation(void* s, WXWidget WXUNUSED(slf), void *WXUNUSED(_cmd))

 {
     id <NSDraggingInfo>sender = (id <NSDraggingInfo>) s;
 
 {
     id <NSDraggingInfo>sender = (id <NSDraggingInfo>) s;
 


@@ -793,22 +810,26 @@ bool wxWidgetCocoaImpl::performKeyEquivalent(WX_NSEvent event, WXWidget slf, voi
 
 bool wxWidgetCocoaImpl::acceptsFirstResponder(WXWidget slf, void *_cmd)
 {
 
 bool wxWidgetCocoaImpl::acceptsFirstResponder(WXWidget slf, void *_cmd)
 {

-    // FIXME: We need to find a way to query AcceptsFocus here, but when we do it
-    // it calls native APIs which lead us back here and into a loop.
-    wxOSX_FocusHandlerPtr superimpl = (wxOSX_FocusHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
-    return superimpl(slf, (SEL)_cmd);
+    if ( m_wxPeer->MacIsUserPane() )
+        return m_wxPeer->AcceptsFocus();
+    else
+    {
+        wxOSX_FocusHandlerPtr superimpl = (wxOSX_FocusHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
+        return superimpl(slf, (SEL)_cmd);
+    }

 }
 
 bool wxWidgetCocoaImpl::becomeFirstResponder(WXWidget slf, void *_cmd)
 {
     wxOSX_FocusHandlerPtr superimpl = (wxOSX_FocusHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
     // get the current focus before running becomeFirstResponder
 }
 
 bool wxWidgetCocoaImpl::becomeFirstResponder(WXWidget slf, void *_cmd)
 {
     wxOSX_FocusHandlerPtr superimpl = (wxOSX_FocusHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
     // get the current focus before running becomeFirstResponder

-    NSResponder* currentResponder = [[NSApp keyWindow] firstResponder]; 
-    NSView* otherView = (currentResponder != nil && [currentResponder isKindOfClass:[NSView class]]) ? (NSView*) currentResponder : NULL; 
+    NSView* otherView = FindFocus(); 

     wxWidgetImpl* otherWindow = FindFromWXWidget(otherView);
     BOOL r = superimpl(slf, (SEL)_cmd);
     if ( r )
     wxWidgetImpl* otherWindow = FindFromWXWidget(otherView);
     BOOL r = superimpl(slf, (SEL)_cmd);
     if ( r )

+    {

         DoNotifyFocusEvent( true, otherWindow );
         DoNotifyFocusEvent( true, otherWindow );

+    }

     return r;
 }
 
     return r;
 }
 


@@ -817,11 +838,14 @@ bool wxWidgetCocoaImpl::resignFirstResponder(WXWidget slf, void *_cmd)
     wxOSX_FocusHandlerPtr superimpl = (wxOSX_FocusHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
     BOOL r = superimpl(slf, (SEL)_cmd);
     // get the current focus after running resignFirstResponder
     wxOSX_FocusHandlerPtr superimpl = (wxOSX_FocusHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
     BOOL r = superimpl(slf, (SEL)_cmd);
     // get the current focus after running resignFirstResponder

-    NSResponder* currentResponder = [[NSApp keyWindow] firstResponder]; 
-    NSView* otherView = (currentResponder != nil && [currentResponder isKindOfClass:[NSView class]]) ? (NSView*) currentResponder : NULL; 
+    NSView* otherView = FindFocus(); 

     wxWidgetImpl* otherWindow = FindFromWXWidget(otherView);
     wxWidgetImpl* otherWindow = FindFromWXWidget(otherView);

-    if ( r )
+    // NSTextViews have an editor as true responder, therefore the might get the
+    // resign notification if their editor takes over, don't trigger any event hen
+    if ( r && otherWindow != this)
+    {

         DoNotifyFocusEvent( false, otherWindow );
         DoNotifyFocusEvent( false, otherWindow );

+    }

     return r;
 }
 
     return r;
 }
 


@@ -844,7 +868,7 @@ void wxWidgetCocoaImpl::resetCursorRects(WXWidget slf, void *_cmd)
     }
 }
   
     }
 }
   

-bool wxWidgetCocoaImpl::isFlipped(WXWidget slf, void *_cmd)
+bool wxWidgetCocoaImpl::isFlipped(WXWidget WXUNUSED(slf), void *WXUNUSED(_cmd))

 {
     return m_isFlipped;
 }
 {
     return m_isFlipped;
 }


@@ -852,7 +876,7 @@ bool wxWidgetCocoaImpl::isFlipped(WXWidget slf, void *_cmd)
 
 #define OSX_DEBUG_DRAWING 0
 
 
 #define OSX_DEBUG_DRAWING 0
 

-void wxWidgetCocoaImpl::drawRect(void* rect, WXWidget slf, void *_cmd)
+void wxWidgetCocoaImpl::drawRect(void* rect, WXWidget slf, void *WXUNUSED(_cmd))

 {
     CGContextRef context = (CGContextRef) [[NSGraphicsContext currentContext] graphicsPort];
     CGContextSaveGState( context );
 {
     CGContextRef context = (CGContextRef) [[NSGraphicsContext currentContext] graphicsPort];
     CGContextSaveGState( context );


@@ -911,14 +935,14 @@ void wxWidgetCocoaImpl::drawRect(void* rect, WXWidget slf, void *_cmd)
     CGContextRestoreGState( context );
 }
 
     CGContextRestoreGState( context );
 }
 

-void wxWidgetCocoaImpl::controlAction( WXWidget slf, void *_cmd, void *sender)
+void wxWidgetCocoaImpl::controlAction( WXWidget WXUNUSED(slf), void *WXUNUSED(_cmd), void *WXUNUSED(sender))

 {
     wxWindow* wxpeer = (wxWindow*) GetWXPeer();
     if ( wxpeer )
         wxpeer->OSXHandleClicked(0);
 }
 
 {
     wxWindow* wxpeer = (wxWindow*) GetWXPeer();
     if ( wxpeer )
         wxpeer->OSXHandleClicked(0);
 }
 

-void wxWidgetCocoaImpl::controlDoubleAction( WXWidget slf, void *_cmd, void *sender)
+void wxWidgetCocoaImpl::controlDoubleAction( WXWidget WXUNUSED(slf), void *WXUNUSED(_cmd), void *WXUNUSED(sender))

 {
 }
 
 {
 }
 


@@ -1059,7 +1083,7 @@ void wxWidgetCocoaImpl::Lower()
 {
 }
 
 {
 }
 

-void wxWidgetCocoaImpl::ScrollRect( const wxRect *rect, int dx, int dy )
+void wxWidgetCocoaImpl::ScrollRect( const wxRect *WXUNUSED(rect), int WXUNUSED(dx), int WXUNUSED(dy) )

 {
 #if 1
     SetNeedsDisplay() ;
 {
 #if 1
     SetNeedsDisplay() ;


@@ -1080,7 +1104,7 @@ void wxWidgetCocoaImpl::Move(int x, int y, int width, int height)
     wxWindowMac* parent = GetWXPeer()->GetParent();
     // under Cocoa we might have a contentView in the wxParent to which we have to 
     // adjust the coordinates
     wxWindowMac* parent = GetWXPeer()->GetParent();
     // under Cocoa we might have a contentView in the wxParent to which we have to 
     // adjust the coordinates

-    if (parent)
+    if (parent && [m_osxView superview] != parent->GetHandle() )

     {
         int cx = 0,cy = 0,cw = 0,ch = 0;
         if ( parent->GetPeer() )
     {
         int cx = 0,cy = 0,cw = 0,ch = 0;
         if ( parent->GetPeer() )


@@ -1163,7 +1187,7 @@ bool wxWidgetCocoaImpl::CanFocus() const
 
 bool wxWidgetCocoaImpl::HasFocus() const
 {
 
 bool wxWidgetCocoaImpl::HasFocus() const
 {

-    return ( [[m_osxView window] firstResponder] == m_osxView );
+    return ( FindFocus() == m_osxView );

 }
 
 bool wxWidgetCocoaImpl::SetFocus() 
 }
 
 bool wxWidgetCocoaImpl::SetFocus() 


@@ -1197,12 +1221,12 @@ void wxWidgetCocoaImpl::SetLabel( const wxString& title, wxFontEncoding encoding
 {
     if ( [m_osxView respondsToSelector:@selector(setTitle:) ] )
     {
 {
     if ( [m_osxView respondsToSelector:@selector(setTitle:) ] )
     {

-        wxCFStringRef cf( title , m_wxPeer->GetFont().GetEncoding() );
+        wxCFStringRef cf( title , encoding );

         [m_osxView setTitle:cf.AsNSString()];
     }
     else if ( [m_osxView respondsToSelector:@selector(setStringValue:) ] )
     {
         [m_osxView setTitle:cf.AsNSString()];
     }
     else if ( [m_osxView respondsToSelector:@selector(setStringValue:) ] )
     {

-        wxCFStringRef cf( title , m_wxPeer->GetFont().GetEncoding() );
+        wxCFStringRef cf( title , encoding );

         [m_osxView setStringValue:cf.AsNSString()];
     }
 }
         [m_osxView setStringValue:cf.AsNSString()];
     }
 }


@@ -1278,7 +1302,7 @@ void wxWidgetCocoaImpl::SetBitmap( const wxBitmap& bitmap )
     }
 }
 
     }
 }
 

-void wxWidgetCocoaImpl::SetupTabs( const wxNotebook& notebook)
+void wxWidgetCocoaImpl::SetupTabs( const wxNotebook& WXUNUSED(notebook))

 {
     // implementation in subclass
 }
 {
     // implementation in subclass
 }


@@ -1315,7 +1339,7 @@ void wxWidgetCocoaImpl::PulseGauge()
 {
 }
 
 {
 }
 

-void wxWidgetCocoaImpl::SetScrollThumb( wxInt32 val, wxInt32 view )
+void wxWidgetCocoaImpl::SetScrollThumb( wxInt32 WXUNUSED(val), wxInt32 WXUNUSED(view) )

 {
 }
 
 {
 }
 


@@ -1352,11 +1376,7 @@ void wxWidgetCocoaImpl::SetControlSize( wxWindowVariant variant )
 void wxWidgetCocoaImpl::SetFont(wxFont const& font, wxColour const&, long, bool)
 {
     if ([m_osxView respondsToSelector:@selector(setFont:)])
 void wxWidgetCocoaImpl::SetFont(wxFont const& font, wxColour const&, long, bool)
 {
     if ([m_osxView respondsToSelector:@selector(setFont:)])

-#if wxOSX_USE_CORE_TEXT
-        [m_osxView setFont: (NSFont*)font.MacGetCTFont()];
-#else
-
-#endif
+        [m_osxView setFont: font.OSXGetNSFont()];

 }
 
 void wxWidgetCocoaImpl::InstallEventHandler( WXWidget control )
 }
 
 void wxWidgetCocoaImpl::InstallEventHandler( WXWidget control )


@@ -1489,8 +1509,9 @@ void wxWidgetCocoaImpl::SetFlipped(bool flipped)
 // Factory methods
 //
 
 // Factory methods
 //
 

-wxWidgetImpl* wxWidgetImpl::CreateUserPane( wxWindowMac* wxpeer, wxWindowMac* parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
-                            long style, long extraStyle)
+wxWidgetImpl* wxWidgetImpl::CreateUserPane( wxWindowMac* wxpeer, wxWindowMac* WXUNUSED(parent), 
+    wxWindowID WXUNUSED(id), const wxPoint& pos, const wxSize& size,
+    long WXUNUSED(style), long WXUNUSED(extraStyle))

 {
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxNSView* v = [[wxNSView alloc] initWithFrame:r];
 {
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxNSView* v = [[wxNSView alloc] initWithFrame:r];