Use the data scheme to load resources in the WebKitGTK+ implementation, rather than...

[wxWidgets.git] / src / common / numformatter.cpp

diff --git a/src/common/numformatter.cpp b/src/common/numformatter.cpp
index 898c1cf933fa824120cff45bcd374a64d6404182..7b110abc18f840943e729600efb2426a33331b2b 100644 (file)
--- a/src/common/numformatter.cpp
+++ b/src/common/numformatter.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        numformatter.cpp
+// Name:        src/common/numformatter.cpp

 // Purpose:     wxNumberFormatter
 // Author:      Fulvio Senore, Vadim Zeitlin
 // Created:     2010-11-06
 // Purpose:     wxNumberFormatter
 // Author:      Fulvio Senore, Vadim Zeitlin
 // Created:     2010-11-06


@@ -21,6 +21,10 @@
 #include "wx/numformatter.h"
 #include "wx/intl.h"
 
 #include "wx/numformatter.h"
 #include "wx/intl.h"
 

+#if !wxUSE_STD_STRING
+    #include <locale.h> // for setlocale and LC_ALL
+#endif
+

 // ----------------------------------------------------------------------------
 // local helpers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // local helpers
 // ----------------------------------------------------------------------------


@@ -39,7 +43,9 @@ class LocaleId
 public:
     LocaleId()
     {
 public:
     LocaleId()
     {

+#if wxUSE_INTL

         m_wxloc = NULL;
         m_wxloc = NULL;

+#endif // wxUSE_INTL

         m_cloc = NULL;
     }
 
         m_cloc = NULL;
     }
 


@@ -48,6 +54,7 @@ public:
         Free();
     }
 
         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-
     // 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 +77,20 @@ public:
 
         return true;
     }
 
         return true;
     }

+#endif // wxUSE_INTL

 
 private:
     void Free()
     {
 
 private:
     void Free()
     {

+#if wxUSE_INTL

         free(m_cloc);
         free(m_cloc);

+#endif // wxUSE_INTL

     }
 
     }
 

+#if wxUSE_INTL

     // Non-owned pointer to wxLocale which was used.
     wxLocale *m_wxloc;
     // Non-owned pointer to wxLocale which was used.
     wxLocale *m_wxloc;

+#endif // wxUSE_INTL

 
     // Owned pointer to the C locale string.
     char *m_cloc;
 
     // Owned pointer to the C locale string.
     char *m_cloc;


@@ -98,6 +110,7 @@ private:
 
 wxChar wxNumberFormatter::GetDecimalSeparator()
 {
 
 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.
     // 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 +141,14 @@ wxChar wxNumberFormatter::GetDecimalSeparator()
     }
 
     return s_decimalSeparator;
     }
 
     return s_decimalSeparator;

+#else // !wxUSE_INTL
+    return wxT('.');
+#endif // wxUSE_INTL/!wxUSE_INTL

 }
 
 bool wxNumberFormatter::GetThousandsSeparatorIfUsed(wxChar *sep)
 {
 }
 
 bool wxNumberFormatter::GetThousandsSeparatorIfUsed(wxChar *sep)
 {

+#if wxUSE_INTL

     static wxChar s_thousandsSeparator = 0;
     static LocaleId s_localeUsedForInit;
 
     static wxChar s_thousandsSeparator = 0;
     static LocaleId s_localeUsedForInit;
 


@@ -157,6 +174,10 @@ bool wxNumberFormatter::GetThousandsSeparatorIfUsed(wxChar *sep)
         *sep = s_thousandsSeparator;
 
     return true;
         *sep = s_thousandsSeparator;
 
     return true;

+#else // !wxUSE_INTL
+    wxUnusedVar(sep);
+    return false;
+#endif // wxUSE_INTL/!wxUSE_INTL

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------