some Linux compilation fixes

[wxWidgets.git] / include / wx / stubs / pen.h

diff --git a/include/wx/stubs/pen.h b/include/wx/stubs/pen.h
index 0e23c99daf07dd043ad4f64d87787c48a0247e13..5097841e3471107ad07bc0324e7bce44756370c6 100644 (file)
--- a/include/wx/stubs/pen.h
+++ b/include/wx/stubs/pen.h
@@ -17,8 +17,10 @@
 #endif
 
 #include "wx/gdiobj.h"
 #endif
 
 #include "wx/gdiobj.h"

+#include "wx/colour.h"
+#include "wx/bitmap.h"

 
 

-typedef    WXDWORD  wxDash ;
+typedef    long wxDash ;

 
 class WXDLLEXPORT wxPen;
 
 
 class WXDLLEXPORT wxPen;
 


@@ -53,7 +55,6 @@ class WXDLLEXPORT wxPen: public wxGDIObject
 public:
   wxPen();
   wxPen(const wxColour& col, int width, int style);
 public:
   wxPen();
   wxPen(const wxColour& col, int width, int style);

-  wxPen(const wxString& col, int width, int style);

   wxPen(const wxBitmap& stipple, int width);
   inline wxPen(const wxPen& pen) { Ref(pen); }
   inline wxPen(const wxPen* pen) { if (pen) Ref(*pen); }
   wxPen(const wxBitmap& stipple, int width);
   inline wxPen(const wxPen& pen) { Ref(pen); }
   inline wxPen(const wxPen* pen) { if (pen) Ref(*pen); }


@@ -67,8 +68,7 @@ public:
 
   // Override in order to recreate the pen
   void SetColour(const wxColour& col) ;
 
   // Override in order to recreate the pen
   void SetColour(const wxColour& col) ;

-  void SetColour(const wxString& col)  ;
-  void SetColour(const unsigned char r, const unsigned char g, const unsigned char b)  ;
+  void SetColour(unsigned char r, unsigned char g, unsigned char b)  ;

 
   void SetWidth(int width)  ;
   void SetStyle(int style)  ;
 
   void SetWidth(int width)  ;
   void SetStyle(int style)  ;


@@ -83,15 +83,15 @@ public:
   inline int GetJoin() const { return (M_PENDATA ? M_PENDATA->m_join : 0); };
   inline int GetCap() const { return (M_PENDATA ? M_PENDATA->m_cap : 0); };
   inline int GetDashes(wxDash **ptr) const {
   inline int GetJoin() const { return (M_PENDATA ? M_PENDATA->m_join : 0); };
   inline int GetCap() const { return (M_PENDATA ? M_PENDATA->m_cap : 0); };
   inline int GetDashes(wxDash **ptr) const {

-     *ptr = (M_PENDATA ? M_PENDATA->m_dash : NULL); return (M_PENDATA ? M_PENDATA->m_nbDash : 0);
+     *ptr = (M_PENDATA ? M_PENDATA->m_dash : (wxDash*) NULL); return (M_PENDATA ? M_PENDATA->m_nbDash : 0);

   }
 
   }
 

-  inline wxBitmap *GetStipple() const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : NULL); };
+  inline wxBitmap *GetStipple() const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : (wxBitmap*) NULL); };

 
 // Implementation
 
   // Useful helper: create the brush resource
 
 // Implementation
 
   // Useful helper: create the brush resource

-  void RealizeResource();
+  bool RealizeResource();

 
   // When setting properties, we must make sure we're not changing
   // another object
 
   // When setting properties, we must make sure we're not changing
   // another object