Further __WXGTK20__ fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9366 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1334,7 +1334,7 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
|
|||||||
|
|
||||||
wxCHECK_RET( font, wxT("invalid font") );
|
wxCHECK_RET( font, wxT("invalid font") );
|
||||||
|
|
||||||
#ifdef __WXGTK20__
|
#if defined(__WXGTK20__)
|
||||||
wxCHECK_RET( m_context, wxT("no Pango context") );
|
wxCHECK_RET( m_context, wxT("no Pango context") );
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -1378,7 +1378,7 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
|
|||||||
gdk_draw_line( m_window, m_textGC, x, ul_y, x + width, ul_y);
|
gdk_draw_line( m_window, m_textGC, x, ul_y, x + width, ul_y);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef __WXGTK20__
|
#if defined(__WXGTK20__) && wxUSE_WCHAR_T
|
||||||
g_object_unref( G_OBJECT( layout ) );
|
g_object_unref( G_OBJECT( layout ) );
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@@ -1334,7 +1334,7 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
|
|||||||
|
|
||||||
wxCHECK_RET( font, wxT("invalid font") );
|
wxCHECK_RET( font, wxT("invalid font") );
|
||||||
|
|
||||||
#ifdef __WXGTK20__
|
#if defined(__WXGTK20__)
|
||||||
wxCHECK_RET( m_context, wxT("no Pango context") );
|
wxCHECK_RET( m_context, wxT("no Pango context") );
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -1378,7 +1378,7 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
|
|||||||
gdk_draw_line( m_window, m_textGC, x, ul_y, x + width, ul_y);
|
gdk_draw_line( m_window, m_textGC, x, ul_y, x + width, ul_y);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef __WXGTK20__
|
#if defined(__WXGTK20__) && wxUSE_WCHAR_T
|
||||||
g_object_unref( G_OBJECT( layout ) );
|
g_object_unref( G_OBJECT( layout ) );
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user