Spell contributor name correctly.

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

diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm
index 6acdec29ee9746aebaf4863d93a658b9f72a9e0e..85020c21b4f843e019d7c3c03859b7409ee9c4c3 100644 (file)
--- a/src/osx/cocoa/window.mm
+++ b/src/osx/cocoa/window.mm
@@ -70,7 +70,7 @@ NSView* GetFocusedViewInWindow( NSWindow* keyWindow )
 
 WXWidget wxWidgetImpl::FindFocus()
 {
 
 WXWidget wxWidgetImpl::FindFocus()
 {

-    return GetFocusedViewInWindow( [[NSApplication sharedApplication] keyWindow] );
+    return GetFocusedViewInWindow( [NSApp keyWindow] );

 }
 
 NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const wxSize &size , bool adjustForOrigin )
 }
 
 NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const wxSize &size , bool adjustForOrigin )


@@ -131,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)setOpaque:(BOOL)opaque;

 - (void)setTextColor:(NSColor *)color;
 - (void)setImagePosition:(NSCellImagePosition)aPosition;
 @end
 - (void)setTextColor:(NSColor *)color;
 - (void)setImagePosition:(NSCellImagePosition)aPosition;
 @end


@@ -393,14 +394,28 @@ void wxWidgetCocoaImpl::SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEve
 {
     int eventType = [nsEvent type];
     UInt32 modifiers = [nsEvent modifierFlags] ;
 {
     int eventType = [nsEvent type];
     UInt32 modifiers = [nsEvent modifierFlags] ;

-    wxPoint screenMouseLocation = wxFromNSPoint( NULL, [nsEvent locationInWindow]);
+
+    NSPoint locationInWindow = [nsEvent locationInWindow];
+    
+    // adjust coordinates for the window of the target view
+    if ( [nsEvent window] != [m_osxView window] )
+    {
+        if ( [nsEvent window] != nil )
+            locationInWindow = [[nsEvent window] convertBaseToScreen:locationInWindow];
+
+        if ( [m_osxView window] != nil )
+            locationInWindow = [[m_osxView window] convertScreenToBase:locationInWindow];
+    }
+
+    NSPoint locationInView = [m_osxView convertPoint:locationInWindow fromView:nil];
+    wxPoint locationInViewWX = wxFromNSPoint( m_osxView, locationInView );

 
     // these parameters are not given for all events
     UInt32 button = [nsEvent buttonNumber];
     UInt32 clickCount = 0;
 
 
     // these parameters are not given for all events
     UInt32 button = [nsEvent buttonNumber];
     UInt32 clickCount = 0;
 

-    wxevent.m_x = screenMouseLocation.x;
-    wxevent.m_y = screenMouseLocation.y;
+    wxevent.m_x = locationInViewWX.x;
+    wxevent.m_y = locationInViewWX.y;

     wxevent.m_shiftDown = modifiers & NSShiftKeyMask;
     wxevent.m_controlDown = modifiers & NSControlKeyMask;
     wxevent.m_altDown = modifiers & NSAlternateKeyMask;
     wxevent.m_shiftDown = modifiers & NSShiftKeyMask;
     wxevent.m_controlDown = modifiers & NSControlKeyMask;
     wxevent.m_altDown = modifiers & NSAlternateKeyMask;


@@ -1690,6 +1705,18 @@ void wxWidgetCocoaImpl::SetBackgroundColour( const wxColour &col )
     }
 }
 
     }
 }
 

+bool wxWidgetCocoaImpl::SetBackgroundStyle( wxBackgroundStyle style )
+{
+    BOOL opaque = ( style == wxBG_STYLE_PAINT );
+    
+    if ( [m_osxView respondsToSelector:@selector(setOpaque:) ] )
+    {
+        [m_osxView setOpaque: opaque];
+    }
+    
+    return true ;
+}
+

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


@@ -1981,13 +2008,8 @@ bool wxWidgetCocoaImpl::DoHandleKeyEvent(NSEvent *event)
 
 bool wxWidgetCocoaImpl::DoHandleMouseEvent(NSEvent *event)
 {
 
 bool wxWidgetCocoaImpl::DoHandleMouseEvent(NSEvent *event)
 {

-    NSPoint clickLocation;
-    clickLocation = [m_osxView convertPoint:[event locationInWindow] fromView:nil];
-    wxPoint pt = wxFromNSPoint( m_osxView, clickLocation );

     wxMouseEvent wxevent(wxEVT_LEFT_DOWN);
     SetupMouseEvent(wxevent , event) ;
     wxMouseEvent wxevent(wxEVT_LEFT_DOWN);
     SetupMouseEvent(wxevent , event) ;

-    wxevent.m_x = pt.x;
-    wxevent.m_y = pt.y;

 
     return GetWXPeer()->HandleWindowEvent(wxevent);
 }
 
     return GetWXPeer()->HandleWindowEvent(wxevent);
 }


@@ -2088,7 +2110,13 @@ wxWidgetImpl* wxWidgetImpl::CreateContentView( wxNonOwnedWindow* now )
     wxWidgetCocoaImpl* c = NULL;
     if ( now->IsNativeWindowWrapper() )
     {
     wxWidgetCocoaImpl* c = NULL;
     if ( now->IsNativeWindowWrapper() )
     {

-        c = new wxWidgetCocoaImpl( now, [tlw contentView], true );
+        NSView* cv = [tlw contentView];
+        c = new wxWidgetCocoaImpl( now, cv, true );
+        // increase ref count, because the impl destructor will decrement it again
+        CFRetain(cv);
+        if ( !now->IsShown() )
+            [cv setHidden:NO];
+        

     }
     else
     {
     }
     else
     {