From 2e57368359ab190b5bbad1849d88f298e30723c9 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Mon, 30 Oct 2006 20:56:25 +0000
Subject: [PATCH] Some compile fixes.

It sure would be nice if big complicated patches could be tested (or
at least compiled) on all the core platforms before being checked in,
especially in last-minute crunch times.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42765 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/mac/carbon/pen.h | 2 +-
 src/mac/carbon/brush.cpp    | 4 ++--
 src/mac/carbon/window.cpp   | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/wx/mac/carbon/pen.h b/include/wx/mac/carbon/pen.h
index ff6f65f12c..4c07343d22 100644
--- a/include/wx/mac/carbon/pen.h
+++ b/include/wx/mac/carbon/pen.h
@@ -76,7 +76,7 @@ public:
     return m_refData ? penData && *M_PENDATA == *penData : !penData;
   }
 
-  inline bool operator != (const wxPen& pen) const { return *(this == pen); }
+  inline bool operator != (const wxPen& pen) const { return !(*this == pen); }
 
   virtual bool Ok() const { return IsOk(); }
   virtual bool IsOk() const { return (m_refData != NULL) ; }
diff --git a/src/mac/carbon/brush.cpp b/src/mac/carbon/brush.cpp
index c9dcbde97c..b0fa74aa0a 100644
--- a/src/mac/carbon/brush.cpp
+++ b/src/mac/carbon/brush.cpp
@@ -33,12 +33,12 @@ public:
     bool operator == ( const wxBrushRefData& brush ) const
     {
         return m_style == brush.m_style &&
-                m_stipple.IsRefTo(&data.m_stipple) &&
+                m_stipple.IsRefTo(&brush.m_stipple) &&
                 m_colour == brush.m_colour &&
                 m_macBrushKind == brush.m_macBrushKind &&
                 m_macThemeBrush == brush.m_macThemeBrush &&
                 m_macThemeBackground == brush.m_macThemeBackground &&
-                m_macThemeBackgroundExtent == brush.m_macThemeBackgroundExtent;
+                EqualRect(&m_macThemeBackgroundExtent, &brush.m_macThemeBackgroundExtent);
     }
 
 
diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 3183451f17..719f9376d0 100644
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -1661,10 +1661,10 @@ void wxWindowMac::DoGetClientSize( int *x, int *y ) const
 
 bool wxWindowMac::SetCursor(const wxCursor& cursor)
 {
-    if (m_cursor == cursor)
+    if (m_cursor.IsRefTo(&cursor))
         return false;
 
-    if (wxNullCursor == cursor)
+    if (!cursor.IsOk())
     {
         if ( ! wxWindowBase::SetCursor( *wxSTANDARD_CURSOR ) )
             return false ;
@@ -2692,7 +2692,7 @@ void wxWindowMac::OnSetFocus( wxFocusEvent& event )
         Rect rect ;
 
         m_peer->GetRect( &rect ) ;
-        // auf den umgebenden Rahmen zurŸck
+        // auf den umgebenden Rahmen zurŸck
         InsetRect( &rect, -1 , -1 ) ;
 
         wxTopLevelWindowMac* top = MacGetTopLevelWindow();
-- 
2.45.2