fixed GTK 1.2.7 vs. <= 1.2.6 API incompatibility: gdk_gc_set_hashes, argument 3 gint8...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6620 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index 0e930e4cfff2c67194acc850d5ab548f57dce455..a99a0791e724807d638783b0db9d8be0b9be93d6 100644 (file)
--- 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;
         {
             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 );
             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...
             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 );
             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
         }
     }
 #endif

diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp
index 0e930e4cfff2c67194acc850d5ab548f57dce455..a99a0791e724807d638783b0db9d8be0b9be93d6 100644 (file)
--- 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;
         {
             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 );
             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...
             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 );
             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
         }
     }
 #endif