added an error message if a bitmap can't be addedto the image list

[wxWidgets.git] / src / gtk / dnd.cpp

diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp
index 359d8eaad556f2e35a799fee857874ba65000e57..d34741208940cc1876cf7bb1a65bd1901efe1966 100644 (file)
--- a/src/gtk/dnd.cpp
+++ b/src/gtk/dnd.cpp
@@ -13,7 +13,7 @@
 
 #include "wx/dnd.h"
 
-#ifdef wxUSE_DRAG_AND_DROP
+#if wxUSE_DRAG_AND_DROP
 
 #include "wx/window.h"
 #include "wx/app.h"
@@ -733,8 +733,8 @@ wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
   
   if (!m_data) return (wxDragResult) wxDragNone;
   
-  static GtkWidget *drag_icon = NULL;
-  static GtkWidget *drop_icon = NULL;
+  static GtkWidget *drag_icon = (GtkWidget*) NULL;
+  static GtkWidget *drop_icon = (GtkWidget*) NULL;
 
   GdkPoint hotspot_1 = {0,-5 };
       
@@ -872,7 +872,7 @@ void wxDropSource::UnregisterWindow(void)
 /*
  * Shaped Windows
  */
-static GdkWindow *root_win = NULL;
+static GdkWindow *root_win = (GdkWindow*) NULL;
 
 typedef struct _cursoroffset {gint x,y;} CursorOffset;
 
@@ -895,7 +895,8 @@ shape_pressed (GtkWidget *widget, GdkEventButton *event)
                      (GDK_BUTTON_RELEASE_MASK |
                       GDK_BUTTON_MOTION_MASK |
                       GDK_POINTER_MOTION_HINT_MASK),
-                   NULL, NULL, 0);
+                   (GdkWindow*)NULL, 
+                   (GdkCursor*) NULL, 0);
 }