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

wxBrush::SetColour and wxPen::SetColour unified. Source cleaning.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35794 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-10-04 16:13:42 +00:00
parent 83dbeea988
commit 46562151eb
41 changed files with 313 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/os2/brush.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: brush.cpp
// Name: src/os2/brush.cpp
// Purpose: wxBrush
// Author: David Webster
// Modified by:
@@ -139,7 +139,7 @@ bool wxBrush::RealizeResource()
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
wxLogError(_T("Unable to set current color table to RGB mode. Error: %s\n"), sError.c_str());
return FALSE;
return false;
}
if (M_BRUSHDATA->m_nStyle==wxTRANSPARENT)
@@ -224,7 +224,7 @@ bool wxBrush::RealizeResource()
}
return bOk;
}
return FALSE;
return false;
} // end of wxBrush::RealizeResource
WXHANDLE wxBrush::GetResourceHandle()
@@ -241,7 +241,7 @@ bool wxBrush::FreeResource( bool WXUNUSED(bForce) )
M_BRUSHDATA->m_hBrush = 0;
return true;
}
else return FALSE;
else return false;
} // end of wxBrush::FreeResource
bool wxBrush::IsFree() const
@@ -266,32 +266,21 @@ void wxBrush::Unshare()
}
} // end of wxBrush::Unshare
void wxBrush::SetColour(
const wxColour& rColour
)
void wxBrush::SetColour( const wxColour& rColour )
{
Unshare();
M_BRUSHDATA->m_vColour = rColour;
RealizeResource();
}
void wxBrush::SetColour(
unsigned char cRed
, unsigned char cGreen
, unsigned char cBlue
)
void wxBrush::SetColour(const unsigned char cRed, const unsigned char cGreen, const unsigned char cBlue)
{
Unshare();
M_BRUSHDATA->m_vColour.Set( cRed
,cGreen
,cBlue
);
M_BRUSHDATA->m_vColour.Set( cRed, cGreen, cBlue );
RealizeResource();
} // end of wxBrush::SetColour
void wxBrush::SetStyle(
int nStyle
)
void wxBrush::SetStyle(int nStyle)
{
Unshare();
M_BRUSHDATA->m_nStyle = nStyle;