update from herbert breunung

[wxWidgets.git] / wxPython / src / _intl.i

diff --git a/wxPython/src/_intl.i b/wxPython/src/_intl.i
index e1b7b7444e193bbc6efdf8052180b36343ec0dc2..22f868cf08712004336505d148e5b24125245435 100644 (file)
--- a/wxPython/src/_intl.i
+++ b/wxPython/src/_intl.i
@@ -308,8 +308,15 @@ class wxLocale
 public:
     // ctor & dtor
     // -----------
 public:
     // ctor & dtor
     // -----------

-    wxLocale(int language = wxLANGUAGE_DEFAULT,
-             int flags = wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING);
+    %extend {
+        wxLocale(int language = -1,
+                 int flags = wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING) {
+            if (language == -1)
+                return new wxLocale();
+            else
+                return new wxLocale(language, flags);
+        }
+    }

 
         // restores old locale
     ~wxLocale();
 
         // restores old locale
     ~wxLocale();


@@ -433,8 +440,8 @@ wxLocale* wxGetLocale();
 
 // get the translation of the string in the current locale
 %nokwargs wxGetTranslation;
 
 // get the translation of the string in the current locale
 %nokwargs wxGetTranslation;

-wxString wxGetTranslation(const wxString& sz);
-wxString wxGetTranslation(const wxString& sz1, const wxString& sz2, size_t n);
+wxString wxGetTranslation(const wxString& str);
+wxString wxGetTranslation(const wxString& str, const wxString& strPlural, size_t n);

 
 //---------------------------------------------------------------------------
 %newgroup
 
 //---------------------------------------------------------------------------
 %newgroup