moved wxFloat/DoubleToStringStr from src/*/data.cpp to src/common/utils.cpp; took...

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

diff --git a/include/wx/utils.h b/include/wx/utils.h
index afcc70a72621a0f192ad7e65d7a2957aa39b8c81..d91baabc4819077b7910fed65425f421a20cc2b7 100644 (file)
--- a/include/wx/utils.h
+++ b/include/wx/utils.h
@@ -127,6 +127,9 @@ WXDLLEXPORT long wxGetCurrentId();
 // Various conversions
 // ----------------------------------------------------------------------------
 
+// these functions are deprecated, use wxString methods instead!
+#if WXWIN_COMPATIBILITY_2_4
+
 WXDLLEXPORT_DATA(extern const wxChar*) wxFloatToStringStr;
 WXDLLEXPORT_DATA(extern const wxChar*) wxDoubleToStringStr;
 
@@ -139,6 +142,8 @@ WXDLLEXPORT void StringToLong(const wxChar *s, long *number);
 WXDLLEXPORT wxChar* IntToString(int number);
 WXDLLEXPORT wxChar* LongToString(long number);
 
+#endif // WXWIN_COMPATIBILITY_2_4
+
 // Convert 2-digit hex number to decimal
 WXDLLEXPORT int wxHexToDec(const wxString& buf);
 

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index ae8c7e79dc1349becec4e1f21bc2bde72cae63db..93aa19f675a6a33f464a84f05922039dae285258 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -133,6 +133,15 @@ wxRegisterId (long id)
     wxCurrentId = id + 1;
 }
 
+// ----------------------------------------------------------------------------
+// String <-> Number conversions (deprecated)
+// ----------------------------------------------------------------------------
+
+#if WXWIN_COMPATIBILITY_2_4
+
+WXDLLEXPORT_DATA(const wxChar *) wxFloatToStringStr = wxT("%.2f");
+WXDLLEXPORT_DATA(const wxChar *) wxDoubleToStringStr = wxT("%.2f");
+
 void
 StringToFloat (const wxChar *s, float *number)
 {
@@ -197,6 +206,8 @@ LongToString (long number)
   return buf;
 }
 
+#endif // WXWIN_COMPATIBILITY_2_4
+
 // Array used in DecToHex conversion routine.
 static wxChar hexArray[] = wxT("0123456789ABCDEF");
 

diff --git a/src/mac/carbon/data.cpp b/src/mac/carbon/data.cpp
index 6b56b896dcfbfa8b4e5f53f716a3513e85e4f921..d0aceaf40a697d75b1f65467faebb144875c7d26 100644 (file)
--- a/src/mac/carbon/data.cpp
+++ b/src/mac/carbon/data.cpp
@@ -126,10 +126,6 @@ const wxChar *wxTreeCtrlNameStr = wxT("treeCtrl");
 const wxChar *wxDirDialogNameStr = wxT("wxDirCtrl");
 const wxChar *wxDirDialogDefaultFolderStr = wxT("/");
 
-// See wx/utils.h
-const wxChar *wxFloatToStringStr = wxT("%.2f");
-const wxChar *wxDoubleToStringStr = wxT("%.2f");
-
 #if wxUSE_SHARED_LIBRARY
 ///// Event tables (also must be in one, statically-linked file for shared libraries)
 

diff --git a/src/mac/data.cpp b/src/mac/data.cpp
index 6b56b896dcfbfa8b4e5f53f716a3513e85e4f921..d0aceaf40a697d75b1f65467faebb144875c7d26 100644 (file)
--- a/src/mac/data.cpp
+++ b/src/mac/data.cpp
@@ -126,10 +126,6 @@ const wxChar *wxTreeCtrlNameStr = wxT("treeCtrl");
 const wxChar *wxDirDialogNameStr = wxT("wxDirCtrl");
 const wxChar *wxDirDialogDefaultFolderStr = wxT("/");
 
-// See wx/utils.h
-const wxChar *wxFloatToStringStr = wxT("%.2f");
-const wxChar *wxDoubleToStringStr = wxT("%.2f");
-
 #if wxUSE_SHARED_LIBRARY
 ///// Event tables (also must be in one, statically-linked file for shared libraries)
 

diff --git a/src/mgl/data.cpp b/src/mgl/data.cpp
index 931b04062e4133505f875ef3677bcdcec1de24e3..bd9a78ccd5fbbd7b74a917ee641af197c0da8bc4 100644 (file)
--- a/src/mgl/data.cpp
+++ b/src/mgl/data.cpp
@@ -168,10 +168,6 @@ const wxChar *wxDirDialogNameStr = wxT("wxDirCtrl");
 const wxChar *wxDirDialogDefaultFolderStr = wxT("/");
 const wxChar *wxTreeCtrlNameStr = wxT("wxTreeCtrl");
 
-/* See wx/utils.h */
-const wxChar *wxFloatToStringStr = wxT("%.2f");
-const wxChar *wxDoubleToStringStr = wxT("%.2f");
-
 /* Dafaults for wxWindow etc. */
 const wxSize wxDefaultSize(-1, -1);
 const wxPoint wxDefaultPosition(-1, -1);

