From: Vadim Zeitlin Date: Wed, 15 Aug 2007 12:53:59 +0000 (+0000) Subject: don't use deprecated wxMenuItem methods X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/c267759c8f0d9d8954b2cc883c868b23ff1ca9ee?hp=ca6328c44eb6c8dbab625e4e808e56c2aa2f48da don't use deprecated wxMenuItem methods git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48092 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/univ/themes/gtk.cpp b/src/univ/themes/gtk.cpp index 0246f9d12a..447a359305 100644 --- a/src/univ/themes/gtk.cpp +++ b/src/univ/themes/gtk.cpp @@ -1782,7 +1782,7 @@ wxMenuGeometryInfo *wxGTKRenderer::GetMenuGeometry(wxWindow *win, h = heightText; wxCoord widthLabel; - dc.GetTextExtent(item->GetLabel(), &widthLabel, NULL); + dc.GetTextExtent(item->GetItemLabelText(), &widthLabel, NULL); if ( widthLabel > widthLabelMax ) { widthLabelMax = widthLabel; diff --git a/src/univ/themes/win32.cpp b/src/univ/themes/win32.cpp index 3603333f2b..853c080d57 100644 --- a/src/univ/themes/win32.cpp +++ b/src/univ/themes/win32.cpp @@ -2505,7 +2505,7 @@ wxMenuGeometryInfo *wxWin32Renderer::GetMenuGeometry(wxWindow *win, h = heightText; wxCoord widthLabel; - dc.GetTextExtent(item->GetLabel(), &widthLabel, NULL); + dc.GetTextExtent(item->GetItemLabelText(), &widthLabel, NULL); if ( widthLabel > widthLabelMax ) { widthLabelMax = widthLabel;