Removed extraneous semicolons and commas (partly fixes #10456).

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

diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm
index 9c03ed54fed849a3a0ddc12cda742be6fd0f878b..44b70b7f01168a5e827a2aa31888294f70ca5701 100644 (file)
--- a/src/osx/cocoa/window.mm
+++ b/src/osx/cocoa/window.mm
@@ -41,8 +41,6 @@ NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const
 }
 
 - (void)drawRect: (NSRect) rect;
 }
 
 - (void)drawRect: (NSRect) rect;

-// TODO should the be moved to COMMON ?
-- (void)resetCursorRects;

 
 WXCOCOAIMPL_COMMON_INTERFACE
 
 
 WXCOCOAIMPL_COMMON_INTERFACE
 


@@ -58,6 +56,8 @@ WXCOCOAIMPL_COMMON_INTERFACE
 - (void)setFloatValue:(float)aFloat;
 - (void)setDoubleValue:(double)aDouble;
 
 - (void)setFloatValue:(float)aFloat;
 - (void)setDoubleValue:(double)aDouble;
 

+- (double)minValue;
+- (double)maxValue;

 - (void)setMinValue:(double)aDouble;
 - (void)setMaxValue:(double)aDouble;
 
 - (void)setMinValue:(double)aDouble;
 - (void)setMaxValue:(double)aDouble;
 


@@ -72,9 +72,9 @@ WXCOCOAIMPL_COMMON_INTERFACE
 - (id)contentView;
 @end 
 
 - (id)contentView;
 @end 
 

-long wxOSXTranslateCocoaKey(unsigned short code, int unichar )
+long wxOSXTranslateCocoaKey( int unichar )

 {
 {

-    long retval = code;
+    long retval = unichar;

     switch( unichar )
     {
         case NSUpArrowFunctionKey :
     switch( unichar )
     {
         case NSUpArrowFunctionKey :


@@ -131,25 +131,8 @@ void SetupKeyEvent( wxKeyEvent &wxevent , NSEvent * nsEvent )
     wxevent.m_controlDown = modifiers & NSControlKeyMask;
     wxevent.m_altDown = modifiers & NSAlternateKeyMask;
     wxevent.m_metaDown = modifiers & NSCommandKeyMask;
     wxevent.m_controlDown = modifiers & NSControlKeyMask;
     wxevent.m_altDown = modifiers & NSAlternateKeyMask;
     wxevent.m_metaDown = modifiers & NSCommandKeyMask;

-
-    wxString chars;
-    if ( eventType != NSFlagsChanged )
-    {
-        NSString* nschars = [nsEvent characters];
-        if ( nschars )
-        {
-            wxCFStringRef cfchars((CFStringRef)[nschars retain]);
-            chars = cfchars.AsString();
-        }
-    }
-    
-    int unichar = chars.Length() > 0 ? chars[0] : 0;

     
     

-#if wxUSE_UNICODE
-    wxevent.m_uniChar = unichar;
-#endif
-    wxevent.m_keyCode = wxOSXTranslateCocoaKey( [nsEvent keyCode], unichar ) ;
-//    wxevent.m_rawCode = keymessage;
+    wxevent.m_rawCode = [nsEvent keyCode];

     wxevent.m_rawFlags = modifiers;
     
     wxevent.SetTimestamp( [nsEvent timestamp] * 1000.0 ) ;
     wxevent.m_rawFlags = modifiers;
     
     wxevent.SetTimestamp( [nsEvent timestamp] * 1000.0 ) ;


@@ -167,6 +150,27 @@ void SetupKeyEvent( wxKeyEvent &wxevent , NSEvent * nsEvent )
         default :
             break ;
     }
         default :
             break ;
     }

+
+    wxString chars;
+    if ( eventType != NSFlagsChanged )
+    {
+        NSString* nschars = [nsEvent characters];
+        if ( nschars )
+        {
+            wxCFStringRef cfchars((CFStringRef)[nschars retain]);
+            chars = cfchars.AsString();
+        }
+    }
+    
+    int unichar = chars.Length() > 0 ? chars[0] : 0;
+    long keyval = wxOSXTranslateCocoaKey(unichar) ;
+    if ( keyval == unichar && ( wxevent.GetEventType() == wxEVT_KEY_UP || wxevent.GetEventType() == wxEVT_KEY_DOWN ) )
+        keyval = wxToupper( keyval ) ;
+
+#if wxUSE_UNICODE
+    wxevent.m_uniChar = unichar;
+#endif
+    wxevent.m_keyCode = keyval;

 }
 
 UInt32 g_lastButton = 0 ;
 }
 
 UInt32 g_lastButton = 0 ;


@@ -384,15 +388,6 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent )
     }
 }
 
     }
 }
 

-- (void) resetCursorRects
-{
-    [super resetCursorRects];
-    wxWindow* wxpeer = impl->GetWXPeer();
-    NSCursor *cursor = (NSCursor*)wxpeer->GetCursor().GetHCURSOR();
-    [self addCursorRect: [self bounds]
-          cursor: cursor];
-}
-

 WXCOCOAIMPL_COMMON_IMPLEMENTATION
 
 - (BOOL) canBecomeKeyView
 WXCOCOAIMPL_COMMON_IMPLEMENTATION
 
 - (BOOL) canBecomeKeyView


@@ -623,6 +618,24 @@ void wxWidgetCocoaImpl::SetMaximum( wxInt32 v )
     }
 }
 
     }
 }
 

+wxInt32 wxWidgetCocoaImpl::GetMinimum() const 
+{
+    if (  [m_osxView respondsToSelector:@selector(getMinValue:)] )
+    {
+        return [m_osxView minValue];
+    }
+    return 0;
+}
+
+wxInt32 wxWidgetCocoaImpl::GetMaximum() const 
+{
+    if (  [m_osxView respondsToSelector:@selector(getMaxValue:)] )
+    {
+        return [m_osxView maxValue];
+    }
+    return 0;
+}
+

 void wxWidgetCocoaImpl::SetBitmap( const wxBitmap& bitmap )
 {
     if (  [m_osxView respondsToSelector:@selector(setImage:)] )
 void wxWidgetCocoaImpl::SetBitmap( const wxBitmap& bitmap )
 {
     if (  [m_osxView respondsToSelector:@selector(setImage:)] )


@@ -715,7 +728,8 @@ bool wxWidgetCocoaImpl::DoHandleKeyEvent(NSEvent *event)
 {
     wxKeyEvent wxevent(wxEVT_KEY_DOWN);
     SetupKeyEvent( wxevent, event );
 {
     wxKeyEvent wxevent(wxEVT_KEY_DOWN);
     SetupKeyEvent( wxevent, event );

-    return GetWXPeer()->HandleWindowEvent(wxevent);
+
+    return GetWXPeer()->OSXHandleKeyEvent(wxevent);

 }
 
 bool wxWidgetCocoaImpl::DoHandleMouseEvent(NSEvent *event)
 }
 
 bool wxWidgetCocoaImpl::DoHandleMouseEvent(NSEvent *event)