X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/13b22a673807f68da1dffbb8c56614d3f07124f4..2cfcf22d47b7d9cf3c85edfe498c5f23a18a9a19:/src/gtk1/dnd.cpp

diff --git a/src/gtk1/dnd.cpp b/src/gtk1/dnd.cpp
index dcb0b56c32..1157eef82d 100644
--- a/src/gtk1/dnd.cpp
+++ b/src/gtk1/dnd.cpp
@@ -7,17 +7,13 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "dnd.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #include "wx/dnd.h"
 #include "wx/log.h"
-									       
-									        
+
+
 #if wxUSE_DRAG_AND_DROP
 
 #include "wx/window.h"
@@ -188,7 +184,7 @@ static void target_drag_leave( GtkWidget *WXUNUSED(widget),
     drop_target->OnLeave();
 
     /* this has to be done because GDK has no "drag_enter" event */
-    drop_target->m_firstMotion = TRUE;
+    drop_target->m_firstMotion = true;
 
     /* after this, invalidate the drop_target's GdkDragContext */
     drop_target->SetDragContext( (GdkDragContext*) NULL );
@@ -287,7 +283,7 @@ static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget),
     drop_target->SetDragContext( (GdkDragContext*) NULL );
 
     /* this has to be done because GDK has no "drag_enter" event */
-    drop_target->m_firstMotion = FALSE;
+    drop_target->m_firstMotion = false;
 
     return ret;
 }
@@ -338,7 +334,7 @@ static gboolean target_drag_drop( GtkWidget *widget,
     /* reset the block here as someone might very well
        show a dialog as a reaction to a drop and this
        wouldn't work without events */
-    g_blockEventsOnDrag = FALSE;
+    g_blockEventsOnDrag = false;
 
     bool ret = drop_target->OnDrop( x, y );
 
@@ -388,7 +384,7 @@ static gboolean target_drag_drop( GtkWidget *widget,
     drop_target->SetDragWidget( (GtkWidget*) NULL );
 
     /* this has to be done because GDK has no "drag_enter" event */
-    drop_target->m_firstMotion = TRUE;
+    drop_target->m_firstMotion = true;
 
     return ret;
 }
@@ -457,7 +453,7 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget),
 wxDropTarget::wxDropTarget( wxDataObject *data )
             : wxDropTargetBase( data )
 {
-    m_firstMotion = TRUE;
+    m_firstMotion = true;
     m_dragContext = (GdkDragContext*) NULL;
     m_dragWidget = (GtkWidget*) NULL;
     m_dragData = (GtkSelectionData*) NULL;
@@ -482,7 +478,7 @@ wxDragResult wxDropTarget::OnDragOver( wxCoord WXUNUSED(x),
 bool wxDropTarget::OnDrop( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y) )
 {
     if (!m_dataObject)
-        return FALSE;
+        return false;
 
     return (GetMatchingPair() != (GdkAtom) 0);
 }
@@ -510,7 +506,12 @@ GdkAtom wxDropTarget::GetMatchingPair()
     GList *child = m_dragContext->targets;
     while (child)
     {
-        GdkAtom formatAtom = (GdkAtom) GPOINTER_TO_INT(child->data);
+        // in GTK+ 1.x GdkAtom was a gulong, but now it's a pointer
+        GdkAtom formatAtom = (GdkAtom)
+#ifndef __WXGTK20__
+                             GPOINTER_TO_INT
+#endif
+                             (child->data);
         wxDataFormat format( formatAtom );
 
 #ifdef __WXDEBUG__
@@ -530,19 +531,19 @@ GdkAtom wxDropTarget::GetMatchingPair()
 bool wxDropTarget::GetData()
 {
     if (!m_dragData)
-        return FALSE;
+        return false;
 
     if (!m_dataObject)
-        return FALSE;
+        return false;
 
     wxDataFormat dragFormat( m_dragData->target );
 
     if (!m_dataObject->IsSupportedFormat( dragFormat ))
-        return FALSE;
+        return false;
 
     m_dataObject->SetData( dragFormat, (size_t)m_dragData->length, (const void*)m_dragData->data );
 
-    return TRUE;
+    return true;
 }
 
 void wxDropTarget::UnregisterWidget( GtkWidget *widget )
@@ -655,11 +656,11 @@ source_drag_data_get  (GtkWidget          *WXUNUSED(widget),
     /* disable GUI threads */
 #endif
 
-                gtk_selection_data_set( selection_data,
-                                        selection_data->target,
-                                        8,   // 8-bit
-                                        d,
-                                        size );
+    gtk_selection_data_set( selection_data,
+                            selection_data->target,
+                            8,   // 8-bit
+                            d,
+                            size );
 
 #if wxUSE_THREADS
     /* enable GUI threads */
@@ -714,7 +715,7 @@ static void source_drag_end( GtkWidget          *WXUNUSED(widget),
 
     // printf( "Drag source: drag_end.\n" );
 
-    drop_source->m_waiting = FALSE;
+    drop_source->m_waiting = false;
 }
 }
 
@@ -744,7 +745,7 @@ wxDropSource::wxDropSource(wxWindow *win,
                            const wxIcon &iconMove,
                            const wxIcon &iconNone)
 {
-    m_waiting = TRUE;
+    m_waiting = true;
 
     m_iconWindow = (GtkWidget*) NULL;
 
@@ -763,7 +764,7 @@ wxDropSource::wxDropSource(wxDataObject& data,
                            const wxIcon &iconMove,
                            const wxIcon &iconNone)
 {
-    m_waiting = TRUE;
+    m_waiting = true;
 
     SetData( data );
 
@@ -859,11 +860,11 @@ wxDragResult wxDropSource::DoDragDrop(int flags)
         return wxDragNone;
 
     // disabled for now
-    g_blockEventsOnDrag = TRUE;
+    g_blockEventsOnDrag = true;
 
     RegisterWindow();
 
-    m_waiting = TRUE;
+    m_waiting = true;
 
     GtkTargetList *target_list = gtk_target_list_new( (GtkTargetEntry*) NULL, 0 );
 
@@ -933,7 +934,7 @@ wxDragResult wxDropSource::DoDragDrop(int flags)
     /* re-enable GUI threads */
 #endif
 
-    g_blockEventsOnDrag = FALSE;
+    g_blockEventsOnDrag = false;
 
     UnregisterWindow();