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
This commit is contained in:
parent
f3979fcc3b
commit
f3d05fe417
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user