fix wxGTK1 compilation after wxTextEntry DoGetValue() change

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

diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp
index 2c54f0805d376a51b24b3ca900e63924cd20af6b..dd9fe2745c15e9524be8bfe5f4c1596ac23db3bd 100644 (file)
--- a/src/gtk/dnd.cpp
+++ b/src/gtk/dnd.cpp
@@ -166,7 +166,7 @@ static void target_drag_leave( GtkWidget *WXUNUSED(widget),
 {
     /* inform the wxDropTarget about the current GdkDragContext.
        this is only valid for the duration of this call */
 {
     /* inform the wxDropTarget about the current GdkDragContext.
        this is only valid for the duration of this call */

-    drop_target->SetDragContext( context );
+    drop_target->GtkSetDragContext( context );

 
     /* we don't need return values. this event is just for
        information */
 
     /* we don't need return values. this event is just for
        information */


@@ -176,7 +176,7 @@ static void target_drag_leave( GtkWidget *WXUNUSED(widget),
     drop_target->m_firstMotion = true;
 
     /* after this, invalidate the drop_target's GdkDragContext */
     drop_target->m_firstMotion = true;
 
     /* after this, invalidate the drop_target's GdkDragContext */

-    drop_target->SetDragContext( (GdkDragContext*) NULL );
+    drop_target->GtkSetDragContext( NULL );

 }
 }
 
 }
 }
 


@@ -208,7 +208,7 @@ static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget),
 
     /* inform the wxDropTarget about the current GdkDragContext.
        this is only valid for the duration of this call */
 
     /* inform the wxDropTarget about the current GdkDragContext.
        this is only valid for the duration of this call */

-    drop_target->SetDragContext( context );
+    drop_target->GtkSetDragContext( context );

 
     // GTK+ always supposes that we want to copy the data by default while we
     // might want to move it, so examine not only suggested_action - which is
 
     // GTK+ always supposes that we want to copy the data by default while we
     // might want to move it, so examine not only suggested_action - which is


@@ -278,7 +278,7 @@ static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget),
     }
 
     /* after this, invalidate the drop_target's GdkDragContext */
     }
 
     /* after this, invalidate the drop_target's GdkDragContext */

-    drop_target->SetDragContext( (GdkDragContext*) NULL );
+    drop_target->GtkSetDragContext( NULL );

 
     /* this has to be done because GDK has no "drag_enter" event */
     drop_target->m_firstMotion = false;
 
     /* this has to be done because GDK has no "drag_enter" event */
     drop_target->m_firstMotion = false;


@@ -310,15 +310,15 @@ static gboolean target_drag_drop( GtkWidget *widget,
 
     /* inform the wxDropTarget about the current GdkDragContext.
        this is only valid for the duration of this call */
 
     /* inform the wxDropTarget about the current GdkDragContext.
        this is only valid for the duration of this call */

-    drop_target->SetDragContext( context );
+    drop_target->GtkSetDragContext( context );

 
     /* inform the wxDropTarget about the current drag widget.
        this is only valid for the duration of this call */
 
     /* inform the wxDropTarget about the current drag widget.
        this is only valid for the duration of this call */

-    drop_target->SetDragWidget( widget );
+    drop_target->GtkSetDragWidget( widget );

 
     /* inform the wxDropTarget about the current drag time.
        this is only valid for the duration of this call */
 
     /* inform the wxDropTarget about the current drag time.
        this is only valid for the duration of this call */

-    drop_target->SetDragTime( time );
+    drop_target->GtkSetDragTime( time );

 
 /*
     wxDragResult result = wxDragMove;
 
 /*
     wxDragResult result = wxDragMove;


@@ -354,7 +354,7 @@ static gboolean target_drag_drop( GtkWidget *widget,
         /* disable GUI threads */
 #endif
 
         /* disable GUI threads */
 #endif
 

-        GdkAtom format = drop_target->GetMatchingPair();
+        GdkAtom format = drop_target->GtkGetMatchingPair();

 
         // this does happen somehow, see bug 555111
         wxCHECK_MSG( format, FALSE, _T("no matching GdkAtom for format?") );
 
         // this does happen somehow, see bug 555111
         wxCHECK_MSG( format, FALSE, _T("no matching GdkAtom for format?") );


@@ -376,10 +376,10 @@ static gboolean target_drag_drop( GtkWidget *widget,
     }
 
     /* after this, invalidate the drop_target's GdkDragContext */
     }
 
     /* after this, invalidate the drop_target's GdkDragContext */

