#ifdef Carbon-specific code to get stubbed DND support compiling for OS X Cocoa.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55847 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/osx/cocoa/chkconf.h b/include/wx/osx/cocoa/chkconf.h
index 3bc180fade186507c4de5e7b5891bf4f4ef2952a..7ef3ca689eef028510f41a93971cb1a193062b78 100644 (file)
--- a/include/wx/osx/cocoa/chkconf.h
+++ b/include/wx/osx/cocoa/chkconf.h
@@ -44,11 +44,6 @@
  * turning off capabilities that don't work under cocoa yet
  */
 
  * turning off capabilities that don't work under cocoa yet
  */
 

-#if wxUSE_DRAG_AND_DROP
-#undef wxUSE_DRAG_AND_DROP
-#define wxUSE_DRAG_AND_DROP 0
-#endif
-

 #if wxUSE_DATAVIEWCTRL
 #undef wxUSE_DATAVIEWCTRL
 #define wxUSE_DATAVIEWCTRL 0
 #if wxUSE_DATAVIEWCTRL
 #undef wxUSE_DATAVIEWCTRL
 #define wxUSE_DATAVIEWCTRL 0

diff --git a/src/osx/carbon/dnd.cpp b/src/osx/carbon/dnd.cpp
index 7982c1357b7efe97b9547502347ad628f8db3aad..172b99a437fdab905440699a868a5d02db4a7cd5 100644 (file)
--- a/src/osx/carbon/dnd.cpp
+++ b/src/osx/carbon/dnd.cpp
@@ -107,6 +107,7 @@ bool wxDropTarget::CurrentDragHasSupportedFormat()
         }
     }
 
         }
     }
 

+#if wxOSX_USE_CARBON

     if ( !supported )
     {
         PasteboardRef   pasteboard;
     if ( !supported )
     {
         PasteboardRef   pasteboard;


@@ -116,6 +117,7 @@ bool wxDropTarget::CurrentDragHasSupportedFormat()
             supported = m_dataObject->HasDataInPasteboard( pasteboard );
         }
     }
             supported = m_dataObject->HasDataInPasteboard( pasteboard );
         }
     }

+#endif

 
     return supported;
 }
 
     return supported;
 }


@@ -164,6 +166,7 @@ bool wxDropTarget::GetData()
         }
     }
 
         }
     }
 

+#if wxOSX_USE_CARBON

     if ( !transferred )
     {
         PasteboardRef   pasteboard;
     if ( !transferred )
     {
         PasteboardRef   pasteboard;


@@ -173,6 +176,7 @@ bool wxDropTarget::GetData()
             transferred = m_dataObject->GetFromPasteboard( pasteboard );
         }
     }
             transferred = m_dataObject->GetFromPasteboard( pasteboard );
         }
     }

+#endif

 
     return transferred;
 }
 
     return transferred;
 }


@@ -231,6 +235,7 @@ wxDragResult wxDropSource::DoDragDrop(int flags)
     if ((m_data == NULL) || (m_data->GetFormatCount() == 0))
         return (wxDragResult)wxDragNone;
 
     if ((m_data == NULL) || (m_data->GetFormatCount() == 0))
         return (wxDragResult)wxDragNone;
 

+#if wxOSX_USE_CARBON

     DragReference theDrag;
     RgnHandle dragRegion;
     OSStatus err = noErr;
     DragReference theDrag;
     RgnHandle dragRegion;
     OSStatus err = noErr;


@@ -305,6 +310,7 @@ wxDragResult wxDropSource::DoDragDrop(int flags)
     DisposeDrag( theDrag );
     CFRelease( pasteboard );
     gTrackingGlobals.m_currentSource = NULL;
     DisposeDrag( theDrag );
     CFRelease( pasteboard );
     gTrackingGlobals.m_currentSource = NULL;

+#endif

 
     return gTrackingGlobals.m_result;
 }
 
     return gTrackingGlobals.m_result;
 }


@@ -325,15 +331,18 @@ bool gTrackingGlobalsInstalled = false;
 // passing the globals via refcon is not needed by the CFM and later architectures anymore
 // but I'll leave it in there, just in case...
 
 // passing the globals via refcon is not needed by the CFM and later architectures anymore
 // but I'll leave it in there, just in case...
 

+#if wxOSX_USE_CARBON

 pascal OSErr wxMacWindowDragTrackingHandler(
     DragTrackingMessage theMessage, WindowPtr theWindow,
     void *handlerRefCon, DragReference theDrag );
 pascal OSErr wxMacWindowDragReceiveHandler(
     WindowPtr theWindow, void *handlerRefCon,
     DragReference theDrag );
 pascal OSErr wxMacWindowDragTrackingHandler(
     DragTrackingMessage theMessage, WindowPtr theWindow,
     void *handlerRefCon, DragReference theDrag );
 pascal OSErr wxMacWindowDragReceiveHandler(
     WindowPtr theWindow, void *handlerRefCon,
     DragReference theDrag );

+#endif

 
 void wxMacEnsureTrackingHandlersInstalled()
 {
 
 void wxMacEnsureTrackingHandlersInstalled()
 {

+#if wxOSX_USE_CARBON

     if ( !gTrackingGlobalsInstalled )
     {
         OSStatus err;
     if ( !gTrackingGlobalsInstalled )
     {
         OSStatus err;


@@ -346,8 +355,10 @@ void wxMacEnsureTrackingHandlersInstalled()
 
         gTrackingGlobalsInstalled = true;
     }
 
         gTrackingGlobalsInstalled = true;
     }

+#endif

 }
 
 }
 

+#if wxOSX_USE_CARBON

 pascal OSErr wxMacWindowDragTrackingHandler(
     DragTrackingMessage theMessage, WindowPtr theWindow,
     void *handlerRefCon, DragReference theDrag )
 pascal OSErr wxMacWindowDragTrackingHandler(
     DragTrackingMessage theMessage, WindowPtr theWindow,
     void *handlerRefCon, DragReference theDrag )


@@ -562,6 +573,7 @@ pascal OSErr wxMacWindowDragReceiveHandler(
 
     return noErr;
 }
 
     return noErr;
 }

+#endif

 
 #endif // wxUSE_DRAG_AND_DROP
 
 
 #endif // wxUSE_DRAG_AND_DROP