From 36bc75c5bb0eefb9fa8766ba503303ad4d0e2fb4 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 3 Oct 2014 01:52:28 +0000 Subject: [PATCH] Undo parameter renaming in DoDrawRotatedText(). This doesn't make any difference, of course, but results in a warning from the ABI compliance checker tool, so undo this part of the changes of r74584. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@77951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/dcclient.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp index 7af0853973..09635b7c2e 100644 --- a/src/gtk/dcclient.cpp +++ b/src/gtk/dcclient.cpp @@ -1399,14 +1399,14 @@ void wxWindowDCImpl::DoDrawText(const wxString& text, DoDrawRotatedText(text, xLogical, yLogical, 0); } -void wxWindowDCImpl::DoDrawRotatedText(const wxString& text, int xLogical, int yLogical, double angle) +void wxWindowDCImpl::DoDrawRotatedText(const wxString& str, int xLogical, int yLogical, double angle) { - if (!m_gdkwindow || text.empty()) + if (!m_gdkwindow || str.empty()) return; wxCHECK_RET( IsOk(), wxT("invalid window dc") ); - pango_layout_set_text(m_layout, wxGTK_CONV(text), -1); + pango_layout_set_text(m_layout, wxGTK_CONV(str), -1); const bool setAttrs = m_font.GTKSetPangoAttrs(m_layout); const GdkColor* bg_col = NULL;