OpenGl works now under GTK

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

diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp
index 12d4124a6a9cfbccab2a5929e9ae9537bb2c0497..d34741208940cc1876cf7bb1a65bd1901efe1966 100644 (file)
--- a/src/gtk/dnd.cpp
+++ b/src/gtk/dnd.cpp
@@ -12,6 +12,9 @@
 #endif
 
 #include "wx/dnd.h"
 #endif
 
 #include "wx/dnd.h"

+
+#if wxUSE_DRAG_AND_DROP
+

 #include "wx/window.h"
 #include "wx/app.h"
 #include "wx/gdicmn.h"
 #include "wx/window.h"
 #include "wx/app.h"
 #include "wx/gdicmn.h"


@@ -730,8 +733,8 @@ wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
   
   if (!m_data) return (wxDragResult) wxDragNone;
   
   
   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 };
       
 
   GdkPoint hotspot_1 = {0,-5 };
       


@@ -869,7 +872,7 @@ void wxDropSource::UnregisterWindow(void)
 /*
  * Shaped Windows
  */
 /*
  * Shaped Windows
  */

-static GdkWindow *root_win = NULL;
+static GdkWindow *root_win = (GdkWindow*) NULL;

 
 typedef struct _cursoroffset {gint x,y;} CursorOffset;
 
 
 typedef struct _cursoroffset {gint x,y;} CursorOffset;
 


@@ -892,7 +895,8 @@ shape_pressed (GtkWidget *widget, GdkEventButton *event)
                      (GDK_BUTTON_RELEASE_MASK |
                       GDK_BUTTON_MOTION_MASK |
                       GDK_POINTER_MOTION_HINT_MASK),
                      (GDK_BUTTON_RELEASE_MASK |
                       GDK_BUTTON_MOTION_MASK |
                       GDK_POINTER_MOTION_HINT_MASK),

-                   NULL, NULL, 0);
+                   (GdkWindow*)NULL, 
+                   (GdkCursor*) NULL, 0);

 }
 
 
 }
 
 


@@ -986,9 +990,9 @@ shape_create_icon (char     **data,
   return window;
 }
 
   return window;
 }
 

-
-
-

 #endif 
        // NEW_GTK_DND_CODE
        
 #endif 
        // NEW_GTK_DND_CODE
        

+#endif
+
+      // wxUSE_DRAG_AND_DROP
\ No newline at end of file