Use widget->allocation instead of querying the

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

diff --git a/src/x11/pen.cpp b/src/x11/pen.cpp
index 6fc6a57176da94c0b97c7faa05c3c9f4b1279635..23cf2ca01e3f0439131e304a67753e8669f422ea 100644 (file)
--- a/src/x11/pen.cpp
+++ b/src/x11/pen.cpp
@@ -12,10 +12,13 @@
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/utils.h"
 #include "wx/pen.h"
-#include "wx/colour.h"
-#include "wx/bitmap.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+    #include "wx/bitmap.h"
+    #include "wx/colour.h"
+#endif
 
 //-----------------------------------------------------------------------------
 // wxPen
@@ -122,7 +125,7 @@ void wxPen::SetDashes( int number_of_dashes, const wxDash *dash )
     M_PENDATA->m_dash = (wxX11Dash *)dash; // TODO
 }
 
-void wxPen::SetColour( int red, int green, int blue )
+void wxPen::SetColour( unsigned char red, unsigned char green, unsigned char blue )
 {
     AllocExclusive();
 
@@ -147,7 +150,7 @@ void wxPen::SetStipple( wxBitmap *stipple )
 {
     AllocExclusive();
 
-    M_PENDATA->m_stipple = *stipple;;
+    M_PENDATA->m_stipple = *stipple;
 }
 
 void wxPen::SetStyle( int style )