A couple of identifiers at global level moved to the .cpp file from .h where

they had nothing to do from the very beginning


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1701 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/intl.h

@@ -23,19 +23,12 @@
 // global decls
 // ============================================================================
 
-// ----------------------------------------------------------------------------
-// simple types
-// ----------------------------------------------------------------------------
-
-// # adjust if necessary
-typedef unsigned char size_t8;
-typedef unsigned long size_t32;
-
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
 
-// gettext() style macro
+// gettext() style macro (notice that xgettext should be invoked with "-k_"
+// option to extract the strings inside _() from the sources)
 #ifndef WXINTL_NO_GETTEXT_MACRO
     #define   _(str)  wxGetTranslation(str)
 #endif
@@ -45,7 +38,6 @@ typedef unsigned long size_t32;
 // ----------------------------------------------------------------------------
 class WXDLLEXPORT wxLocale;
 class WXDLLEXPORT wxMsgCatalog;
-extern WXDLLEXPORT_DATA(wxLocale *) g_pLocale;
 
 // ============================================================================
 // locale support
@@ -53,12 +45,14 @@ extern WXDLLEXPORT_DATA(wxLocale *) g_pLocale;
 
 // ----------------------------------------------------------------------------
 // wxLocale: encapsulates all language dependent settings, including current
-//           message catalogs, date, time and currency formats (#### to do) &c
+//           message catalogs, date, time and currency formats (TODO) &c
 // ----------------------------------------------------------------------------
 class WXDLLEXPORT wxLocale
 {
 public:
     // ctor & dtor
+    // -----------
+
         // call Init() if you use this ctor
     wxLocale();
         // the ctor has a side effect of changing current locale
@@ -111,7 +105,8 @@ public:
                           const char *szDomain = (const char *) NULL) const;
 
     // Returns the current short name for the locale
-  wxString const &GetName() const { return m_strShort; }
+    const wxString& GetName() const { return m_strShort; }
+
 private:
     // find catalog by name in a linked list, return NULL if !found
     wxMsgCatalog  *FindCatalog(const char *szDomain) const;
@@ -128,13 +123,15 @@ public:
 // ----------------------------------------------------------------------------
 // global functions
 // ----------------------------------------------------------------------------
-WXDLLEXPORT wxLocale* wxGetLocale();
+
+// get the current locale object (note that it may be NULL!)
+extern WXDLLEXPORT wxLocale* wxGetLocale();
 
 // get the translation of the string in the current locale
 inline const char *wxGetTranslation(const char *sz)
 {
     wxLocale *pLoc = wxGetLocale();
-  return pLoc == (wxLocale *) NULL ? sz : pLoc->GetString(sz);
+    return pLoc ? pLoc->GetString(sz) : sz;
 }
 
 #endif

src/common/intl.cpp

@@ -41,6 +41,14 @@
 
 #include <stdlib.h>
 
+// ----------------------------------------------------------------------------
+// simple types
+// ----------------------------------------------------------------------------
+
+// FIXME adjust if necessary
+typedef unsigned char size_t8;
+typedef unsigned long size_t32;
+
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
@@ -68,8 +76,7 @@ void wxRestoreTransErrors();
 // get the current state
 bool wxIsLoggingTransErrors();
 
-// get the current locale object (## may be NULL!)
+static wxLocale *wxSetLocale(wxLocale *pLocale);
-extern wxLocale *wxSetLocale(wxLocale *pLocale);
 
 // ----------------------------------------------------------------------------
 // wxMsgCatalog corresponds to one disk-file message catalog.
@@ -592,7 +599,7 @@ bool wxIsLoggingTransErrors()
 // ------------------------------
 
 // the current locale object
-wxLocale *g_pLocale = NULL;
+static wxLocale *g_pLocale = NULL;
 
 wxLocale *wxGetLocale()
 {