fixing copy/paste error from carbon version, fixes #11540

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

diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm
index 6d14e6b4591634d6823fd873a15ea17836cd7cd2..8e579e45d0e6a1ef4f66dd7f5fefdf4ce00fbf9b 100644 (file)
--- a/src/osx/cocoa/window.mm
+++ b/src/osx/cocoa/window.mm
@@ -15,6 +15,7 @@
     #include "wx/dcclient.h"
     #include "wx/nonownedwnd.h"
     #include "wx/log.h"
     #include "wx/dcclient.h"
     #include "wx/nonownedwnd.h"
     #include "wx/log.h"

+    #include "wx/textctrl.h"

 #endif
 
 #ifdef __WXMAC__
 #endif
 
 #ifdef __WXMAC__


@@ -31,6 +32,10 @@
     #include "wx/dnd.h"
 #endif
 
     #include "wx/dnd.h"
 #endif
 

+#if wxUSE_TOOLTIPS
+    #include "wx/tooltip.h"
+#endif
+

 #include <objc/objc-runtime.h>
 
 // Get the window with the focus
 #include <objc/objc-runtime.h>
 
 // Get the window with the focus


@@ -126,6 +131,7 @@ NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const
 - (void)setAction:(SEL)aSelector;
 - (void)setDoubleAction:(SEL)aSelector;
 - (void)setBackgroundColor:(NSColor*)aColor;
 - (void)setAction:(SEL)aSelector;
 - (void)setDoubleAction:(SEL)aSelector;
 - (void)setBackgroundColor:(NSColor*)aColor;

+- (void)setTextColor:(NSColor *)color;

 - (void)setImagePosition:(NSCellImagePosition)aPosition;
 @end
 
 - (void)setImagePosition:(NSCellImagePosition)aPosition;
 @end
 


@@ -683,7 +689,7 @@ void wxOSX_mouseEvent(NSView* self, SEL _cmd, NSEvent *event)
     impl->mouseEvent(event, self, _cmd);
 }
 
     impl->mouseEvent(event, self, _cmd);
 }
 

-BOOL wxOSX_acceptsFirstMouse(NSView* self, SEL _cmd, NSEvent *event)
+BOOL wxOSX_acceptsFirstMouse(NSView* WXUNUSED(self), SEL WXUNUSED(_cmd), NSEvent *WXUNUSED(event))

 {
     // This is needed to support click through, otherwise the first click on a window
     // will not do anything unless it is the active window already.
 {
     // This is needed to support click through, otherwise the first click on a window
     // will not do anything unless it is the active window already.


@@ -879,45 +885,6 @@ unsigned int wxWidgetCocoaImpl::draggingUpdated(void* s, WXWidget WXUNUSED(slf),
         result = wxDragCopy;
     else if ( sourceDragMask & NSDragOperationMove )
         result = wxDragMove;
         result = wxDragCopy;
     else if ( sourceDragMask & NSDragOperationMove )
         result = wxDragMove;

-
-    // FIXME: This doesn't seem the right place for the code, as GiveFeedback
-    // will only get called when the drop target is inside the app itself
-    // but at least some cases will work now.
-    if (wxDropSource* source = wxDropSource::GetCurrentDropSource())
-    {
-        if (!source->GiveFeedback(result))
-        {
-            wxStockCursor cursorID = wxCURSOR_NONE;
-
-            switch (result)
-            {
-                case wxDragCopy:
-                    cursorID = wxCURSOR_COPY_ARROW;
-                    break;
-
-                case wxDragMove:
-                    cursorID = wxCURSOR_ARROW;
-                    break;
-
-                case wxDragNone:
-                    cursorID = wxCURSOR_NO_ENTRY;
-                    break;
-
-                case wxDragError:
-                case wxDragLink:
-                case wxDragCancel:
-                default:
-                    // put these here to make gcc happy
-                    ;
-            }
-
-            if (cursorID != wxCURSOR_NONE)
-            {
-                wxCursor cursor( cursorID );
-                cursor.MacInstall();
-            }
-        }
-    }

     
     PasteboardRef pboardRef;
     PasteboardCreate((CFStringRef)[pboard name], &pboardRef);
     
     PasteboardRef pboardRef;
     PasteboardCreate((CFStringRef)[pboard name], &pboardRef);


@@ -1162,6 +1129,18 @@ void wxWidgetCocoaImpl::controlDoubleAction( WXWidget WXUNUSED(slf), void *WXUNU
 {
 }
 
 {
 }
 

+void wxWidgetCocoaImpl::controlTextDidChange()
+{
+    wxWindow* wxpeer = (wxWindow*)GetWXPeer();
+    if ( wxpeer ) 
+    {
+        wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, wxpeer->GetId());
+        event.SetEventObject( wxpeer );
+        event.SetString( static_cast<wxTextCtrl*>(wxpeer)->GetValue() );
+        wxpeer->HandleWindowEvent( event );
+    }
+}
+

 //
 
 #if OBJC_API_VERSION >= 2
 //
 
 #if OBJC_API_VERSION >= 2


@@ -1354,6 +1333,7 @@ void wxWidgetCocoaImpl::SetVisibility( bool visible )
 
 - (void)animationDidEnd:(NSAnimation*)animation
 {
 
 - (void)animationDidEnd:(NSAnimation*)animation
 {

+    wxUnusedVar(animation);

     m_isDone = true;
 }
 
     m_isDone = true;
 }
 


@@ -1666,11 +1646,11 @@ bool wxWidgetCocoaImpl::HasFocus() const
 
 bool wxWidgetCocoaImpl::SetFocus()
 {
 
 bool wxWidgetCocoaImpl::SetFocus()
 {

-    if ( [m_osxView canBecomeKeyView] == NO )
+    if ( !CanFocus() )

         return false;
 
         return false;
 

-    [[m_osxView window] makeFirstResponder: m_osxView] ;

     [[m_osxView window] makeKeyAndOrderFront:nil] ;
     [[m_osxView window] makeKeyAndOrderFront:nil] ;

+    [[m_osxView window] makeFirstResponder: m_osxView] ;

     return true;
 }
 
     return true;
 }
 


@@ -1910,10 +1890,27 @@ void wxWidgetCocoaImpl::SetControlSize( wxWindowVariant variant )
     }
 }
 
     }
 }
 

