cleanup - reformatting

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

diff --git a/src/gtk1/utilsres.cpp b/src/gtk1/utilsres.cpp
index cf8a946da7e89b3fc37e71f402ea65a6521cc9f8..45bdc9fec1e2d9cde774758a7ffcc3c1ef0fff53 100644 (file)
--- a/src/gtk1/utilsres.cpp
+++ b/src/gtk1/utilsres.cpp
@@ -7,9 +7,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-//#ifdef __GNUG__
-//#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/utils.h"
 #include "wx/string.h"


@@ -26,11 +25,11 @@ bool wxWriteResource(const wxString& section, const wxString& entry, const wxStr
 {
     wxString filename( file );
     if (filename.IsEmpty()) filename = wxT(".wxWindows");
 {
     wxString filename( file );
     if (filename.IsEmpty()) filename = wxT(".wxWindows");

-    
+

     wxFileConfig conf( wxTheApp->GetAppName(), wxTheApp->GetVendorName(), filename );
     wxFileConfig conf( wxTheApp->GetAppName(), wxTheApp->GetVendorName(), filename );

-    
+

     conf.SetPath( section );
     conf.SetPath( section );

-    
+

     return conf.Write( entry, value );
 }
 
     return conf.Write( entry, value );
 }
 


@@ -58,27 +57,27 @@ bool wxWriteResource(const wxString& section, const wxString& entry, int value,
     return wxWriteResource(section, entry, buf, file);
 }
 
     return wxWriteResource(section, entry, buf, file);
 }
 

-bool wxGetResource(const wxString& section, const wxString& entry, char **value, const wxString& file )
+bool wxGetResource(const wxString& section, const wxString& entry, wxChar **value, const wxString& file )

 {
     wxString filename( file );
     if (filename.IsEmpty()) filename = wxT(".wxWindows");
 {
     wxString filename( file );
     if (filename.IsEmpty()) filename = wxT(".wxWindows");

-    
+

     wxFileConfig conf( wxTheApp->GetAppName(), wxTheApp->GetVendorName(), filename );
     wxFileConfig conf( wxTheApp->GetAppName(), wxTheApp->GetVendorName(), filename );

-    
+

     conf.SetPath( section );
     conf.SetPath( section );

-    
+

     wxString result;
     wxString result;

-    if (conf.Write( entry, &result ))
+    if (conf.Read( entry, &result ))

     {
         if (!result.IsEmpty())
     {
         if (!result.IsEmpty())

-       {
-            char *s = new char[result.Len()+1];
-           wxStrcpy( s, result.c_str() );
-           *value = s;
-           return TRUE;
-       }
+        {
+            wxChar *s = new wxChar[result.Len()+1];
+            wxStrcpy( s, result.c_str() );
+            *value = s;
+            return TRUE;
+        }

     }
     }

-    
+

     return FALSE;
 }
 
     return FALSE;
 }