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();