Compilation fixes for wxUSE_LOCALE and wxUSE_XLOCALE set to 0.

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

src/common/numformatter.cpp

@@ -39,7 +39,9 @@ class LocaleId
 public:
     LocaleId()
     {
+#if wxUSE_INTL
         m_wxloc = NULL;
+#endif // wxUSE_INTL
         m_cloc = NULL;
     }
 
@@ -48,6 +50,7 @@ public:
         Free();
     }
 
+#if wxUSE_INTL
     // Return true if this is the first time this function is called for this
     // object or if the program locale has changed since the last time it was
     // called. Otherwise just return false indicating that updating locale-
@@ -70,15 +73,20 @@ public:
 
         return true;
     }
+#endif // wxUSE_INTL
 
 private:
     void Free()
     {
+#if wxUSE_INTL
         free(m_cloc);
+#endif // wxUSE_INTL
     }
 
+#if wxUSE_INTL
     // Non-owned pointer to wxLocale which was used.
     wxLocale *m_wxloc;
+#endif // wxUSE_INTL
 
     // Owned pointer to the C locale string.
     char *m_cloc;
@@ -98,6 +106,7 @@ private:
 
 wxChar wxNumberFormatter::GetDecimalSeparator()
 {
+#if wxUSE_INTL
     // Notice that while using static variable here is not MT-safe, the worst
     // that can happen is that we redo the initialization if we're called
     // concurrently from more than one thread so it's not a real problem.
@@ -128,10 +137,14 @@ wxChar wxNumberFormatter::GetDecimalSeparator()
     }
 
     return s_decimalSeparator;
+#else // !wxUSE_INTL
+    return wxT('.');
+#endif // wxUSE_INTL/!wxUSE_INTL
 }
 
 bool wxNumberFormatter::GetThousandsSeparatorIfUsed(wxChar *sep)
 {
+#if wxUSE_INTL
     static wxChar s_thousandsSeparator = 0;
     static LocaleId s_localeUsedForInit;
 
@@ -157,6 +170,10 @@ bool wxNumberFormatter::GetThousandsSeparatorIfUsed(wxChar *sep)
         *sep = s_thousandsSeparator;
 
     return true;
+#else // !wxUSE_INTL
+    wxUnusedVar(sep);
+    return false;
+#endif // wxUSE_INTL/!wxUSE_INTL
 }
 
 // ----------------------------------------------------------------------------

src/generic/datectlg.cpp

@@ -209,11 +209,15 @@ private:
     // functions honours wxDP_SHOWCENTURY flag.
     wxString GetLocaleDateFormat() const
     {
+#if wxUSE_INTL
         wxString fmt = wxLocale::GetInfo(wxLOCALE_SHORT_DATE_FMT);
         if ( HasDPFlag(wxDP_SHOWCENTURY) )
             fmt.Replace("%y", "%Y");
 
         return fmt;
+#else // !wxUSE_INTL
+        return wxT("x");
+#endif // wxUSE_INTL/!wxUSE_INTL
     }
 
     bool SetFormat(const wxString& fmt)