wxStaticBox constructor is not supposed to take a wxValidator

[wxWidgets.git] / include / wx / x11 / brush.h

diff --git a/include/wx/x11/brush.h b/include/wx/x11/brush.h
index 25f2efd4229749a2546792c095f1a6a483c38a3e..4ea94c15fcc61b245876aa42841ec5d68d352f3f 100644 (file)
--- a/include/wx/x11/brush.h
+++ b/include/wx/x11/brush.h
@@ -12,19 +12,19 @@
 #ifndef _WX_BRUSH_H_
 #define _WX_BRUSH_H_
 
 #ifndef _WX_BRUSH_H_
 #define _WX_BRUSH_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "brush.h"
 #endif
 
 #pragma interface "brush.h"
 #endif
 

-#include "wx/gdicmn.h"

 #include "wx/gdiobj.h"
 #include "wx/gdiobj.h"

-#include "wx/bitmap.h"

 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 class wxBrush;
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 class wxBrush;

+class wxColour;
+class wxBitmap;

 
 //-----------------------------------------------------------------------------
 // wxBrush
 
 //-----------------------------------------------------------------------------
 // wxBrush


@@ -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();