Added wxFontEnumerator class for wxMSW, and fixed text validator for French

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

diff --git a/src/gtk1/brush.cpp b/src/gtk1/brush.cpp
index 9b36dfce3d3571f4cab95c728264b3b3893a3d20..ae8e34635ca81056ab75a11bc15cc86bae5cd7bb 100644 (file)
--- a/src/gtk1/brush.cpp
+++ b/src/gtk1/brush.cpp
@@ -2,9 +2,8 @@
 // Name:        brush.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -14,6 +13,8 @@
 
 #include "wx/brush.h"
 
+#include "gdk/gdk.h"
+
 //-----------------------------------------------------------------------------
 // wxBrush
 //-----------------------------------------------------------------------------
@@ -21,16 +22,16 @@
 class wxBrushRefData: public wxObjectRefData
 {
   public:
-  
-    wxBrushRefData(void);
+
+    wxBrushRefData();
     wxBrushRefData( const wxBrushRefData& data );
- 
+
     int        m_style;
     wxBitmap   m_stipple;
     wxColour   m_colour;
 };
 
-wxBrushRefData::wxBrushRefData(void)
+wxBrushRefData::wxBrushRefData()
 {
   m_style = 0;
 }
@@ -48,7 +49,7 @@ wxBrushRefData::wxBrushRefData( const wxBrushRefData& data )
 
 IMPLEMENT_DYNAMIC_CLASS(wxBrush,wxGDIObject)
 
-wxBrush::wxBrush(void)
+wxBrush::wxBrush()
 {
   if (wxTheBrushList) wxTheBrushList->AddBrush( this );
 }
@@ -58,16 +59,7 @@ wxBrush::wxBrush( const wxColour &colour, int style )
   m_refData = new wxBrushRefData();
   M_BRUSHDATA->m_style = style;
   M_BRUSHDATA->m_colour = colour;
-  
-  if (wxTheBrushList) wxTheBrushList->AddBrush( this );
-}
 
-wxBrush::wxBrush( const wxString &colourName, int style )
-{
-  m_refData = new wxBrushRefData();
-  M_BRUSHDATA->m_style = style;
-  M_BRUSHDATA->m_colour = colourName;
-  
   if (wxTheBrushList) wxTheBrushList->AddBrush( this );
 }
 
@@ -77,81 +69,74 @@ wxBrush::wxBrush( const wxBitmap &stippleBitmap )
   M_BRUSHDATA->m_style = wxSTIPPLE;
   M_BRUSHDATA->m_colour = *wxBLACK;
   M_BRUSHDATA->m_stipple = stippleBitmap;
-  
+
   if (wxTheBrushList) wxTheBrushList->AddBrush( this );
 }
 
 wxBrush::wxBrush( const wxBrush &brush )
 {
   Ref( brush );
-  
-  if (wxTheBrushList) wxTheBrushList->AddBrush( this );
-}
 
-wxBrush::wxBrush( const wxBrush *brush )
-{
-  if (brush) Ref( *brush );
-  
-  if (wxTheBrushList) wxTheBrushList->Append( this );
+  if (wxTheBrushList) wxTheBrushList->AddBrush( this );
 }
 
-wxBrush::~wxBrush(void)
+wxBrush::~wxBrush()
 {
   if (wxTheBrushList) wxTheBrushList->RemoveBrush( this );
 }
 
 wxBrush& wxBrush::operator = ( const wxBrush& brush )
 {
-  if (*this == brush) return (*this); 
-  Ref( brush ); 
-  return *this; 
+  if (*this == brush) return (*this);
+  Ref( brush );
+  return *this;
 }
-  
+
 bool wxBrush::operator == ( const wxBrush& brush )
 {
-  return m_refData == brush.m_refData; 
+  return m_refData == brush.m_refData;
 }
 
 bool wxBrush::operator != ( const wxBrush& brush )
 {
-  return m_refData != brush.m_refData; 
+  return m_refData != brush.m_refData;
 }
 
-bool wxBrush::Ok(void) const
+bool wxBrush::Ok() const
 {
   return ((m_refData) && M_BRUSHDATA->m_colour.Ok());
 }
 
-int wxBrush::GetStyle(void) const
+int wxBrush::GetStyle() const
 {
   if (m_refData == NULL)
   {
-    wxFAIL_MSG( "invalid brush" );
+    wxFAIL_MSG( _T("invalid brush") );
     return 0;
   }
 
   return M_BRUSHDATA->m_style;
 }
 
-wxColour &wxBrush::GetColour(void) const
+wxColour &wxBrush::GetColour() const
 {
   if (m_refData == NULL)
   {
-    wxFAIL_MSG( "invalid brush" );
+    wxFAIL_MSG( _T("invalid brush") );
     return wxNullColour;
   }
-  
+
   return M_BRUSHDATA->m_colour;
 }
 
-wxBitmap *wxBrush::GetStipple(void) const
+wxBitmap *wxBrush::GetStipple() const
 {
   if (m_refData == NULL)
   {
-    wxFAIL_MSG( "invalid brush" );
+    wxFAIL_MSG( _T("invalid brush") );
     return &wxNullBitmap;
   }
-  
+
   return &M_BRUSHDATA->m_stipple;
 }
 
@@ -161,12 +146,6 @@ void wxBrush::SetColour( const wxColour& col )
   M_BRUSHDATA->m_colour = col;
 }
 
-void wxBrush::SetColour( const wxString& col )
-{
-  Unshare();
-  M_BRUSHDATA->m_colour = col;
-}
-
 void wxBrush::SetColour( unsigned char r, unsigned char g, unsigned char b )
 {
   Unshare();
@@ -185,7 +164,7 @@ void wxBrush::SetStipple( const wxBitmap& stipple )
   M_BRUSHDATA->m_stipple = stipple;
 }
 
-void wxBrush::Unshare(void)
+void wxBrush::Unshare()
 {
   if (!m_refData)
   {