The usual amount of trash over my telephone fixed

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

diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp
index 180e6ba727a1499df92bcf1b5191f996abe81d14..d34741208940cc1876cf7bb1a65bd1901efe1966 100644 (file)
--- a/src/gtk/dnd.cpp
+++ b/src/gtk/dnd.cpp
@@ -12,12 +12,17 @@
 #endif
 
 #include "wx/dnd.h"
+
+#if wxUSE_DRAG_AND_DROP
+
 #include "wx/window.h"
 #include "wx/app.h"
 #include "wx/gdicmn.h"
 #include "wx/intl.h"
 #include "wx/utils.h"
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
 #include "gdk/gdkprivate.h"
 
 #include <X11/Xlib.h>
@@ -642,10 +647,12 @@ void gtk_drag_callback( GtkWidget *widget, GdkEvent *event, wxDropSource *source
            
            wxString text = text_object->GetText();
            
+           char *s = WXSTRINGCAST text;
+           
             gtk_widget_dnd_data_set( widget, 
                                     event, 
-                                    (unsigned char*) text.c_str, 
-                                    (int) text.Length() );
+                                    (unsigned char*) s, 
+                                    (int) text.Length()+1 );
        
            break;
        }
@@ -656,10 +663,12 @@ void gtk_drag_callback( GtkWidget *widget, GdkEvent *event, wxDropSource *source
            
            wxString text = file_object->GetFiles();
            
+           char *s = WXSTRINGCAST text;
+           
             gtk_widget_dnd_data_set( widget, 
                                     event, 
-                                    (unsigned char*) text.c_str, 
-                                    (int) text.Length() );
+                                    (unsigned char*) s, 
+                                    (int) text.Length()+1 );
        
            break;
        }
@@ -724,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 };
       
@@ -863,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;
 
@@ -886,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);
 }
 
 
@@ -980,9 +990,9 @@ shape_create_icon (char     **data,
   return window;
 }
 
-
-
-
 #endif 
        // NEW_GTK_DND_CODE
        
+#endif
+
+      // wxUSE_DRAG_AND_DROP
\ No newline at end of file