/////////////////////////////////////////////////////////////////////////////
-// Name: brush.cpp
+// Name: src/os2/brush.cpp
// Purpose: wxBrush
// Author: David Webster
// Modified by:
#include "wx/wxprec.h"
#ifndef WX_PRECOMP
-#include <stdio.h>
-#include "wx/setup.h"
-#include "wx/list.h"
-#include "wx/utils.h"
-#include "wx/app.h"
-#include "wx/brush.h"
+ #include <stdio.h>
+ #include "wx/list.h"
+ #include "wx/utils.h"
+ #include "wx/app.h"
+ #include "wx/brush.h"
+ #include "wx/log.h"
#endif
#include "wx/os2/private.h"
memset(&m_vBundle, '\0', sizeof(AREABUNDLE));
} // end of wxBrushRefData::wxBrushRefData
-wxBrushRefData::wxBrushRefData(
- const wxBrushRefData& rData
-)
+wxBrushRefData::wxBrushRefData(const wxBrushRefData& rData)
{
m_nStyle = rData.m_nStyle;
m_vStipple = rData.m_vStipple;
//
wxBrush::wxBrush()
{
- if ( wxTheBrushList )
- wxTheBrushList->AddBrush(this);
} // end of wxBrush::wxBrush
wxBrush::~wxBrush()
{
- if ( wxTheBrushList )
- wxTheBrushList->RemoveBrush(this);
} // end of wxBrush::~wxBrush
wxBrush::wxBrush(
const wxColour& rColour
-, int nStyle
+, wxBrushStyle nStyle
)
{
m_refData = new wxBrushRefData;
memset(&M_BRUSHDATA->m_vBundle, '\0', sizeof(AREABUNDLE));
RealizeResource();
-
- if ( wxTheBrushList )
- wxTheBrushList->AddBrush(this);
} // end of wxBrush::wxBrush
-wxBrush::wxBrush(
- const wxBitmap& rStipple
-)
+wxBrush::wxBrush(const wxBitmap& rStipple)
{
m_refData = new wxBrushRefData;
memset(&M_BRUSHDATA->m_vBundle, '\0', sizeof(AREABUNDLE));
RealizeResource();
-
- if ( wxTheBrushList )
- wxTheBrushList->AddBrush(this);
} // end of wxBrush::wxBrush
bool wxBrush::RealizeResource()
{
- BOOL bOk;
- ERRORID vError;
- wxString sError;
+ bool bOk;
+ ERRORID vError;
+ wxString sError;
if (M_BRUSHDATA && M_BRUSHDATA->m_hBrush == 0L)
{
{
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
- wxLogError("Unable to set current color table to RGB mode. Error: %s\n", sError);
- return FALSE;
+ wxLogError(_T("Unable to set current color table to RGB mode. Error: %s\n"), sError.c_str());
+ return false;
}
if (M_BRUSHDATA->m_nStyle==wxTRANSPARENT)
{
- return TRUE;
+ return true;
}
COLORREF vPmColour = 0L;
if (M_BRUSHDATA->m_hBrush==NULL) wxError("Cannot create brush","Internal error") ;
#endif
M_BRUSHDATA->m_vBundle.lColor = vPmColour;
- M_BRUSHDATA->m_vBundle.lBackColor = CLR_DEFAULT;
+ M_BRUSHDATA->m_vBundle.lBackColor = RGB_WHITE;
M_BRUSHDATA->m_vBundle.usMixMode = FM_OVERPAINT;
M_BRUSHDATA->m_vBundle.usBackMixMode = BM_OVERPAINT;
- bOk = ::GpiSetAttrs( M_BRUSHDATA->m_hBrush
- ,PRIM_AREA
- ,ABB_COLOR | ABB_BACK_COLOR | ABB_MIX_MODE | ABB_BACK_MIX_MODE |
- ABB_SET | ABB_SYMBOL
- ,ABB_REF_POINT
- ,&M_BRUSHDATA->m_vBundle
- );
+ bOk = (bool)::GpiSetAttrs( M_BRUSHDATA->m_hBrush
+ ,PRIM_AREA
+ ,ABB_COLOR | ABB_BACK_COLOR | ABB_MIX_MODE | ABB_BACK_MIX_MODE |
+ ABB_SET | ABB_SYMBOL | ABB_REF_POINT
+ ,ABB_SET | ABB_SYMBOL | ABB_REF_POINT
+ ,&M_BRUSHDATA->m_vBundle
+ );
if (!bOk)
{
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
- wxLogError("Can't set Gpi attributes for an AREABUNDLE. Error: %s\n", sError);
+ wxLogError(_T("Can't set Gpi attributes for an AREABUNDLE. Error: %s\n"), sError.c_str());
}
return bOk;
}
- return FALSE;
+ return false;
} // end of wxBrush::RealizeResource
-WXHANDLE wxBrush::GetResourceHandle()
+WXHANDLE wxBrush::GetResourceHandle() const
{
if (!M_BRUSHDATA)
return 0;
return (WXHANDLE)M_BRUSHDATA->m_hBrush;
} // end of wxBrush::GetResourceHandle
-bool wxBrush::FreeResource(
- bool WXUNUSED(bForce)
-)
+bool wxBrush::FreeResource( bool WXUNUSED(bForce) )
{
if (M_BRUSHDATA && (M_BRUSHDATA->m_hBrush != 0))
{
M_BRUSHDATA->m_hBrush = 0;
- return TRUE;
+ return true;
}
- else return FALSE;
+ else return false;
} // end of wxBrush::FreeResource
bool wxBrush::IsFree() const
return (M_BRUSHDATA && (M_BRUSHDATA->m_hBrush == 0));
} // end of wxBrush::IsFree
-void wxBrush::Unshare()
+void wxBrush::SetColour( const wxColour& rColour )
{
- //
- // Don't change shared data
- //
- if (!m_refData)
- {
- m_refData = new wxBrushRefData();
- }
- else
- {
- wxBrushRefData* ref = new wxBrushRefData(*(wxBrushRefData*)m_refData);
- UnRef();
- m_refData = ref;
- }
-} // end of wxBrush::Unshare
-
-void wxBrush::SetColour(
- const wxColour& rColour
-)
-{
- Unshare();
+ AllocExclusive();
M_BRUSHDATA->m_vColour = rColour;
RealizeResource();
}
-void wxBrush::SetColour(
- unsigned char cRed
-, unsigned char cGreen
-, unsigned char cBlue
-)
+void wxBrush::SetColour(unsigned char cRed, unsigned char cGreen, unsigned char cBlue)
{
- Unshare();
- M_BRUSHDATA->m_vColour.Set( cRed
- ,cGreen
- ,cBlue
- );
+ AllocExclusive();
+ M_BRUSHDATA->m_vColour.Set( cRed, cGreen, cBlue );
RealizeResource();
} // end of wxBrush::SetColour
-void wxBrush::SetStyle(
- int nStyle
-)
+void wxBrush::SetStyle(wxBrushStyle nStyle)
{
- Unshare();
+ AllocExclusive();
M_BRUSHDATA->m_nStyle = nStyle;
RealizeResource();
} // end of wxBrush::SetStyle
const wxBitmap& rStipple
)
{
- Unshare();
+ AllocExclusive();
M_BRUSHDATA->m_vStipple = rStipple;
RealizeResource();
} // end of wxBrush::SetStipple
HPS hPS
)
{
- Unshare();
+ AllocExclusive();
if (M_BRUSHDATA->m_hBrush)
::GpiDestroyPS(M_BRUSHDATA->m_hBrush);
M_BRUSHDATA->m_hBrush = hPS;
RealizeResource();
} // end of WxWinGdi_CPen::SetPS
+
+bool wxBrush::operator == (
+ const wxBrush& brush
+) const
+{
+ if (m_refData == brush.m_refData) return true;
+
+ if (!m_refData || !brush.m_refData) return false;
+
+ return ( *(wxBrushRefData*)m_refData == *(wxBrushRefData*)brush.m_refData );
+} // end of wxBrush::operator ==
+
+wxGDIRefData *wxBrush::CreateGDIRefData() const
+{
+ return new wxBrushRefData;
+}
+
+wxGDIRefData *wxBrush::CloneGDIRefData(const wxGDIRefData *data) const
+{
+ return new wxBrushRefData(*(const wxBrushRefData *)data);
+}
projects / wxWidgets.git / blobdiff