don't call SelectObject() twice in SetBrush() nor SetFont() neither

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

diff --git a/src/gtk1/utilsres.cpp b/src/gtk1/utilsres.cpp
index 749a722e1de4fdd46bcfdaa71e6bb8e1a36660cf..69c6097176a2b36f26cb6aa70d3ff03a8f24c60f 100644 (file)
--- a/src/gtk1/utilsres.cpp
+++ b/src/gtk1/utilsres.cpp
@@ -7,10 +7,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-//#ifdef __GNUG__
+//#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"
@@ -58,7 +61,7 @@ bool wxWriteResource(const wxString& section, const wxString& entry, int value,
     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");
@@ -72,7 +75,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, char **value,
     {
         if (!result.IsEmpty())
         {
-            char *s = new char[result.Len()+1];
+            wxChar *s = new wxChar[result.Len()+1];
             wxStrcpy( s, result.c_str() );
             *value = s;
             return TRUE;