-void wxWidgetCocoaImpl::SetFont(wxFont const& font, wxColour const&, long, bool)
+void wxWidgetCocoaImpl::SetFont(wxFont const& font, wxColour const&col, long, bool)

 {
     if ([m_osxView respondsToSelector:@selector(setFont:)])
         [m_osxView setFont: font.OSXGetNSFont()];
 {
     if ([m_osxView respondsToSelector:@selector(setFont:)])
         [m_osxView setFont: font.OSXGetNSFont()];

+    if ([m_osxView respondsToSelector:@selector(setTextColor:)])
+        [m_osxView setTextColor:[NSColor colorWithCalibratedRed:(CGFloat) (col.Red() / 255.0)
+                                                                 green:(CGFloat) (col.Green() / 255.0)
+                                                                  blue:(CGFloat) (col.Blue() / 255.0)
+                                                                 alpha:(CGFloat) (col.Alpha() / 255.0)]];
+}
+
+void wxWidgetCocoaImpl::SetToolTip(wxToolTip* tooltip)
+{
+    if (tooltip)
+    {
+        wxCFStringRef cf( tooltip->GetTip() , m_wxPeer->GetFont().GetEncoding() );
+        [m_osxView setToolTip: cf.AsNSString()];
+    }
+    else 
+        [m_osxView setToolTip: nil];
+

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


@@ -1953,10 +1950,20 @@ bool wxWidgetCocoaImpl::DoHandleKeyEvent(NSEvent *event)
     {
         if ( !result )
         {
     {
         if ( !result )
         {

-            if ( [m_osxView isKindOfClass:[NSScrollView class] ] )
-                [[(NSScrollView*)m_osxView documentView] interpretKeyEvents:[NSArray arrayWithObject:event]];
+            if ( wxevent.GetKeyCode() < WXK_SPACE || wxevent.GetKeyCode() == WXK_DELETE || wxevent.GetKeyCode() >= WXK_START )
+            {
+                // eventually we could setup a doCommandBySelector catcher and retransform this into the wx key chars
+                wxKeyEvent wxevent2(wxevent) ;
+                wxevent2.SetEventType(wxEVT_CHAR);
+                GetWXPeer()->OSXHandleKeyEvent(wxevent2);
+            }

             else
             else

-                [m_osxView interpretKeyEvents:[NSArray arrayWithObject:event]];
+            {
+                if ( [m_osxView isKindOfClass:[NSScrollView class] ] )
+                    [[(NSScrollView*)m_osxView documentView] interpretKeyEvents:[NSArray arrayWithObject:event]];
+                else
+                    [m_osxView interpretKeyEvents:[NSArray arrayWithObject:event]];
+            }

             result = true;
         }
     }
             result = true;
         }
     }