[ 1508778 ] Fix for wxOwnerDrawnComboBox list selection rendering.

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

diff --git a/src/cocoa/window.mm b/src/cocoa/window.mm
index 4f9af646e0aa7bfbdf06bc20516e93b7e6b152b6..1a559d5bb8dc8e07aff147d5237d0f0b49d8e99b 100644 (file)
--- a/src/cocoa/window.mm
+++ b/src/cocoa/window.mm
@@ -4,16 +4,19 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/12/26
-// RCS-ID:      $Id:
+// RCS-ID:      $Id$
 // Copyright:   (c) 2002 David Elliott
-// Licence:    wxWidgets licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
+
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/window.h"
+    #include "wx/dc.h"
 #endif //WX_PRECOMP
+
 #include "wx/tooltip.h"
 
 #include "wx/cocoa/autorelease.h"
@@ -40,6 +43,58 @@
 - (void)getRectsBeingDrawn:(const NSRect **)rects count:(int *)count;
 @end
 
+NSPoint CocoaTransformNSViewBoundsToWx(NSView *nsview, NSPoint pointBounds)
+{
+    wxCHECK_MSG(nsview, pointBounds, wxT("Need to have a Cocoa view to do translation"));
+    if([nsview isFlipped])
+        return pointBounds;
+    NSRect ourBounds = [nsview bounds];
+    return NSMakePoint
+    (   pointBounds.x
+    ,   ourBounds.size.height - pointBounds.y
+    );
+}
+
+NSRect CocoaTransformNSViewBoundsToWx(NSView *nsview, NSRect rectBounds)
+{
+    wxCHECK_MSG(nsview, rectBounds, wxT("Need to have a Cocoa view to do translation"));
+    if([nsview isFlipped])
+        return rectBounds;
+    NSRect ourBounds = [nsview bounds];
+    return NSMakeRect
+    (   rectBounds.origin.x
+    ,   ourBounds.size.height - (rectBounds.origin.y + rectBounds.size.height)
+    ,   rectBounds.size.width
+    ,   rectBounds.size.height
+    );
+}
+
+NSPoint CocoaTransformNSViewWxToBounds(NSView *nsview, NSPoint pointWx)
+{
+    wxCHECK_MSG(nsview, pointWx, wxT("Need to have a Cocoa view to do translation"));
+    if([nsview isFlipped])
+        return pointWx;
+    NSRect ourBounds = [nsview bounds];
+    return NSMakePoint
+    (   pointWx.x
+    ,   ourBounds.size.height - pointWx.y
+    );
+}
+
+NSRect CocoaTransformNSViewWxToBounds(NSView *nsview, NSRect rectWx)
+{
+    wxCHECK_MSG(nsview, rectWx, wxT("Need to have a Cocoa view to do translation"));
+    if([nsview isFlipped])
+        return rectWx;
+    NSRect ourBounds = [nsview bounds];
+    return NSMakeRect
+    (   rectWx.origin.x
+    ,   ourBounds.size.height - (rectWx.origin.y + rectWx.size.height)
+    ,   rectWx.size.width
+    ,   rectWx.size.height
+    );
+}
+
 // ========================================================================
 // wxWindowCocoaHider
 // ========================================================================
@@ -255,8 +310,8 @@ void wxWindowCocoa::Init()
     m_cocoaNSView = NULL;
     m_cocoaHider = NULL;
     m_wxCocoaScrollView = NULL;
-    m_isBeingDeleted = FALSE;
-    m_isInPaint = FALSE;
+    m_isBeingDeleted = false;
+    m_isInPaint = false;
     m_shouldBeEnabled = true;
 }
 
@@ -282,7 +337,7 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID winid,
         SetInitialFrameRect(pos,size);
     }
 
-    return TRUE;
+    return true;
 }
 
 // Destructor
@@ -347,57 +402,32 @@ WX_NSView wxWindowCocoa::GetNSViewForHiding() const
 NSPoint wxWindowCocoa::CocoaTransformBoundsToWx(NSPoint pointBounds)
 {
     // TODO: Handle scrolling offset
-    wxCHECK_MSG(GetNSView(), pointBounds, wxT("Need to have a Cocoa view to do translation"));
-    if([GetNSView() isFlipped])
-        return pointBounds;
-    NSRect ourBounds = [GetNSView() bounds];
-    return NSMakePoint
-    (   pointBounds.x
-    ,   ourBounds.size.height - pointBounds.y
-    );
+    return CocoaTransformNSViewBoundsToWx(GetNSView(), pointBounds);
 }
 
 NSRect wxWindowCocoa::CocoaTransformBoundsToWx(NSRect rectBounds)
 {
     // TODO: Handle scrolling offset
-    wxCHECK_MSG(GetNSView(), rectBounds, wxT("Need to have a Cocoa view to do translation"));
-    if([GetNSView() isFlipped])
-        return rectBounds;
-    NSRect ourBounds = [GetNSView() bounds];
-    return NSMakeRect
-    (   rectBounds.origin.x
-    ,   ourBounds.size.height - (rectBounds.origin.y + rectBounds.size.height)
-    ,   rectBounds.size.width
-    ,   rectBounds.size.height
-    );
+    return CocoaTransformNSViewBoundsToWx(GetNSView(), rectBounds);
 }
 
 NSPoint wxWindowCocoa::CocoaTransformWxToBounds(NSPoint pointWx)
 {
     // TODO: Handle scrolling offset
-    wxCHECK_MSG(GetNSView(), pointWx, wxT("Need to have a Cocoa view to do translation"));
-    if([GetNSView() isFlipped])
-        return pointWx;
-    NSRect ourBounds = [GetNSView() bounds];
-    return NSMakePoint
-    (   pointWx.x
-    ,   ourBounds.size.height - pointWx.y
-    );
+    return CocoaTransformNSViewWxToBounds(GetNSView(), pointWx);
 }
 
 NSRect wxWindowCocoa::CocoaTransformWxToBounds(NSRect rectWx)
 {
     // TODO: Handle scrolling offset
-    wxCHECK_MSG(GetNSView(), rectWx, wxT("Need to have a Cocoa view to do translation"));
-    if([GetNSView() isFlipped])
-        return rectWx;
-    NSRect ourBounds = [GetNSView() bounds];
-    return NSMakeRect
-    (   rectWx.origin.x
-    ,   ourBounds.size.height - (rectWx.origin.y + rectWx.size.height)
-    ,   rectWx.size.width
-    ,   rectWx.size.height
-    );
+    return CocoaTransformNSViewWxToBounds(GetNSView(), rectWx);
+}
+
+WX_NSAffineTransform wxWindowCocoa::CocoaGetWxToBoundsTransform()
+{
+    // TODO: Handle scrolling offset
+    NSAffineTransform *transform = wxDC::CocoaGetWxToBoundsTransform([GetNSView() isFlipped], [GetNSView() bounds].size.height);
+    return transform;
 }
 
 bool wxWindowCocoa::Cocoa_drawRect(const NSRect &rect)
