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

diff --git a/interface/wx/intl.h b/interface/wx/intl.h
index 335525b75b28786101f2b838ad47796c5208bd74..ee6efcc7d4ac01ffcd31889df1954c0957dfba2e 100644 (file)
--- 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);
 
     /**