From 32cb97237e7691d31977ab503c6ea4511e8eb3a8 Mon Sep 17 00:00:00 2001
From: Daniel Wilhelm <daniel@wili.li>
Date: Fri, 18 Apr 2014 17:18:53 +0200
Subject: 5.0

---
 ui/dir_name.h | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'ui/dir_name.h')

diff --git a/ui/dir_name.h b/ui/dir_name.h
index 43f2015d..d491cacc 100644
--- a/ui/dir_name.h
+++ b/ui/dir_name.h
@@ -1,7 +1,7 @@
 // **************************************************************************
 // * This file is part of the FreeFileSync project. It is distributed under *
 // * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
-// * Copyright (C) 2008-2011 ZenJu (zhnmju123 AT gmx.de)                    *
+// * Copyright (C) ZenJu (zhnmju123 AT gmx DOT de) - All Rights Reserved    *
 // **************************************************************************
 
 #ifndef DRAGANDDROP_H_INCLUDED
@@ -12,6 +12,7 @@
 #include <wx/sizer.h>
 #include <wx/filepicker.h>
 #include <wx+/file_drop.h>
+#include <wx/stattext.h>
 
 namespace zen
 {
@@ -21,10 +22,10 @@ template <class NameControl>  //NameControl may be wxTextCtrl, FolderHistoryBox
 class DirectoryName: private wxEvtHandler
 {
 public:
-    DirectoryName(wxWindow&         dropWindow,
-                  wxDirPickerCtrl&  dirPicker,
-                  NameControl&      dirName,
-                  wxStaticBoxSizer* staticBox = NULL,
+    DirectoryName(wxWindow&        dropWindow,
+                  wxDirPickerCtrl& dirPicker,
+                  NameControl&     dirName,
+                  wxStaticText*    staticText = NULL,
                   wxWindow*        dropWindow2 = NULL); //optional
 
     ~DirectoryName();
@@ -33,9 +34,9 @@ public:
     void setName(const wxString& dirname);
 
 private:
-    virtual bool acceptDrop(const std::vector<wxString>& droppedFiles) { return true; }; //return true if drop should be processed
+    virtual bool acceptDrop(const std::vector<wxString>& droppedFiles, const wxPoint& clientPos, const wxWindow& wnd) { return true; }; //return true if drop should be processed
 
-    void OnFilesDropped(FFSFileDropEvent& event);
+    void OnFilesDropped(FileDropEvent& event);
     void OnWriteDirManually(wxCommandEvent& event);
     void OnDirSelected(wxFileDirPickerEvent& event);
 
@@ -43,7 +44,7 @@ private:
     const wxWindow*   dropWindow2_;
     wxDirPickerCtrl&  dirPicker_;
     NameControl&      dirName_;
-    wxStaticBoxSizer* staticBox_; //optional
+    wxStaticText*     staticText_; //optional
 };
 }
 
-- 
cgit