compilation fixes

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

diff --git a/src/common/config.cpp b/src/common/config.cpp
index d2015ed568225b44c0a14f6f80bff81cab28d270..1b614016b2750f3951157b227aff3b60d4e37490 100644 (file)
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -132,9 +132,9 @@ bool wxConfigBase::Read(const wxString& key, long *pl, long defVal) const
 bool wxConfigBase::Read(const wxString& key, double* val) const
 {
     wxString str;
 bool wxConfigBase::Read(const wxString& key, double* val) const
 {
     wxString str;

-    if (Read(key, & str))
+    if ( Read(key, &str) )

     {
     {

-        return wxSscanf(str, _T("%g"), val) == 1;
+        return str.ToDouble(val);

     }
 
     return FALSE;
     }
 
     return FALSE;

diff --git a/src/generic/gridctrl.cpp b/src/generic/gridctrl.cpp
index 23fa38899a644469ba227ef7387849786ffe1981..f16184ecf7292194f7feb1bd961b7890513452fa 100644 (file)
--- a/src/generic/gridctrl.cpp
+++ b/src/generic/gridctrl.cpp
@@ -19,6 +19,11 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#ifndef WX_PRECOMP
+    #include "wx/textctrl.h"
+    #include "wx/dc.h"
+#endif // WX_PRECOMP
+

 #include "wx/generic/gridctrl.h"
 #include "wx/tokenzr.h"
 
 #include "wx/generic/gridctrl.h"
 #include "wx/tokenzr.h"