From 96b77d60a480ec86360e7b9e3969316ed074fd2d Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Tue, 23 Nov 2010 22:14:18 +0000 Subject: [PATCH] Fixed parameter names. They can't be named "short" git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- interface/wx/intl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/wx/intl.h b/interface/wx/intl.h index 335525b75b..ee6efcc7d4 100644 --- a/interface/wx/intl.h +++ b/interface/wx/intl.h @@ -235,7 +235,7 @@ public: translate the messages using the message catalogs for this locale. */ wxLocale(const wxString& name, - const wxString& short = wxEmptyString, + const wxString& shortName = wxEmptyString, const wxString& locale = wxEmptyString, bool bLoadDefault = true); @@ -459,7 +459,7 @@ public: given locale containing the translations of standard wxWidgets messages. This parameter would be rarely used in normal circumstances. */ - bool Init(const wxString& name, const wxString& short = wxEmptyString, + bool Init(const wxString& name, const wxString& shortName = wxEmptyString, const wxString& locale = wxEmptyString, bool bLoadDefault = true); /** -- 2.45.2