X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..4e15d1caa03346c126015019c1fdf093033ef40b:/src/gtk1/utilsres.cpp

diff --git a/src/gtk1/utilsres.cpp b/src/gtk1/utilsres.cpp
index 65297fd402..f8f41519a6 100644
--- a/src/gtk1/utilsres.cpp
+++ b/src/gtk1/utilsres.cpp
@@ -1,25 +1,25 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        utilres.cpp
+// Name:        src/gtk1/utilsres.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-//#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-//#pragma implementation "utils.h"
-//#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #include "wx/utils.h"
-#include "wx/string.h"
-#include "wx/list.h"
-#include "wx/log.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/list.h"
+    #include "wx/string.h"
+    #include "wx/log.h"
+    #include "wx/app.h"
+#endif
+
 #include "wx/config.h"
-#include "wx/app.h"
 
 //-----------------------------------------------------------------------------
 // resource functions
@@ -28,12 +28,12 @@
 bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file )
 {
     wxString filename( file );
-    if (filename.IsEmpty()) filename = wxT(".wxWidgets");
-    
+    if (filename.empty()) filename = wxT(".wxWindows");
+
     wxFileConfig conf( wxTheApp->GetAppName(), wxTheApp->GetVendorName(), filename );
-    
+
     conf.SetPath( section );
-    
+
     return conf.Write( entry, value );
 }
 
@@ -64,7 +64,7 @@ bool wxWriteResource(const wxString& section, const wxString& entry, int value,
 bool wxGetResource(const wxString& section, const wxString& entry, wxChar **value, const wxString& file )
 {
     wxString filename( file );
-    if (filename.IsEmpty()) filename = wxT(".wxWidgets");
+    if (filename.empty()) filename = wxT(".wxWindows");
 
     wxFileConfig conf( wxTheApp->GetAppName(), wxTheApp->GetVendorName(), filename );
 
@@ -73,16 +73,16 @@ bool wxGetResource(const wxString& section, const wxString& entry, wxChar **valu
     wxString result;
     if (conf.Read( entry, &result ))
     {
-        if (!result.IsEmpty())
+        if (!result.empty())
         {
             wxChar *s = new wxChar[result.Len()+1];
             wxStrcpy( s, result.c_str() );
             *value = s;
-            return TRUE;
+            return true;
         }
     }
 
-    return FALSE;
+    return false;
 }
 
 bool wxGetResource(const wxString& section, const wxString& entry, float *value, const wxString& file )
@@ -91,11 +91,11 @@ bool wxGetResource(const wxString& section, const wxString& entry, float *value,
     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;
+        return true;
     }
-    else return FALSE;
+    else return false;
 }
 
 bool wxGetResource(const wxString& section, const wxString& entry, long *value, const wxString& file )
@@ -104,11 +104,11 @@ bool wxGetResource(const wxString& section, const wxString& entry, long *value,
     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;
+        return true;
     }
-    else return FALSE;
+    else return false;
 }
 
 bool wxGetResource(const wxString& section, const wxString& entry, int *value, const wxString& file )
@@ -117,10 +117,9 @@ bool wxGetResource(const wxString& section, const wxString& entry, int *value, c
     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;
+        return true;
     }
-    else return FALSE;
+    else return false;
 }
-