Changes to WXDLLEXPORT keyword position for VC++ 6.0; changed

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

diff --git a/src/motif/brush.cpp b/src/motif/brush.cpp
index 45a73b74af630dfe5cb39614ede311a5601f03cc..804bcaaa3e9bf30ca75aea6bc9271e0dad5fd48f 100644 (file)
--- a/src/motif/brush.cpp
+++ b/src/motif/brush.cpp
@@ -24,7 +24,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)
 wxBrushRefData::wxBrushRefData()
 {
     m_style = wxSOLID;
 wxBrushRefData::wxBrushRefData()
 {
     m_style = wxSOLID;

-// TODO: null data

 }
 
 wxBrushRefData::wxBrushRefData(const wxBrushRefData& data)
 }
 
 wxBrushRefData::wxBrushRefData(const wxBrushRefData& data)


@@ -32,14 +31,10 @@ wxBrushRefData::wxBrushRefData(const wxBrushRefData& data)
   m_style = data.m_style;
   m_stipple = data.m_stipple;
   m_colour = data.m_colour;
   m_style = data.m_style;
   m_stipple = data.m_stipple;
   m_colour = data.m_colour;

-/* TODO: null data
-  m_hBrush = 0;
-*/

 }
 
 wxBrushRefData::~wxBrushRefData()
 {
 }
 
 wxBrushRefData::~wxBrushRefData()
 {

-// TODO: delete data

 }
 
 // Brushes
 }
 
 // Brushes


@@ -68,20 +63,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;
-
-    // Implicit conversion from string to wxColour via colour database
-    M_BRUSHDATA->m_colour = col;
-    M_BRUSHDATA->m_style = Style;
-
-    RealizeResource();
-
-    if ( wxTheBrushList )
-        wxTheBrushList->AddBrush(this);
-}
-

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


@@ -119,16 +100,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();
 


@@ -155,8 +127,9 @@ void wxBrush::SetStipple(const wxBitmap& Stipple)
     RealizeResource();
 }
 
     RealizeResource();
 }
 

-void wxBrush::RealizeResource()
+bool wxBrush::RealizeResource()

 {
 {

-// TODO: create the brush
+    // Nothing more to do
+    return TRUE;

 }
 
 }