I had to remove (Robin's) makefile creation clause

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

diff --git a/src/gtk1/dnd.cpp b/src/gtk1/dnd.cpp
index 5ca90425dacbd0ed92baad78b4031d1887b107e6..289765439da659237a3cdcdae28045470e02b9db 100644 (file)
--- a/src/gtk1/dnd.cpp
+++ b/src/gtk1/dnd.cpp
@@ -337,17 +337,17 @@ void wxDropTarget::OnLeave()
 {
 }
 
 {
 }
 

-bool wxDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) )
+bool wxDropTarget::OnMove( long WXUNUSED(x), long WXUNUSED(y) )

 {
     return TRUE;
 }
 
 {
     return TRUE;
 }
 

-bool wxDropTarget::OnDrop( int WXUNUSED(x), int WXUNUSED(y) )
+bool wxDropTarget::OnDrop( long WXUNUSED(x), long WXUNUSED(y) )

 {
     return FALSE;
 }
 
 {
     return FALSE;
 }
 

-bool wxDropTarget::OnData( int WXUNUSED(x), int WXUNUSED(y) )
+bool wxDropTarget::OnData( long WXUNUSED(x), long WXUNUSED(y) )

 {
     return FALSE;
 }
 {
     return FALSE;
 }


@@ -472,12 +472,12 @@ void wxDropTarget::RegisterWidget( GtkWidget *widget )
 // wxTextDropTarget
 //-------------------------------------------------------------------------
 
 // wxTextDropTarget
 //-------------------------------------------------------------------------
 

-bool wxTextDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) )
+bool wxTextDropTarget::OnMove( long WXUNUSED(x), long WXUNUSED(y) )

 {
     return IsSupported( wxDF_TEXT );
 }
 
 {
     return IsSupported( wxDF_TEXT );
 }
 

-bool wxTextDropTarget::OnDrop( int WXUNUSED(x), int WXUNUSED(y) )
+bool wxTextDropTarget::OnDrop( long WXUNUSED(x), long WXUNUSED(y) )

 {
     if (IsSupported( wxDF_TEXT ))
     {
 {
     if (IsSupported( wxDF_TEXT ))
     {


@@ -488,7 +488,7 @@ bool wxTextDropTarget::OnDrop( int WXUNUSED(x), int WXUNUSED(y) )
     return FALSE;
 }
 
     return FALSE;
 }
 

-bool wxTextDropTarget::OnData( int x, int y )
+bool wxTextDropTarget::OnData( long x, long y )

 {
     wxTextDataObject data;
     if (!GetData( &data )) return FALSE;
 {
     wxTextDataObject data;
     if (!GetData( &data )) return FALSE;


@@ -512,12 +512,12 @@ wxPrivateDropTarget::wxPrivateDropTarget( const wxString &id )
     m_id = id;
 }
 
     m_id = id;
 }
 

-bool wxPrivateDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) )
+bool wxPrivateDropTarget::OnMove( long WXUNUSED(x), long WXUNUSED(y) )

 {
     return IsSupported( m_id );
 }
 
 {
     return IsSupported( m_id );
 }
 

-bool wxPrivateDropTarget::OnDrop( int WXUNUSED(x), int WXUNUSED(y) )
+bool wxPrivateDropTarget::OnDrop( long WXUNUSED(x), long WXUNUSED(y) )

 {
     if (!IsSupported( m_id ))
     {
 {
     if (!IsSupported( m_id ))
     {


@@ -528,7 +528,7 @@ bool wxPrivateDropTarget::OnDrop( int WXUNUSED(x), int WXUNUSED(y) )
     return FALSE;
 }
 
     return FALSE;
 }
 

-bool wxPrivateDropTarget::OnData( int x, int y )
+bool wxPrivateDropTarget::OnData( long x, long y )

 {
     if (!IsSupported( m_id )) return FALSE;
 
 {
     if (!IsSupported( m_id )) return FALSE;
 


@@ -544,12 +544,12 @@ bool wxPrivateDropTarget::OnData( int x, int y )
 // A drop target which accepts files (dragged from File Manager or Explorer)
 //----------------------------------------------------------------------------
 
 // A drop target which accepts files (dragged from File Manager or Explorer)
 //----------------------------------------------------------------------------
 

-bool wxFileDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) )
+bool wxFileDropTarget::OnMove( long WXUNUSED(x), long WXUNUSED(y) )

 {
     return IsSupported( wxDF_FILENAME );
 }
 
 {
     return IsSupported( wxDF_FILENAME );
 }
 

-bool wxFileDropTarget::OnDrop( int x, int y )
+bool wxFileDropTarget::OnDrop( long x, long y )

 {
     if (IsSupported( wxDF_FILENAME ))
     {
 {
     if (IsSupported( wxDF_FILENAME ))
     {


@@ -560,7 +560,7 @@ bool wxFileDropTarget::OnDrop( int x, int y )
     return FALSE;
 }
 
     return FALSE;
 }
 

-bool wxFileDropTarget::OnData( int x, int y )
+bool wxFileDropTarget::OnData( long x, long y )

 {
     wxFileDataObject data;
     if (!GetData( &data )) return FALSE;
 {
     wxFileDataObject data;
     if (!GetData( &data )) return FALSE;


@@ -702,8 +702,8 @@ wxDropSource::wxDropSource( wxWindow *win, const wxIcon &go, const wxIcon &stop
     m_waiting = TRUE;
 
     m_window = win;
     m_waiting = TRUE;
 
     m_window = win;

-    m_widget = win->GetWidget();
-    if (win->GetWxWindow()) m_widget = win->GetWxWindow();
+    m_widget = win->m_widget;
+    if (win->m_wxwindow) m_widget = win->m_wxwindow;

 
     m_data = (wxDataBroker*) NULL;
     m_retValue = wxDragCancel;
 
     m_data = (wxDataBroker*) NULL;
     m_retValue = wxDragCancel;


@@ -722,8 +722,8 @@ wxDropSource::wxDropSource( wxDataObject *data, wxWindow *win, const wxIcon &go,
     m_waiting = TRUE;
 
     m_window = win;
     m_waiting = TRUE;
 
     m_window = win;

-    m_widget = win->GetWidget();
-    if (win->GetWxWindow()) m_widget = win->GetWxWindow();
+    m_widget = win->m_widget;
+    if (win->m_wxwindow) m_widget = win->m_wxwindow;

     m_retValue = wxDragCancel;
 
     if (data)
     m_retValue = wxDragCancel;
 
     if (data)


@@ -748,8 +748,8 @@ wxDropSource::wxDropSource( wxDataObject *data, wxWindow *win, const wxIcon &go,
 wxDropSource::wxDropSource( wxDataBroker *data, wxWindow *win )
 {
     m_window = win;
 wxDropSource::wxDropSource( wxDataBroker *data, wxWindow *win )
 {
     m_window = win;

-    m_widget = win->GetWidget();
-    if (win->GetWxWindow()) m_widget = win->GetWxWindow();
+    m_widget = win->m_widget;
+    if (win->m_wxwindow) m_widget = win->m_wxwindow;

     m_retValue = wxDragCancel;
 
     m_data = data;
     m_retValue = wxDragCancel;
 
     m_data = data;