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 4c719acade0b39798ce0aa13c400f68e440b84b4..804bcaaa3e9bf30ca75aea6bc9271e0dad5fd48f 100644 (file)
--- a/src/motif/brush.cpp
+++ b/src/motif/brush.cpp
@@ -63,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;


@@ -114,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();