reverting to native mac pathnames

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

diff --git a/include/wx/qt/pen.h b/include/wx/qt/pen.h
index 0e23c99daf07dd043ad4f64d87787c48a0247e13..8989d44435fe4927f620e341aea85516d2d2886c 100644 (file)
--- a/include/wx/qt/pen.h
+++ b/include/wx/qt/pen.h
@@ -17,8 +17,9 @@
 #endif
 
 #include "wx/gdiobj.h"
 #endif
 
 #include "wx/gdiobj.h"

+#include "wx/gdicmn.h"

 
 

-typedef    WXDWORD  wxDash ;
+typedef WXDWORD wxQTDash;

 
 class WXDLLEXPORT wxPen;
 
 
 class WXDLLEXPORT wxPen;
 


@@ -37,7 +38,7 @@ protected:
   int           m_cap ;
   wxBitmap      m_stipple ;
   int           m_nbDash ;
   int           m_cap ;
   wxBitmap      m_stipple ;
   int           m_nbDash ;

-  wxDash *      m_dash ;
+  wxQTDash *    m_dash;

   wxColour      m_colour;
 /* TODO: implementation
   WXHPEN        m_hPen;
   wxColour      m_colour;
 /* TODO: implementation
   WXHPEN        m_hPen;


@@ -82,8 +83,10 @@ public:
   inline int GetStyle() const { return (M_PENDATA ? M_PENDATA->m_style : 0); };
   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 GetStyle() const { return (M_PENDATA ? M_PENDATA->m_style : 0); };
   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);
+  inline int GetDashes(wxDash **ptr) const
+  {
+    *ptr = (M_PENDATA ? (wxDash*)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) : NULL); };