Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some compile fixes.

Browse Source 
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
This commit is contained in:
Robin Dunn
2006-10-30 20:56:25 +00:00
parent c319bc4734
commit 2e57368359
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/mac/carbon/pen.h
View File

@@ -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) ; }

4
src/mac/carbon/brush.cpp
View File

@@ -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);
}

6
src/mac/carbon/window.cpp
View File

@@ -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<EFBFBD>ck
// auf den umgebenden Rahmen zurŸck
InsetRect( &rect, -1 , -1 ) ;
wxTopLevelWindowMac* top = MacGetTopLevelWindow();