compilation fixes for Unix - IT DOES NOT WORK YET, DON'T TRY IT

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

diff --git a/src/gtk1/bitmap.cpp b/src/gtk1/bitmap.cpp
index 33b1a1f286d2783345252629c3a2dc7b12c2a70b..8a6ca2ccc71fe4632380ee3121d2ad5351066c17 100644 (file)
--- a/src/gtk1/bitmap.cpp
+++ b/src/gtk1/bitmap.cpp
@@ -16,9 +16,9 @@
 #include "wx/filefn.h"
 #include "wx/image.h"
 
-#include "gdk/gdk.h"
-#include "gdk/gdkprivate.h"
-#include "gdk/gdkx.h"
+#include <gdk/gdk.h>
+#include <gdk/gdkprivate.h>
+#include <gdk/gdkx.h>
 
 //-----------------------------------------------------------------------------
 // wxMask
@@ -33,22 +33,26 @@ wxMask::wxMask()
 
 wxMask::wxMask( const wxBitmap& bitmap, const wxColour& colour )
 {
+    m_bitmap = (GdkBitmap *) NULL;
     Create( bitmap, colour );
 }
 
 wxMask::wxMask( const wxBitmap& bitmap, int paletteIndex )
 {
+    m_bitmap = (GdkBitmap *) NULL;
     Create( bitmap, paletteIndex );
 }
 
 wxMask::wxMask( const wxBitmap& bitmap )
 {
+    m_bitmap = (GdkBitmap *) NULL;
     Create( bitmap );
 }
 
 wxMask::~wxMask()
 {
-    if (m_bitmap) gdk_bitmap_unref( m_bitmap );
+    if (m_bitmap) 
+        gdk_bitmap_unref( m_bitmap );
 }
 
 bool wxMask::Create( const wxBitmap& WXUNUSED(bitmap),