From f3d05fe417254ba7c098683058bc34346c76ff97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sat, 11 Mar 2000 12:28:31 +0000 Subject: [PATCH] fixed GTK 1.2.7 vs. <= 1.2.6 API incompatibility: gdk_gc_set_hashes, argument 3 gint8* vs. char* git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6620 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/dcclient.cpp | 9 +++++++++ src/gtk1/dcclient.cpp | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp index 0e930e4cff..a99a0791e7 100644 --- a/src/gtk/dcclient.cpp +++ b/src/gtk/dcclient.cpp @@ -1452,14 +1452,23 @@ void wxWindowDC::SetPen( const wxPen &pen ) { 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 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 } } #endif diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp index 0e930e4cff..a99a0791e7 100644 --- a/src/gtk1/dcclient.cpp +++ b/src/gtk1/dcclient.cpp @@ -1452,14 +1452,23 @@ void wxWindowDC::SetPen( const wxPen &pen ) { 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 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 } } #endif