@@ -411,7 +441,7 @@ bool wxWindowCocoa::Cocoa_drawRect(const NSRect &rect)
         wxLogDebug(wxT("Paint event recursion!"));
         return false;
     }
-    m_isInPaint = TRUE;
+    m_isInPaint = true;
 
     // Set m_updateRegion
     const NSRect *rects = ▭ // The bounding box of the region
@@ -431,7 +461,7 @@ bool wxWindowCocoa::Cocoa_drawRect(const NSRect &rect)
     wxPaintEvent event(m_windowId);
     event.SetEventObject(this);
     bool ret = GetEventHandler()->ProcessEvent(event);
-    m_isInPaint = FALSE;
+    m_isInPaint = false;
     return ret;
 }
 
@@ -552,9 +582,9 @@ bool wxWindowCocoa::Cocoa_resetCursorRects()
 {
     if(!m_cursor.GetNSCursor())
         return false;
-    
-    [GetNSView() addCursorRect: [GetNSView() visibleRect]  cursor: m_cursor.GetNSCursor()];    
-        
+
+    [GetNSView() addCursorRect: [GetNSView() visibleRect]  cursor: m_cursor.GetNSCursor()];
+
     return true;
 }
 
@@ -651,7 +681,7 @@ void wxWindowCocoa::DoSetSize(int x, int y, int width, int height, int sizeFlags
 
     AdjustForParentClientOrigin(x,y,sizeFlags);
 
-    wxSize size(-1,-1);
+    wxSize size(wxDefaultSize);
 
     if((width==-1)&&!(sizeFlags&wxSIZE_ALLOW_MINUS_ONE))
     {
@@ -821,7 +851,18 @@ void wxWindow::DoSetClientSize(int width, int height)
 
 void wxWindow::CocoaSetWxWindowSize(int width, int height)
 {
-    wxWindowCocoa::DoSetSize(-1,-1,width,height,wxSIZE_USE_EXISTING);
+    wxWindowCocoa::DoSetSize(wxDefaultCoord,wxDefaultCoord,width,height,wxSIZE_USE_EXISTING);
+}
+
+void wxWindow::SetLabel(const wxString& WXUNUSED(label))
+{
+    // TODO
+}
+
+wxString wxWindow::GetLabel() const
+{
+    // TODO
+    return wxEmptyString;
 }
 
 int wxWindow::GetCharHeight() const
@@ -905,7 +946,7 @@ void wxWindow::DoSetVirtualSize( int x, int y )
 bool wxWindow::SetFont(const wxFont& font)
 {
     // TODO
-    return TRUE;
+    return true;
 }
 
 static int CocoaRaiseWindowCompareFunction(id first, id second, void *target)
@@ -951,7 +992,7 @@ void wxWindow::Lower()
 
 bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
 {
-    return FALSE;
+    return false;
 }
 
 // Get the window with the focus
@@ -969,14 +1010,14 @@ wxWindow *wxWindowBase::DoFindFocus()
     wxCocoaNSView *win;
 
     NSWindow *keyWindow = [[NSApplication sharedApplication] keyWindow];
-    win = wxCocoaNSView::GetFromCocoa([keyWindow firstResponder]);
+    win = wxCocoaNSView::GetFromCocoa(static_cast<NSView*>([keyWindow firstResponder]));
     if(win)
         return win->GetWxWindow();
 
     NSWindow *mainWindow = [[NSApplication sharedApplication] keyWindow];
     if(mainWindow == keyWindow)
         return NULL;
-    win = wxCocoaNSView::GetFromCocoa([mainWindow firstResponder]);
+    win = wxCocoaNSView::GetFromCocoa(static_cast<NSView*>([mainWindow firstResponder]));
     if(win)
         return win->GetWxWindow();
 
@@ -1006,4 +1047,3 @@ wxWindow* wxFindWindowAtPointer(wxPoint& pt)
     pt = wxGetMousePosition();
     return NULL;
 }
-