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

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 f8e708e7e58f406633cbc971e997f111d49a91eb..ce4cdccf7feadcbdba869e9fdc193118ea45522f 100644 (file)
--- a/include/wx/brush.h
+++ b/include/wx/brush.h
@@ -2,21 +2,19 @@
 #define _WX_BRUSH_H_BASE_
 
 #if defined(__WXMSW__)
 #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__)
 #elif defined(__WXGTK__)

-#include "wx/gtk/brush.h"
-#elif defined(__WXX11__)
-#include "wx/x11/brush.h"
+    #include "wx/gtk/brush.h"

 #elif defined(__WXMGL__)
 #elif defined(__WXMGL__)

-#include "wx/mgl/brush.h"
+    #include "wx/mgl/brush.h"

 #elif defined(__WXMAC__)
 #elif defined(__WXMAC__)

-#include "wx/mac/brush.h"
+    #include "wx/mac/brush.h"

 #elif defined(__WXCOCOA__)
 #elif defined(__WXCOCOA__)

-#include "wx/cocoa/brush.h"
+    #include "wx/cocoa/brush.h"

 #elif defined(__WXPM__)
 #elif defined(__WXPM__)

-#include "wx/os2/brush.h"
+    #include "wx/os2/brush.h"

 #endif
 
 #endif
 #endif
 
 #endif

diff --git a/include/wx/gtk/brush.h b/include/wx/gtk/brush.h
index eabb80bde9bc83cfa1146a2e083145c046ff8861..e1856216972b0d53394b690e78bcac13621db472 100644 (file)
--- a/include/wx/gtk/brush.h
+++ b/include/wx/gtk/brush.h
@@ -36,7 +36,7 @@ class wxBrush: public wxGDIObject
 public:
     wxBrush() { }
     
 public:
     wxBrush() { }
     

-    wxBrush( const wxColour &colour, int style );
+    wxBrush( const wxColour &colour, int style = wxSOLID );

     wxBrush( const wxBitmap &stippleBitmap );
     ~wxBrush();
     
     wxBrush( const wxBitmap &stippleBitmap );
     ~wxBrush();
     

diff --git a/include/wx/gtk1/brush.h b/include/wx/gtk1/brush.h
index eabb80bde9bc83cfa1146a2e083145c046ff8861..e1856216972b0d53394b690e78bcac13621db472 100644 (file)
--- a/include/wx/gtk1/brush.h
+++ b/include/wx/gtk1/brush.h
@@ -36,7 +36,7 @@ class wxBrush: public wxGDIObject
 public:
     wxBrush() { }
     
 public:
     wxBrush() { }
     

-    wxBrush( const wxColour &colour, int style );
+    wxBrush( const wxColour &colour, int style = wxSOLID );

     wxBrush( const wxBitmap &stippleBitmap );
     ~wxBrush();
     
     wxBrush( const wxBitmap &stippleBitmap );
     ~wxBrush();
     

diff --git a/include/wx/mac/brush.h b/include/wx/mac/brush.h
index f72b28e8cdf9c9a4f627c77596c8a254ac788d59..68d1249860cbfacd7b0bb943afbcf5078325765b 100644 (file)
--- 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 ) ;
 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()
   wxBrush(const wxBitmap& stipple);
   wxBrush(const wxBrush& brush)
       : wxGDIObject()

diff --git a/include/wx/mgl/brush.h b/include/wx/mgl/brush.h
index 2352b224427561fa7fa6e8f25d22482304a4a7d6..f1c3b76eff79dcbd0b1350250a4d382462b3cfc7 100644 (file)
--- a/include/wx/mgl/brush.h
+++ b/include/wx/mgl/brush.h
@@ -36,7 +36,7 @@ class WXDLLEXPORT wxBrush: public wxGDIObject
 {
 public:
     wxBrush() {}
 {
 public:
     wxBrush() {}

-    wxBrush(const wxColour &colour, int style);
+    wxBrush(const wxColour &colour, int style = wxSOLID);

     wxBrush(const wxBitmap &stippleBitmap);
     wxBrush(const wxBrush &brush);
     ~wxBrush() {}
     wxBrush(const wxBitmap &stippleBitmap);
     wxBrush(const wxBrush &brush);
     ~wxBrush() {}

diff --git a/include/wx/msw/brush.h b/include/wx/msw/brush.h
index 842e259d27e55aa541c655816e37ef0c160f325c..c51b948fedab39e33fc32e7b5d7c8556850761dc 100644 (file)
--- a/include/wx/msw/brush.h
+++ b/include/wx/msw/brush.h
@@ -30,7 +30,7 @@ class WXDLLEXPORT wxBrush : public wxGDIObject
 {
 public:
     wxBrush();
 {
 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();
     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 b5aa46844cc91e51b1a4954e474fd4e5ff8a5cdc..b1470f0baf34509c383228a2ae0f39c4028997e0 100644 (file)
--- 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
 public:
     wxBrush();
     wxBrush( const wxColour& rCol

-            ,int             nStyle
+            ,int             nStyle = wxSOLID

            );
     wxBrush(const wxBitmap& rStipple);
     inline wxBrush(const wxBrush& rBrush) { Ref(rBrush); }
            );
     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 8e42e3e03b4239cc6efee20b0a34d26874dea62d..7b9fef1a17a1b2faf01eaf02aa318817cf133d36 100644 (file)
--- a/include/wx/x11/brush.h
+++ b/include/wx/x11/brush.h
@@ -35,7 +35,7 @@ class wxBrush: public wxGDIObject
 public:
     wxBrush() { }
     
 public:
     wxBrush() { }
     

-    wxBrush( const wxColour &colour, int style );
+    wxBrush( const wxColour &colour, int style = wxSOLID );

     wxBrush( const wxBitmap &stippleBitmap );
     ~wxBrush();
     
     wxBrush( const wxBitmap &stippleBitmap );
     ~wxBrush();