Found bug that skrewed up display wrt horizontal

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

diff --git a/src/gtk/pen.cpp b/src/gtk/pen.cpp
index 00a092953fdda13e8605ccbc4e5aca7b3cf6aa17..90a54a25eef97bbceed2e1d04dd101be1b34e048 100644 (file)
--- a/src/gtk/pen.cpp
+++ b/src/gtk/pen.cpp
@@ -14,7 +14,7 @@
 
 #include "wx/pen.h"
 
-#include "gdk/gdk.h"
+#include <gdk/gdk.h>
 
 //-----------------------------------------------------------------------------
 // wxPen
@@ -33,7 +33,7 @@ public:
   int        m_capStyle;
   wxColour   m_colour;
   int        m_countDashes;
-  wxDash    *m_dash;
+  wxGTKDash *m_dash;
 };
 
 wxPenRefData::wxPenRefData()
@@ -42,7 +42,7 @@ wxPenRefData::wxPenRefData()
     m_style = wxSOLID;
     m_joinStyle = wxJOIN_ROUND;
     m_capStyle = wxCAP_ROUND;
-    m_dash = (wxDash*) NULL;
+    m_dash = (wxGTKDash*) NULL;
     m_countDashes = 0;
 }
 
@@ -120,7 +120,7 @@ void wxPen::SetDashes( int number_of_dashes, const wxDash *dash )
 {
     Unshare();
     M_PENDATA->m_countDashes = number_of_dashes;
-    M_PENDATA->m_dash = (wxDash *)dash; /* TODO */
+    M_PENDATA->m_dash = (wxGTKDash *)dash; /* TODO */
 }
 
 void wxPen::SetColour( int red, int green, int blue )
@@ -155,7 +155,7 @@ void wxPen::SetWidth( int width )
 
 int wxPen::GetDashes( wxDash **ptr ) const 
 {
-     *ptr = (M_PENDATA ? M_PENDATA->m_dash : (wxDash*) NULL); 
+     *ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL); 
      return (M_PENDATA ? M_PENDATA->m_countDashes : 0);
 }
 
@@ -166,40 +166,40 @@ int wxPen::GetDashCount() const
 
 wxDash* wxPen::GetDash() const 
 { 
-    return (M_PENDATA->m_dash); 
+    return (wxDash*)M_PENDATA->m_dash; 
 }
 
 int wxPen::GetCap() const
 {
-    wxCHECK_MSG( Ok(), -1, _T("invalid pen") );
+    wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
 
     return M_PENDATA->m_capStyle;
 }
 
 int wxPen::GetJoin() const
 {
-    wxCHECK_MSG( Ok(), -1, _T("invalid pen") );
+    wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
 
     return M_PENDATA->m_joinStyle;
 }
 
 int wxPen::GetStyle() const
 {
-    wxCHECK_MSG( Ok(), -1, _T("invalid pen") );
+    wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
 
     return M_PENDATA->m_style;
 }
 
 int wxPen::GetWidth() const
 {
-    wxCHECK_MSG( Ok(), -1, _T("invalid pen") );
+    wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
 
     return M_PENDATA->m_width;
 }
 
 wxColour &wxPen::GetColour() const
 {
-    wxCHECK_MSG( Ok(), wxNullColour, _T("invalid pen") );
+    wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") );
 
     return M_PENDATA->m_colour;
 }