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

diff --git a/include/wx/mac/carbon/pen.h b/include/wx/mac/carbon/pen.h
index ff6f65f12c5cdc22682cd8b8e071ca934199ec67..4c07343d229532ec9e46df178dd7751d75296265 100644 (file)
--- 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 c9dcbde97c9a6ca8986d4e02712505871ed50c65..b0fa74aa0ac87a70222ce5e414e01a838b94184d 100644 (file)
--- 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 3183451f176ff190d5be6d3744c68f9f567d65d9..719f9376d08a5ae8cbf6be71967167e67905fffa 100644 (file)
--- 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\9fck
+        // auf den umgebenden Rahmen zurÂ\9fck
         InsetRect( &rect, -1 , -1 ) ;
 
         wxTopLevelWindowMac* top = MacGetTopLevelWindow();