-    drop_target->SetDragContext( (GdkDragContext*) NULL );
+    drop_target->GtkSetDragContext( NULL );

 
     /* after this, invalidate the drop_target's drag widget */
 
     /* after this, invalidate the drop_target's drag widget */

-    drop_target->SetDragWidget( (GtkWidget*) NULL );
+    drop_target->GtkSetDragWidget( NULL );

 
     /* this has to be done because GDK has no "drag_enter" event */
     drop_target->m_firstMotion = true;
 
     /* this has to be done because GDK has no "drag_enter" event */
     drop_target->m_firstMotion = true;


@@ -420,7 +420,7 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget),
 
     /* inform the wxDropTarget about the current GtkSelectionData.
        this is only valid for the duration of this call */
 
     /* inform the wxDropTarget about the current GtkSelectionData.
        this is only valid for the duration of this call */

-    drop_target->SetDragData( data );
+    drop_target->GtkSetDragData( data );

 
     wxDragResult result = ConvertFromGTK(context->action);
 
 
     wxDragResult result = ConvertFromGTK(context->action);
 


@@ -444,7 +444,7 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget),
     }
 
     /* after this, invalidate the drop_target's drag data */
     }
 
     /* after this, invalidate the drop_target's drag data */

-    drop_target->SetDragData( (GtkSelectionData*) NULL );
+    drop_target->GtkSetDragData( NULL );

 }
 }
 
 }
 }
 


@@ -456,9 +456,9 @@ wxDropTarget::wxDropTarget( wxDataObject *data )
             : wxDropTargetBase( data )
 {
     m_firstMotion = true;
             : wxDropTargetBase( data )
 {
     m_firstMotion = true;

-    m_dragContext = (GdkDragContext*) NULL;
-    m_dragWidget = (GtkWidget*) NULL;
-    m_dragData = (GtkSelectionData*) NULL;
+    m_dragContext = NULL;
+    m_dragWidget = NULL;
+    m_dragData = NULL;

     m_dragTime = 0;
 }
 
     m_dragTime = 0;
 }
 


@@ -474,7 +474,7 @@ wxDragResult wxDropTarget::OnDragOver( wxCoord WXUNUSED(x),
     wxLogNull noLog;
 #endif // Debug
 
     wxLogNull noLog;
 #endif // Debug
 

-    return (GetMatchingPair() != (GdkAtom) 0) ? def : wxDragNone;
+    return (GtkGetMatchingPair() != (GdkAtom) 0) ? def : wxDragNone;

 }
 
 bool wxDropTarget::OnDrop( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y) )
 }
 
 bool wxDropTarget::OnDrop( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y) )


@@ -482,7 +482,7 @@ bool wxDropTarget::OnDrop( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y) )
     if (!m_dataObject)
         return false;
 
     if (!m_dataObject)
         return false;
 

-    return (GetMatchingPair() != (GdkAtom) 0);
+    return (GtkGetMatchingPair() != (GdkAtom) 0);

 }
 
 wxDragResult wxDropTarget::OnData( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
 }
 
 wxDragResult wxDropTarget::OnData( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),


@@ -491,13 +491,19 @@ wxDragResult wxDropTarget::OnData( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
     if (!m_dataObject)
         return wxDragNone;
 
     if (!m_dataObject)
         return wxDragNone;
 

-    if (GetMatchingPair() == (GdkAtom) 0)
+    if (GtkGetMatchingPair() == (GdkAtom) 0)

         return wxDragNone;
 
     return GetData() ? def : wxDragNone;
 }
 
         return wxDragNone;
 
     return GetData() ? def : wxDragNone;
 }
 

