From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 21 Jul 2003 20:41:48 +0000 (+0000)
Subject: gave default parameters for wxBrush() ctor from wxColour (this is what is used in... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/5b36366c59ea68056ba07a3ca1c2cd6022a59735

gave default parameters for wxBrush() ctor from wxColour (this is what is used in 99 of cases...)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22210 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/brush.h b/include/wx/brush.h
index f8e708e7e5..ce4cdccf7f 100644
--- a/include/wx/brush.h
+++ b/include/wx/brush.h
@@ -2,21 +2,19 @@
 #define _WX_BRUSH_H_BASE_
 
 #if defined(__WXMSW__)
-#include "wx/msw/brush.h"
-#elif defined(__WXMOTIF__)
-#include "wx/x11/brush.h"
+    #include "wx/msw/brush.h"
+#elif defined(__WXMOTIF__) || defined(__WXX11__)
+    #include "wx/x11/brush.h"
 #elif defined(__WXGTK__)
-#include "wx/gtk/brush.h"
-#elif defined(__WXX11__)
-#include "wx/x11/brush.h"
+    #include "wx/gtk/brush.h"
 #elif defined(__WXMGL__)
-#include "wx/mgl/brush.h"
+    #include "wx/mgl/brush.h"
 #elif defined(__WXMAC__)
-#include "wx/mac/brush.h"
+    #include "wx/mac/brush.h"
 #elif defined(__WXCOCOA__)
-#include "wx/cocoa/brush.h"
+    #include "wx/cocoa/brush.h"
 #elif defined(__WXPM__)
-#include "wx/os2/brush.h"
+    #include "wx/os2/brush.h"
 #endif
 
 #endif
diff --git a/include/wx/gtk/brush.h b/include/wx/gtk/brush.h
index eabb80bde9..e185621697 100644
--- a/include/wx/gtk/brush.h
+++ b/include/wx/gtk/brush.h
@@ -36,7 +36,7 @@ class wxBrush: public wxGDIObject
 public:
     wxBrush() { }
     
-    wxBrush( const wxColour &colour, int style );
+    wxBrush( const wxColour &colour, int style = wxSOLID );
     wxBrush( const wxBitmap &stippleBitmap );
     ~wxBrush();
     
diff --git a/include/wx/gtk1/brush.h b/include/wx/gtk1/brush.h
index eabb80bde9..e185621697 100644
--- a/include/wx/gtk1/brush.h
+++ b/include/wx/gtk1/brush.h
@@ -36,7 +36,7 @@ class wxBrush: public wxGDIObject
 public:
     wxBrush() { }
     
-    wxBrush( const wxColour &colour, int style );
+    wxBrush( const wxColour &colour, int style = wxSOLID );
     wxBrush( const wxBitmap &stippleBitmap );
     ~wxBrush();
     
diff --git a/include/wx/mac/brush.h b/include/wx/mac/brush.h
index f72b28e8cd..68d1249860 100644
--- a/include/wx/mac/brush.h
+++ b/include/wx/mac/brush.h
@@ -37,7 +37,7 @@ class WXDLLEXPORT wxBrush: public wxGDIObject
 public:
   wxBrush();
   wxBrush(short macThemeBrush ) ;
-  wxBrush(const wxColour& col, int style);
+  wxBrush(const wxColour& col, int style = wxSOLID);
   wxBrush(const wxBitmap& stipple);
   wxBrush(const wxBrush& brush)
       : wxGDIObject()
diff --git a/include/wx/mgl/brush.h b/include/wx/mgl/brush.h
index 2352b22442..f1c3b76eff 100644
--- a/include/wx/mgl/brush.h
+++ b/include/wx/mgl/brush.h
@@ -36,7 +36,7 @@ class WXDLLEXPORT wxBrush: public wxGDIObject
 {
 public:
     wxBrush() {}
-    wxBrush(const wxColour &colour, int style);
+    wxBrush(const wxColour &colour, int style = wxSOLID);
     wxBrush(const wxBitmap &stippleBitmap);
     wxBrush(const wxBrush &brush);
     ~wxBrush() {}
diff --git a/include/wx/msw/brush.h b/include/wx/msw/brush.h
index 842e259d27..c51b948fed 100644
--- a/include/wx/msw/brush.h
+++ b/include/wx/msw/brush.h
@@ -30,7 +30,7 @@ class WXDLLEXPORT wxBrush : public wxGDIObject
 {
 public:
     wxBrush();
-    wxBrush(const wxColour& col, int style);
+    wxBrush(const wxColour& col, int style = wxSOLID);
     wxBrush(const wxBitmap& stipple);
     wxBrush(const wxBrush& brush) { Ref(brush); }
     virtual ~wxBrush();
diff --git a/include/wx/os2/brush.h b/include/wx/os2/brush.h
index b5aa46844c..b1470f0baf 100644
--- a/include/wx/os2/brush.h
+++ b/include/wx/os2/brush.h
@@ -44,7 +44,7 @@ class WXDLLEXPORT wxBrush: public wxGDIObject
 public:
     wxBrush();
     wxBrush( const wxColour& rCol
-            ,int             nStyle
+            ,int             nStyle = wxSOLID
            );
     wxBrush(const wxBitmap& rStipple);
     inline wxBrush(const wxBrush& rBrush) { Ref(rBrush); }
diff --git a/include/wx/x11/brush.h b/include/wx/x11/brush.h
index 8e42e3e03b..7b9fef1a17 100644
--- a/include/wx/x11/brush.h
+++ b/include/wx/x11/brush.h
@@ -35,7 +35,7 @@ class wxBrush: public wxGDIObject
 public:
     wxBrush() { }
     
-    wxBrush( const wxColour &colour, int style );
+    wxBrush( const wxColour &colour, int style = wxSOLID );
     wxBrush( const wxBitmap &stippleBitmap );
     ~wxBrush();