Don't require drag and drop

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

diff --git a/samples/mediaplayer/mediaplayer.cpp b/samples/mediaplayer/mediaplayer.cpp
index 19e337583b3d3e4327db27388a783213d7385074..8c9a8475f2f0439e5005e80dc9897580482682ca 100644 (file)
--- a/samples/mediaplayer/mediaplayer.cpp
+++ b/samples/mediaplayer/mediaplayer.cpp
@@ -83,7 +83,7 @@
 #endif
 
 #if !wxUSE_MEDIACTRL || !wxUSE_MENUS || !wxUSE_SLIDER || !wxUSE_TIMER || \
 #endif
 
 #if !wxUSE_MEDIACTRL || !wxUSE_MENUS || !wxUSE_SLIDER || !wxUSE_TIMER || \

-    !wxUSE_NOTEBOOK || !wxUSE_LISTCTRL || !wxUSE_DRAG_AND_DROP
+    !wxUSE_NOTEBOOK || !wxUSE_LISTCTRL

 #error "Not all required elements are enabled.  Please modify setup.h!"
 #endif
 
 #error "Not all required elements are enabled.  Please modify setup.h!"
 #endif
 


@@ -331,6 +331,7 @@ public:
 //  Drop target for playlist (i.e. user drags a file from explorer unto
 //  playlist it adds the file)
 // ----------------------------------------------------------------------------
 //  Drop target for playlist (i.e. user drags a file from explorer unto
 //  playlist it adds the file)
 // ----------------------------------------------------------------------------

+#if wxUSE_DRAG_AND_DROP

 class wxPlayListDropTarget : public wxFileDropTarget
 {
 public:
 class wxPlayListDropTarget : public wxFileDropTarget
 {
 public:


@@ -347,6 +348,7 @@ public:
     }
     wxMediaPlayerListCtrl& m_list;
 };
     }
     wxMediaPlayerListCtrl& m_list;
 };

+#endif

 
 // ============================================================================
 //
 
 // ============================================================================
 //


@@ -1579,7 +1581,10 @@ wxMediaPlayerNotebookPage::wxMediaPlayerNotebookPage(wxMediaPlayerFrame* parentF
     m_playlist->InsertColumn(1,_("File"), wxLIST_FORMAT_LEFT, /*wxLIST_AUTOSIZE_USEHEADER*/305);
     m_playlist->InsertColumn(2,_("Length"), wxLIST_FORMAT_CENTER, 75);
 
     m_playlist->InsertColumn(1,_("File"), wxLIST_FORMAT_LEFT, /*wxLIST_AUTOSIZE_USEHEADER*/305);
     m_playlist->InsertColumn(2,_("Length"), wxLIST_FORMAT_CENTER, 75);
 

+#if wxUSE_DRAG_AND_DROP

     m_playlist->SetDropTarget(new wxPlayListDropTarget(*m_playlist));
     m_playlist->SetDropTarget(new wxPlayListDropTarget(*m_playlist));

+#endif
+

     sizer->Add(m_playlist, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 5);
 
     //
     sizer->Add(m_playlist, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 5);
 
     //