-GdkAtom wxDropTarget::GetMatchingPair()
+
+wxDataFormat wxDropTarget::GetMatchingPair()
+{
+    return wxDataFormat( GtkGetMatchingPair() );
+}
+
+GdkAtom wxDropTarget::GtkGetMatchingPair()

 {
     if (!m_dataObject)
         return (GdkAtom) 0;
 {
     if (!m_dataObject)
         return (GdkAtom) 0;


@@ -543,7 +549,7 @@ bool wxDropTarget::GetData()
     return true;
 }
 
     return true;
 }
 

-void wxDropTarget::UnregisterWidget( GtkWidget *widget )
+void wxDropTarget::GtkUnregisterWidget( GtkWidget *widget )

 {
     wxCHECK_RET( widget != NULL, wxT("unregister widget is NULL") );
 
 {
     wxCHECK_RET( widget != NULL, wxT("unregister widget is NULL") );
 


@@ -559,7 +565,7 @@ void wxDropTarget::UnregisterWidget( GtkWidget *widget )
                                           (gpointer) target_drag_data_received, this);
 }
 
                                           (gpointer) target_drag_data_received, this);
 }
 

-void wxDropTarget::RegisterWidget( GtkWidget *widget )
+void wxDropTarget::GtkRegisterWidget( GtkWidget *widget )

 {
     wxCHECK_RET( widget != NULL, wxT("register widget is NULL") );
 
 {
     wxCHECK_RET( widget != NULL, wxT("register widget is NULL") );
 


@@ -575,7 +581,7 @@ void wxDropTarget::RegisterWidget( GtkWidget *widget )
 
     gtk_drag_dest_set( widget,
                        (GtkDestDefaults) 0,         /* no default behaviour */
 
     gtk_drag_dest_set( widget,
                        (GtkDestDefaults) 0,         /* no default behaviour */

-                       (GtkTargetEntry*) NULL,      /* we don't supply any formats here */
+                       NULL,      /* we don't supply any formats here */

                        0,                           /* number of targets = 0 */
                        (GdkDragAction) 0 );         /* we don't supply any actions here */
 
                        0,                           /* number of targets = 0 */
                        (GdkDragAction) 0 );         /* we don't supply any actions here */
 


@@ -710,7 +716,7 @@ wxDropSource::wxDropSource(wxWindow *win,
 {
     m_waiting = true;
 
 {
     m_waiting = true;
 

-    m_iconWindow = (GtkWidget*) NULL;
+    m_iconWindow = NULL;

 
     m_window = win;
     m_widget = win->m_widget;
 
     m_window = win;
     m_widget = win->m_widget;


@@ -731,7 +737,7 @@ wxDropSource::wxDropSource(wxDataObject& data,
 
     SetData( data );
 
 
     SetData( data );
 

-    m_iconWindow = (GtkWidget*) NULL;
+    m_iconWindow = NULL;

 
     m_window = win;
     m_widget = win->m_widget;
 
     m_window = win;
     m_widget = win->m_widget;


@@ -777,7 +783,7 @@ void wxDropSource::PrepareIcon( int action, GdkDragContext *context )
     if ( icon->GetMask() )
         mask = icon->GetMask()->GetBitmap();
     else
     if ( icon->GetMask() )
         mask = icon->GetMask()->GetBitmap();
     else

-        mask = (GdkBitmap *)NULL;
+        mask = NULL;

 
     GdkPixmap *pixmap = icon->GetPixmap();
 
 
     GdkPixmap *pixmap = icon->GetPixmap();
 


@@ -829,7 +835,7 @@ wxDragResult wxDropSource::DoDragDrop(int flags)
 
     m_waiting = true;
 
 
     m_waiting = true;
 

-    GtkTargetList *target_list = gtk_target_list_new( (GtkTargetEntry*) NULL, 0 );
+    GtkTargetList *target_list = gtk_target_list_new( NULL, 0 );

 
     wxDataFormat *array = new wxDataFormat[ m_data->GetFormatCount() ];
     m_data->GetAllFormats( array );
 
     wxDataFormat *array = new wxDataFormat[ m_data->GetFormatCount() ];
     m_data->GetAllFormats( array );