From 2eca425d4bc323540de9d5d525f6b2d295d8ed1a Mon Sep 17 00:00:00 2001 From: Ron Lee Date: Sun, 12 Mar 2000 11:49:19 +0000 Subject: [PATCH] separated wxDash type from platform specific wxGTKDash type git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6635 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/pen.h | 10 +++++++++- include/wx/gtk1/pen.h | 10 +++++++++- src/gtk/dcclient.cpp | 32 +++++++++++--------------------- src/gtk/pen.cpp | 10 +++++----- src/gtk1/dcclient.cpp | 32 +++++++++++--------------------- src/gtk1/pen.cpp | 10 +++++----- 6 files changed, 50 insertions(+), 54 deletions(-) diff --git a/include/wx/gtk/pen.h b/include/wx/gtk/pen.h index 508a4e5ea0..218116ce8a 100644 --- a/include/wx/gtk/pen.h +++ b/include/wx/gtk/pen.h @@ -21,13 +21,21 @@ #include "wx/gdiobj.h" #include "wx/gdicmn.h" +#include + //----------------------------------------------------------------------------- // classes //----------------------------------------------------------------------------- class wxPen; -typedef char wxDash; +typedef wxInt8 wxDash; + +#if GTK_CHECK_VERSION(1,2,7) +typedef gint8 wxGTKDash; +#else +typedef gchar wxGTKDash; +#endif //----------------------------------------------------------------------------- // wxPen diff --git a/include/wx/gtk1/pen.h b/include/wx/gtk1/pen.h index 508a4e5ea0..218116ce8a 100644 --- a/include/wx/gtk1/pen.h +++ b/include/wx/gtk1/pen.h @@ -21,13 +21,21 @@ #include "wx/gdiobj.h" #include "wx/gdicmn.h" +#include + //----------------------------------------------------------------------------- // classes //----------------------------------------------------------------------------- class wxPen; -typedef char wxDash; +typedef wxInt8 wxDash; + +#if GTK_CHECK_VERSION(1,2,7) +typedef gint8 wxGTKDash; +#else +typedef gchar wxGTKDash; +#endif //----------------------------------------------------------------------------- // wxPen diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp index a99a0791e7..e1c02e42c8 100644 --- a/src/gtk/dcclient.cpp +++ b/src/gtk/dcclient.cpp @@ -1381,15 +1381,15 @@ void wxWindowDC::SetPen( const wxPen &pen ) width = (int)w; } - static const char dotted[] = {1, 1}; - static const char short_dashed[] = {2, 2}; - static const char wxCoord_dashed[] = {2, 4}; - static const char dotted_dashed[] = {3, 3, 1, 3}; + static const wxGTKDash dotted[] = {1, 1}; + static const wxGTKDash short_dashed[] = {2, 2}; + static const wxGTKDash wxCoord_dashed[] = {2, 4}; + static const wxGTKDash dotted_dashed[] = {3, 3, 1, 3}; // We express dash pattern in pen width unit, so we are // independent of zoom factor and so on... int req_nb_dash; - const char *req_dash; + const wxGTKDash *req_dash; GdkLineStyle lineStyle = GDK_LINE_SOLID; switch (m_pen.GetStyle()) @@ -1398,7 +1398,7 @@ void wxWindowDC::SetPen( const wxPen &pen ) { lineStyle = GDK_LINE_ON_OFF_DASH; req_nb_dash = m_pen.GetDashCount(); - req_dash = m_pen.GetDash(); + req_dash = (wxGTKDash*)m_pen.GetDash(); break; } case wxDOT: @@ -1438,37 +1438,27 @@ void wxWindowDC::SetPen( const wxPen &pen ) default: { lineStyle = GDK_LINE_SOLID; - req_dash = (wxDash*)NULL; + req_dash = (wxGTKDash*)NULL; req_nb_dash = 0; break; } } -#if (GTK_MINOR_VERSION > 0) +#if (GTK_MINOR_VERSION > 0) || (GTK_MAJOR_VERSION > 1) if (req_dash && req_nb_dash) { - char *real_req_dash = new char[req_nb_dash]; + wxGTKDash *real_req_dash = new wxGTKDash[req_nb_dash]; if (real_req_dash) { for (int i = 0; i < req_nb_dash; i++) real_req_dash[i] = req_dash[i] * width; -#if GTK_CHECK_VERSION(1,2,7) - gdk_gc_set_dashes( m_penGC, 0, (gint8*) real_req_dash, - req_nb_dash ); -#else - gdk_gc_set_dashes( m_penGC, 0, real_req_dash, - req_nb_dash ); -#endif + gdk_gc_set_dashes( m_penGC, 0, real_req_dash, req_nb_dash ); delete[] real_req_dash; } else { // No Memory. We use non-scaled dash pattern... -#if GTK_CHECK_VERSION(1,2,7) - gdk_gc_set_dashes( m_penGC, 0, (gint8*)req_dash, req_nb_dash ); -#else - gdk_gc_set_dashes( m_penGC, 0, (char*)req_dash, req_nb_dash ); -#endif + gdk_gc_set_dashes( m_penGC, 0, (wxGTKDash*)req_dash, req_nb_dash ); } } #endif diff --git a/src/gtk/pen.cpp b/src/gtk/pen.cpp index 7f3809f558..90a54a25ee 100644 --- a/src/gtk/pen.cpp +++ b/src/gtk/pen.cpp @@ -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,7 +166,7 @@ int wxPen::GetDashCount() const wxDash* wxPen::GetDash() const { - return (M_PENDATA->m_dash); + return (wxDash*)M_PENDATA->m_dash; } int wxPen::GetCap() const diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp index a99a0791e7..e1c02e42c8 100644 --- a/src/gtk1/dcclient.cpp +++ b/src/gtk1/dcclient.cpp @@ -1381,15 +1381,15 @@ void wxWindowDC::SetPen( const wxPen &pen ) width = (int)w; } - static const char dotted[] = {1, 1}; - static const char short_dashed[] = {2, 2}; - static const char wxCoord_dashed[] = {2, 4}; - static const char dotted_dashed[] = {3, 3, 1, 3}; + static const wxGTKDash dotted[] = {1, 1}; + static const wxGTKDash short_dashed[] = {2, 2}; + static const wxGTKDash wxCoord_dashed[] = {2, 4}; + static const wxGTKDash dotted_dashed[] = {3, 3, 1, 3}; // We express dash pattern in pen width unit, so we are // independent of zoom factor and so on... int req_nb_dash; - const char *req_dash; + const wxGTKDash *req_dash; GdkLineStyle lineStyle = GDK_LINE_SOLID; switch (m_pen.GetStyle()) @@ -1398,7 +1398,7 @@ void wxWindowDC::SetPen( const wxPen &pen ) { lineStyle = GDK_LINE_ON_OFF_DASH; req_nb_dash = m_pen.GetDashCount(); - req_dash = m_pen.GetDash(); + req_dash = (wxGTKDash*)m_pen.GetDash(); break; } case wxDOT: @@ -1438,37 +1438,27 @@ void wxWindowDC::SetPen( const wxPen &pen ) default: { lineStyle = GDK_LINE_SOLID; - req_dash = (wxDash*)NULL; + req_dash = (wxGTKDash*)NULL; req_nb_dash = 0; break; } } -#if (GTK_MINOR_VERSION > 0) +#if (GTK_MINOR_VERSION > 0) || (GTK_MAJOR_VERSION > 1) if (req_dash && req_nb_dash) { - char *real_req_dash = new char[req_nb_dash]; + wxGTKDash *real_req_dash = new wxGTKDash[req_nb_dash]; if (real_req_dash) { for (int i = 0; i < req_nb_dash; i++) real_req_dash[i] = req_dash[i] * width; -#if GTK_CHECK_VERSION(1,2,7) - gdk_gc_set_dashes( m_penGC, 0, (gint8*) real_req_dash, - req_nb_dash ); -#else - gdk_gc_set_dashes( m_penGC, 0, real_req_dash, - req_nb_dash ); -#endif + gdk_gc_set_dashes( m_penGC, 0, real_req_dash, req_nb_dash ); delete[] real_req_dash; } else { // No Memory. We use non-scaled dash pattern... -#if GTK_CHECK_VERSION(1,2,7) - gdk_gc_set_dashes( m_penGC, 0, (gint8*)req_dash, req_nb_dash ); -#else - gdk_gc_set_dashes( m_penGC, 0, (char*)req_dash, req_nb_dash ); -#endif + gdk_gc_set_dashes( m_penGC, 0, (wxGTKDash*)req_dash, req_nb_dash ); } } #endif diff --git a/src/gtk1/pen.cpp b/src/gtk1/pen.cpp index 7f3809f558..90a54a25ee 100644 --- a/src/gtk1/pen.cpp +++ b/src/gtk1/pen.cpp @@ -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,7 +166,7 @@ int wxPen::GetDashCount() const wxDash* wxPen::GetDash() const { - return (M_PENDATA->m_dash); + return (wxDash*)M_PENDATA->m_dash; } int wxPen::GetCap() const -- 2.45.2