compilation fix for STL build; also don't pass unknown string potentially containing...

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

diff --git a/src/x11/pen.cpp b/src/x11/pen.cpp
index 5dd99899cb3b42cca2b9adef92efefadf7c4f4b5..079472dbdf59b1b5cb424667147c880ad4b574b4 100644 (file)
--- a/src/x11/pen.cpp
+++ b/src/x11/pen.cpp
@@ -12,16 +12,19 @@
 // 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
 //-----------------------------------------------------------------------------
 
-class wxPenRefData: public wxObjectRefData
+class wxPenRefData : public wxGDIRefData
 {
 public:
     wxPenRefData()
@@ -88,12 +91,12 @@ wxPen::~wxPen()
     // m_refData unrefed in ~wxObject
 }
 
-wxObjectRefData *wxPen::CreateRefData() const
+wxGDIRefData *wxPen::CreateGDIRefData() const
 {
     return new wxPenRefData;
 }
 
-wxObjectRefData *wxPen::CloneRefData(const wxObjectRefData *data) const
+wxGDIRefData *wxPen::CloneGDIRefData(const wxGDIRefData *data) const
 {
     return new wxPenRefData(*(wxPenRefData *)data);
 }