-DGTK_DISABLE_SINGLE_INCLUDES

[xonotic/netradiant.git] / libs / gtkutil / image.cpp

diff --git a/libs/gtkutil/image.cpp b/libs/gtkutil/image.cpp
index 4605d3f5f9ad79548bb8315c533c0a6c7ee27e3a..4b91bd258a24798d2f99bec3875e00df3cb3fc7a 100644 (file)
--- a/libs/gtkutil/image.cpp
+++ b/libs/gtkutil/image.cpp
@@ -21,8 +21,7 @@
 
 #include "image.h"
 
-#include <gtk/gtkimage.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 
 #include "string/string.h"
 #include "stream/stringstream.h"
@@ -31,7 +30,7 @@
 
 namespace
 {
-CopiedString g_bitmapsPath;
+std::string g_bitmapsPath;
 }
 
 void BitmapsPath_set( const char* path ){
@@ -45,7 +44,7 @@ GdkPixbuf* pixbuf_new_from_file_with_mask( const char* filename ){
        }
        else
        {
-               GdkPixbuf* rgba = gdk_pixbuf_add_alpha( rgb, TRUE, 255, 0, 255 );
+               GdkPixbuf* rgba = gdk_pixbuf_add_alpha( rgb, FALSE, 255, 0, 255 );
                gdk_pixbuf_unref( rgb );
                return rgba;
        }