fix gPixmap ref, fix usage of gImage

diff --git a/lib/gdi/gpixmap.cpp b/lib/gdi/gpixmap.cpp
index c089051de29bd1d7644f439387638e51bad08d96..e8ddcf738941b460406dac06854d83add9257d0b 100644 (file)
--- a/lib/gdi/gpixmap.cpp
+++ b/lib/gdi/gpixmap.cpp
@@ -246,7 +246,7 @@ gColor gPalette::findColor(const gRGB &rgb) const
        return best_choice;
 }
 
-gPixmap::gPixmap()
+gPixmap::gPixmap(): ref(0)
 {
 }
 

diff --git a/lib/gui/eskin.cpp b/lib/gui/eskin.cpp
index 6cb98abded749cd21e8518d14a6da9bdf2d16ea7..612a80ee304db007418e4c0a470269e7bd80a4b1 100644 (file)
--- a/lib/gui/eskin.cpp
+++ b/lib/gui/eskin.cpp
@@ -493,9 +493,6 @@ eSkin::~eSkin()
 
        for (std::map<eString, ePtr<gPixmap> >::iterator it(images.begin()); it != images.end(); it++)
                delete it->second;      
-
-       if (paldummy)
-               delete paldummy;
 }
 
 int eSkin::load(const char *filename)

diff --git a/lib/gui/eskin.h b/lib/gui/eskin.h
index 0a6bd352367e1ce0c6850a74d0b0699f3db6bb39..d28655af40c51b6a7841838daaefdd5bfae36c5c 100644 (file)
--- a/lib/gui/eskin.h
+++ b/lib/gui/eskin.h
@@ -40,7 +40,7 @@ class eSkin
        
        gRGB *palette;
        int maxcolors;
-       gImage *paldummy;
+       ePtr<gImage> paldummy;
        int *colorused;
        
        static std::map< eString, tWidgetCreator > widget_creator;