Fixed compile errors, warnings and other DSMs, and improved comments.

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

diff --git a/src/motif/brush.cpp b/src/motif/brush.cpp
index 4c719acade0b39798ce0aa13c400f68e440b84b4..a09564e95554a96fa63f7d15e5bd0a6edf5d9423 100644 (file)
--- a/src/motif/brush.cpp
+++ b/src/motif/brush.cpp
@@ -17,9 +17,7 @@
 #include "wx/utils.h"
 #include "wx/brush.h"
 
 #include "wx/utils.h"
 #include "wx/brush.h"
 

-#if !USE_SHARED_LIBRARIES

 IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)
 IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)

-#endif

 
 wxBrushRefData::wxBrushRefData()
 {
 
 wxBrushRefData::wxBrushRefData()
 {


@@ -28,9 +26,9 @@ wxBrushRefData::wxBrushRefData()
 
 wxBrushRefData::wxBrushRefData(const wxBrushRefData& data)
 {
 
 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()
 }
 
 wxBrushRefData::~wxBrushRefData()


@@ -53,26 +51,12 @@ wxBrush::~wxBrush()
 wxBrush::wxBrush(const wxColour& col, int Style)
 {
     m_refData = new wxBrushRefData;
 wxBrush::wxBrush(const wxColour& col, int Style)
 {
     m_refData = new wxBrushRefData;

-
-    M_BRUSHDATA->m_colour = col;
-    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;
     M_BRUSHDATA->m_colour = col;
     M_BRUSHDATA->m_style = Style;

-
+    

     RealizeResource();
     RealizeResource();

-
+    

     if ( wxTheBrushList )
         wxTheBrushList->AddBrush(this);
 }
     if ( wxTheBrushList )
         wxTheBrushList->AddBrush(this);
 }


@@ -80,73 +64,64 @@ wxBrush::wxBrush(const wxString& col, int Style)
 wxBrush::wxBrush(const wxBitmap& stipple)
 {
     m_refData = new wxBrushRefData;
 wxBrush::wxBrush(const wxBitmap& stipple)
 {
     m_refData = new wxBrushRefData;

-
+    

     M_BRUSHDATA->m_style = wxSTIPPLE;
     M_BRUSHDATA->m_stipple = stipple;
     M_BRUSHDATA->m_style = wxSTIPPLE;
     M_BRUSHDATA->m_stipple = stipple;

-
+    

     RealizeResource();
     RealizeResource();

-
+    

     if ( wxTheBrushList )
         wxTheBrushList->AddBrush(this);
 }
 
 void wxBrush::Unshare()
 {
     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
     {
     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)
 {
     Unshare();
 }
 
 void wxBrush::SetColour(const wxColour& col)
 {
     Unshare();

-
+    

     M_BRUSHDATA->m_colour = col;
     M_BRUSHDATA->m_colour = col;

-
+    

     RealizeResource();
 }
 
     RealizeResource();
 }
 

-void wxBrush::SetColour(const wxString& col)
+void wxBrush::SetColour(unsigned char r, unsigned char g, unsigned char b)

 {
     Unshare();
 {
     Unshare();

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

     M_BRUSHDATA->m_colour.Set(r, g, b);
     M_BRUSHDATA->m_colour.Set(r, g, b);

-
+    

     RealizeResource();
 }
 
 void wxBrush::SetStyle(int Style)
 {
     Unshare();
     RealizeResource();
 }
 
 void wxBrush::SetStyle(int Style)
 {
     Unshare();

-
+    

     M_BRUSHDATA->m_style = Style;
     M_BRUSHDATA->m_style = Style;

-
+    

     RealizeResource();
 }
 
 void wxBrush::SetStipple(const wxBitmap& Stipple)
 {
     Unshare();
     RealizeResource();
 }
 
 void wxBrush::SetStipple(const wxBitmap& Stipple)
 {
     Unshare();

-
+    

     M_BRUSHDATA->m_stipple = Stipple;
     M_BRUSHDATA->m_stipple = Stipple;

-
+    

     RealizeResource();
 }
 
     RealizeResource();
 }