Turned wxIcon inline constructors to real constructors

[wxWidgets.git] / include / wx / intl.h

diff --git a/include/wx/intl.h b/include/wx/intl.h
index 3bbdd43355bc08b57dc17faf28ffe260de26b2e3..e6a597ed45bafa73f9c74a47bc17a8bc6500fa11 100644 (file)
--- a/include/wx/intl.h
+++ b/include/wx/intl.h
@@ -57,11 +57,19 @@ class WXDLLEXPORT wxLocale
 {
 public:
   // ctor & dtor
 {
 public:
   // ctor & dtor

+    // call Init() if you use this ctor
+  wxLocale();

     // the ctor has a side effect of changing current locale
   wxLocale(const char *szName,              // name (for messages)
            const char *szShort = NULL,      // dir prefix (for msg files)
            const char *szLocale = NULL,     // locale (for setlocale)
     // the ctor has a side effect of changing current locale
   wxLocale(const char *szName,              // name (for messages)
            const char *szShort = NULL,      // dir prefix (for msg files)
            const char *szLocale = NULL,     // locale (for setlocale)

-           bool bLoadDefault = TRUE);       // preload wxstd.mo?
+           bool bLoadDefault = TRUE)        // preload wxstd.mo?
+    { Init(szName, szShort, szLocale, bLoadDefault); }
+    // the same as a function (returns TRUE on success)
+  bool Init(const char *szName,
+            const char *szShort = NULL,
+            const char *szLocale = NULL,
+            bool bLoadDefault = TRUE);

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


@@ -107,7 +115,6 @@ private:
 // ----------------------------------------------------------------------------
 // global functions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // global functions
 // ----------------------------------------------------------------------------

-

 WXDLLEXPORT wxLocale* wxGetLocale();
 
 // get the translation of the string in the current locale  
 WXDLLEXPORT wxLocale* wxGetLocale();
 
 // get the translation of the string in the current locale  


@@ -118,4 +125,4 @@ inline WXDLLEXPORT const char *wxGetTranslation(const char *sz)
 }
 
 #endif
 }
 
 #endif

-       // __INTLH__
+       // _WX_INTLH__