removed no longer used src/iodbc directory

[wxWidgets.git] / src / gtk1 / utilsres.cpp

diff --git a/src/gtk1/utilsres.cpp b/src/gtk1/utilsres.cpp
index b04e3af62e5f5d63279f983328f6b3022f1e1626..f8f41519a63d88f18d142e343f276b17dd4527af 100644 (file)
--- a/src/gtk1/utilsres.cpp
+++ b/src/gtk1/utilsres.cpp
@@ -16,10 +16,10 @@
     #include "wx/list.h"
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/list.h"
     #include "wx/string.h"
     #include "wx/log.h"

+    #include "wx/app.h"

 #endif
 
 #include "wx/config.h"
 #endif
 
 #include "wx/config.h"

-#include "wx/app.h"

 
 //-----------------------------------------------------------------------------
 // resource functions
 
 //-----------------------------------------------------------------------------
 // resource functions


@@ -91,7 +91,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, float *value,
     bool succ = wxGetResource(section, entry, (wxChar **)&s, file);
     if (succ)
     {
     bool succ = wxGetResource(section, entry, (wxChar **)&s, file);
     if (succ)
     {

-        *value = (float)wxStrtod(s, NULL);
+        *value = (float)wxStrtod(s, (wchar_t **) NULL);

         delete[] s;
         return true;
     }
         delete[] s;
         return true;
     }


@@ -104,7 +104,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, long *value,
     bool succ = wxGetResource(section, entry, (wxChar **)&s, file);
     if (succ)
     {
     bool succ = wxGetResource(section, entry, (wxChar **)&s, file);
     if (succ)
     {

-        *value = wxStrtol(s, NULL, 10);
+        *value = wxStrtol(s, (wchar_t **) NULL, 10);

         delete[] s;
         return true;
     }
         delete[] s;
         return true;
     }


@@ -117,7 +117,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, int *value, c
     bool succ = wxGetResource(section, entry, (wxChar **)&s, file);
     if (succ)
     {
     bool succ = wxGetResource(section, entry, (wxChar **)&s, file);
     if (succ)
     {

-        *value = (int)wxStrtol(s, NULL, 10);
+        *value = (int)wxStrtol(s, (wchar_t **) NULL, 10);

         delete[] s;
         return true;
     }
         delete[] s;
         return true;
     }