Use widget->allocation instead of querying the

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

diff --git a/src/x11/brush.cpp b/src/x11/brush.cpp
index a239850cca8ed12fac37a70b91cd2675900ef9d1..685c12b74740aca2040390b46239cc47085bea45 100644 (file)
--- a/src/x11/brush.cpp
+++ b/src/x11/brush.cpp
@@ -12,10 +12,13 @@
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/utils.h"

 #include "wx/brush.h"
 #include "wx/brush.h"

-#include "wx/bitmap.h"
-#include "wx/colour.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+    #include "wx/bitmap.h"
+    #include "wx/colour.h"
+#endif

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


@@ -138,7 +141,7 @@ void wxBrush::SetColour( const wxColour& col )
     M_BRUSHDATA->m_colour = col;
 }
 
     M_BRUSHDATA->m_colour = col;
 }
 

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

 {
     AllocExclusive();
 
 {
     AllocExclusive();