diff --git a/src/motif/data.cpp b/src/motif/data.cpp
index ae0b7368c6366860f8a27fc1d20a49a202c0d810..a8d3b651b9e1b1882592e33920803a83e4a3b18a 100644 (file)
--- a/src/motif/data.cpp
+++ b/src/motif/data.cpp
@@ -122,10 +122,5 @@ const wxChar *wxTreeCtrlNameStr = wxT("wxTreeCtrl");
 const wxChar *wxDirDialogNameStr = wxT("wxDirCtrl");
 const wxChar *wxDirDialogDefaultFolderStr = wxT("/");
 
-// See wx/utils.h
-const wxChar *wxFloatToStringStr = wxT("%.2f");
-const wxChar *wxDoubleToStringStr = wxT("%.2f");
-
-
 const wxSize wxDefaultSize(-1, -1);
 const wxPoint wxDefaultPosition(-1, -1);

diff --git a/src/msw/data.cpp b/src/msw/data.cpp
index 586b760059f2a4874f838aea229f80aa2d832ff4..94b3342d731026738369990653f723f996c37305 100644 (file)
--- a/src/msw/data.cpp
+++ b/src/msw/data.cpp
@@ -140,10 +140,6 @@ WXDLLEXPORT_DATA(const wxChar *) wxTreeCtrlNameStr = wxT("treeCtrl");
 WXDLLEXPORT_DATA(const wxChar *) wxDirDialogNameStr = wxT("wxDirCtrl");
 WXDLLEXPORT_DATA(const wxChar *) wxDirDialogDefaultFolderStr = wxT("/");
 
-// See wx/utils.h
-WXDLLEXPORT_DATA(const wxChar *) wxFloatToStringStr = wxT("%.2f");
-WXDLLEXPORT_DATA(const wxChar *) wxDoubleToStringStr = wxT("%.2f");
-
 #ifdef __WXMSW__
 WXDLLEXPORT_DATA(const wxChar *) wxUserResourceStr = wxT("TEXT");
 #endif

diff --git a/src/os2/data.cpp b/src/os2/data.cpp
index 3b0395883ca6b579bdcd6c643906421daec91a73..df2a65f7d500b82f485c7b7cf361e65c07458324 100644 (file)
--- a/src/os2/data.cpp
+++ b/src/os2/data.cpp
@@ -150,10 +150,6 @@ const wxChar*                       wxPanelClassNameNR               = wxT("wxPa
 const wxChar*                       wxCanvasClassName                = wxT("wxCanvasClass");
 const wxChar*                       wxCanvasClassNameNR              = wxT("wxCanvasClassNR");
 
-// See wx/utils.h
-const wxChar *wxFloatToStringStr = wxT("%.2f");
-const wxChar *wxDoubleToStringStr = wxT("%.2f");
-
 const wxChar *wxUserResourceStr = wxT("TEXT");
 
 const wxSize wxDefaultSize(-1, -1);

diff --git a/src/x11/data.cpp b/src/x11/data.cpp
index ffd29c7587cc1b19f3e2cce60e3ed5096e611b21..35e6f643f0b13ff5f51f1b0711b190634d293ffd 100644 (file)
--- a/src/x11/data.cpp
+++ b/src/x11/data.cpp
@@ -122,10 +122,5 @@ const wxChar *wxDirDialogNameStr = wxT("wxDirCtrl");
 const wxChar *wxDirDialogDefaultFolderStr = wxT("/");
 const wxChar *wxTreeCtrlNameStr = wxT("wxTreeCtrl");
 
-/* See wx/utils.h */
-const wxChar *wxFloatToStringStr = wxT("%.2f");
-const wxChar *wxDoubleToStringStr = wxT("%.2f");
-
-
 const wxSize wxDefaultSize(-1, -1);
 const wxPoint wxDefaultPosition(-1, -1);