VTK wrapper of vtkRenderWindow for wxPython. Tested on MSW so far.

[wxWidgets.git] / src / msw / brush.cpp

diff --git a/src/msw/brush.cpp b/src/msw/brush.cpp
index 3f31a36166b2f300b837cb5e4d8ce5c3f1af6cae..486caf5827fecca9a9ce272ccdddda4015a15f73 100644 (file)
--- a/src/msw/brush.cpp
+++ b/src/msw/brush.cpp
@@ -84,20 +84,6 @@ wxBrush::wxBrush(const wxColour& col, int Style)
     wxTheBrushList->AddBrush(this);
 }
 
     wxTheBrushList->AddBrush(this);
 }
 

-wxBrush::wxBrush(const wxString& col, int Style)
-{
-  m_refData = new wxBrushRefData;
-
-  M_BRUSHDATA->m_colour = col;
-  M_BRUSHDATA->m_style = Style;
-  M_BRUSHDATA->m_hBrush = 0;
-
-  RealizeResource();
-
-  if ( wxTheBrushList )
-    wxTheBrushList->AddBrush(this);
-}
-

 wxBrush::wxBrush(const wxBitmap& stipple)
 {
   m_refData = new wxBrushRefData;
 wxBrush::wxBrush(const wxBitmap& stipple)
 {
   m_refData = new wxBrushRefData;


@@ -182,7 +168,7 @@ WXHANDLE wxBrush::GetResourceHandle(void)
   return (WXHANDLE) M_BRUSHDATA->m_hBrush;
 }
 
   return (WXHANDLE) M_BRUSHDATA->m_hBrush;
 }
 

-bool wxBrush::FreeResource(bool force)
+bool wxBrush::FreeResource(bool WXUNUSED(force))

 {
   if (M_BRUSHDATA && (M_BRUSHDATA->m_hBrush != 0))
   {
 {
   if (M_BRUSHDATA && (M_BRUSHDATA->m_hBrush != 0))
   {


@@ -193,7 +179,7 @@ bool wxBrush::FreeResource(bool force)
   else return FALSE;
 }
 
   else return FALSE;
 }
 

-bool wxBrush::IsFree(void)
+bool wxBrush::IsFree() const

 {
   return (M_BRUSHDATA && (M_BRUSHDATA->m_hBrush == 0));
 }
 {
   return (M_BRUSHDATA && (M_BRUSHDATA->m_hBrush == 0));
 }


@@ -223,16 +209,7 @@ void wxBrush::SetColour(const wxColour& col)
     RealizeResource();
 }
 
     RealizeResource();
 }
 

-void wxBrush::SetColour(const wxString& col)
-{
-    Unshare();
-
-    M_BRUSHDATA->m_colour = col;
-
-    RealizeResource();
-}
-
-void wxBrush::SetColour(const unsigned char r, const unsigned char g, const unsigned char b)
+void wxBrush::SetColour(unsigned char r, unsigned char g, unsigned char b)

 {
     Unshare();
 
 {
     Unshare();