better <HR> tag handling in wxHTML

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

diff --git a/src/motif/brush.cpp b/src/motif/brush.cpp
index 4c719acade0b39798ce0aa13c400f68e440b84b4..685b376427d3a7829418348a248b195fc95cab90 100644 (file)
--- a/src/motif/brush.cpp
+++ b/src/motif/brush.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        brush.cpp
+// Name:        src/motif/brush.cpp
 // Purpose:     wxBrush
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -17,9 +17,7 @@
 #include "wx/utils.h"
 #include "wx/brush.h"
 
-#if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)
-#endif
 
 wxBrushRefData::wxBrushRefData()
 {
@@ -28,9 +26,9 @@ wxBrushRefData::wxBrushRefData()
 
 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;
 }
 
 wxBrushRefData::~wxBrushRefData()
@@ -40,14 +38,10 @@ wxBrushRefData::~wxBrushRefData()
 // Brushes
 wxBrush::wxBrush()
 {
-    if ( wxTheBrushList )
-        wxTheBrushList->AddBrush(this);
 }
 
 wxBrush::~wxBrush()
 {
-    if ( wxTheBrushList )
-        wxTheBrushList->RemoveBrush(this);
 }
 
 wxBrush::wxBrush(const wxColour& col, int Style)
@@ -58,23 +52,6 @@ wxBrush::wxBrush(const wxColour& col, int Style)
     M_BRUSHDATA->m_style = Style;
 
     RealizeResource();
-
-    if ( wxTheBrushList )
-        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)
@@ -85,24 +62,21 @@ wxBrush::wxBrush(const wxBitmap& stipple)
     M_BRUSHDATA->m_stipple = stipple;
 
     RealizeResource();
-
-    if ( wxTheBrushList )
-        wxTheBrushList->AddBrush(this);
 }
 
 void wxBrush::Unshare()
 {
-       // Don't change shared data
-       if (!m_refData)
+    // Don't change shared data
+    if (!m_refData)
     {
-               m_refData = new wxBrushRefData();
-       }
+        m_refData = new wxBrushRefData();
+    }
     else
     {
-               wxBrushRefData* ref = new wxBrushRefData(*(wxBrushRefData*)m_refData);
-               UnRef();
-               m_refData = ref;
-       }
+        wxBrushRefData* ref = new wxBrushRefData(*(wxBrushRefData*)m_refData);
+        UnRef();
+        m_refData = ref;
+    }
 }
 
 void wxBrush::SetColour(const wxColour& col)
@@ -114,16 +88,7 @@ void wxBrush::SetColour(const wxColour& col)
     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();