fixed handling of dst offset in wxAlphaBlend()

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

diff --git a/src/gtk1/utilsres.cpp b/src/gtk1/utilsres.cpp
index 749a722e1de4fdd46bcfdaa71e6bb8e1a36660cf..4f114cd2eb671e628b20be4eb4af83dfc075d1f3 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"


@@ -58,7 +57,7 @@ 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");


@@ -72,7 +71,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, char **value,
     {
         if (!result.IsEmpty())
         {
     {
         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;
             wxStrcpy( s, result.c_str() );
             *value = s;
             return TRUE;