From: Stefan Csomor Date: Mon, 31 Dec 2001 16:31:23 +0000 (+0000) Subject: drag & drop implemented X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/8400ad1ed675bad90d258d97ec1758fc3f668411 drag & drop implemented git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13276 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/mac/dnd.h b/include/wx/mac/dnd.h index 0afea150b9..746dc91a25 100644 --- a/include/wx/mac/dnd.h +++ b/include/wx/mac/dnd.h @@ -14,9 +14,13 @@ #pragma interface "dnd.h" #endif +#if wxUSE_DRAG_AND_DROP + #include "wx/defs.h" #include "wx/object.h" #include "wx/string.h" +#include "wx/string.h" +#include "wx/dataobj.h" #include "wx/cursor.h" //------------------------------------------------------------------------- @@ -25,212 +29,81 @@ class WXDLLEXPORT wxWindow; -#ifndef __DARWIN__ -class WXDLLEXPORT wxDataObject; -class WXDLLEXPORT wxTextDataObject; -class WXDLLEXPORT wxFileDataObject; -#endif - class WXDLLEXPORT wxDropTarget; class WXDLLEXPORT wxTextDropTarget; class WXDLLEXPORT wxFileDropTarget; class WXDLLEXPORT wxDropSource; -#ifndef __DARWIN__ -//------------------------------------------------------------------------- -// wxDataObject -//------------------------------------------------------------------------- - -class WXDLLEXPORT wxDataObject : public wxObject -{ -public: - // all data formats (values are the same as in windows.h, do not change!) - enum StdFormat - { - Invalid, - Text, - Bitmap, - MetafilePict, - Sylk, - Dif, - Tiff, - OemText, - Dib, - Palette, - Pendata, - Riff, - Wave, - UnicodeText, - EnhMetafile, - Hdrop, - Locale, - Max - }; - - // function to return symbolic name of clipboard format (debug messages) - static const char *GetFormatName(wxDataFormat format); - - // ctor & dtor - wxDataObject() {}; - ~wxDataObject() {}; - - // pure virtuals to override - // get the best suited format for our data - virtual wxDataFormat GetPreferredFormat() const = 0; - // decide if we support this format (should be one of values of - // StdFormat enumerations or a user-defined format) - virtual bool IsSupportedFormat(wxDataFormat format) const = 0; - // get the (total) size of data - virtual size_t GetDataSize() const = 0; - // copy raw data to provided pointer - virtual void GetDataHere(void *pBuf) const = 0; - -}; - // ---------------------------------------------------------------------------- -// wxTextDataObject is a specialization of wxDataObject for text data +// macros // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxTextDataObject : public wxDataObject -{ -public: - // ctors - wxTextDataObject() { } - wxTextDataObject(const wxString& strText) : m_strText(strText) { } - void Init(const wxString& strText) { m_strText = strText; } - - // implement base class pure virtuals - virtual wxDataFormat GetPreferredFormat() const - { return wxDF_TEXT; } - virtual bool IsSupportedFormat(wxDataFormat format) const - { return format == wxDF_TEXT; } - virtual size_t GetDataSize() const - { return m_strText.Len() + 1; } // +1 for trailing '\0'of course - virtual void GetDataHere(void *pBuf) const - { memcpy(pBuf, m_strText.c_str(), GetDataSize()); } - -private: - wxString m_strText; - -}; - -// ---------------------------------------------------------------------------- -// wxFileDataObject is a specialization of wxDataObject for file names -// ---------------------------------------------------------------------------- - -class WXDLLEXPORT wxFileDataObject : public wxDataObject -{ -public: - - wxFileDataObject(void) { } - void AddFile( const wxString &file ) - { m_files += file; m_files += ";"; } - - // implement base class pure virtuals - virtual wxDataFormat GetPreferredFormat() const - { return wxDF_FILENAME; } - virtual bool IsSupportedFormat(wxDataFormat format) const - { return format == wxDF_FILENAME; } - virtual size_t GetDataSize() const - { return m_files.Len() + 1; } // +1 for trailing '\0'of course - virtual void GetDataHere(void *pBuf) const - { memcpy(pBuf, m_files.c_str(), GetDataSize()); } - -private: - wxString m_files; - -}; -#endif +// this macro may be used instead for wxDropSource ctor arguments: it will use +// the icon 'name' from an XPM file under GTK, but will expand to something +// else under MSW. If you don't use it, you will have to use #ifdef in the +// application code. +#define wxDROP_ICON(name) wxICON(name) //------------------------------------------------------------------------- // wxDropTarget //------------------------------------------------------------------------- -class WXDLLEXPORT wxDropTarget: public wxObject +class WXDLLEXPORT wxDropTarget: public wxDropTargetBase { public: - wxDropTarget(); - ~wxDropTarget(); - - virtual void OnEnter() { } - virtual void OnLeave() { } - virtual bool OnDrop( wxCoord x, wxCoord y, const void *pData ) = 0; + wxDropTarget(wxDataObject *dataObject = (wxDataObject*) NULL ); -// protected: - - friend class wxWindow; + virtual wxDragResult OnDragOver(wxCoord x, wxCoord y, wxDragResult def); + virtual bool OnDrop(wxCoord x, wxCoord y); + virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def); + virtual bool GetData(); - // Override these to indicate what kind of data you support: - - virtual size_t GetFormatCount() const = 0; - virtual wxDataFormat GetFormat(size_t n) const = 0; + bool CurrentDragHasSupportedFormat() ; + void SetCurrentDrag( DragReference drag ) { m_currentDrag = drag ; } + DragReference GetCurrentDrag() { return m_currentDrag ; } + protected : + DragReference m_currentDrag ; }; -#ifndef __DARWIN__ //------------------------------------------------------------------------- -// wxTextDropTarget +// wxDropSource //------------------------------------------------------------------------- -class WXDLLEXPORT wxTextDropTarget: public wxDropTarget +class WXDLLEXPORT wxDropSource: public wxDropSourceBase { - public: +public: + /* constructor. set data later with SetData() */ + wxDropSource( wxWindow *win = (wxWindow *)NULL, + const wxIcon © = wxNullIcon, + const wxIcon &move = wxNullIcon, + const wxIcon &none = wxNullIcon); - wxTextDropTarget() {}; - virtual bool OnDrop( wxCoord x, wxCoord y, const void *pData ); - virtual bool OnDropText( wxCoord x, wxCoord y, const char *psz ); - - protected: - - virtual size_t GetFormatCount() const; - virtual wxDataFormat GetFormat(size_t n) const; -}; + /* constructor for setting one data object */ + wxDropSource( wxDataObject& data, + wxWindow *win, + const wxIcon © = wxNullIcon, + const wxIcon &move = wxNullIcon, + const wxIcon &none = wxNullIcon); -// ---------------------------------------------------------------------------- -// A drop target which accepts files (dragged from File Manager or Explorer) -// ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFileDropTarget: public wxDropTarget -{ - public: - - wxFileDropTarget() {}; - - virtual bool OnDrop(wxCoord x, wxCoord y, const void *pData); - virtual bool OnDropFiles( wxCoord x, wxCoord y, - size_t nFiles, const char * const aszFiles[]); - - protected: - - virtual size_t GetFormatCount() const; - virtual wxDataFormat GetFormat(size_t n) const; -}; -#endif + ~wxDropSource(); -//------------------------------------------------------------------------- -// wxDropSource -//------------------------------------------------------------------------- - -class WXDLLEXPORT wxDropSource: public wxObject -{ - public: - - wxDropSource( wxWindow *win ); - wxDropSource( wxDataObject &data, wxWindow *win ); - - ~wxDropSource(void); - - void SetData( wxDataObject &data ); - wxDragResult DoDragDrop( bool bAllowMove = FALSE ); + /* start drag action */ + virtual wxDragResult DoDragDrop( bool bAllowMove = FALSE ); - virtual bool GiveFeedback( wxDragResult WXUNUSED(effect), bool WXUNUSED(bScrolling) ) { return TRUE; }; - - protected: - - wxDataObject *m_data; + wxWindow* GetWindow() { return m_window ; } + void SetCurrentDrag( DragReference drag ) { m_currentDrag = drag ; } + DragReference GetCurrentDrag() { return m_currentDrag ; } + protected : + wxWindow *m_window; + DragReference m_currentDrag ; }; +#endif + // D&D + #endif //_WX_DND_H_ diff --git a/include/wx/mac/metafile.h b/include/wx/mac/metafile.h index f6334a434d..17ffbc0866 100644 --- a/include/wx/mac/metafile.h +++ b/include/wx/mac/metafile.h @@ -121,38 +121,29 @@ bool WXDLLEXPORT wxMakeMetaFilePlaceable(const wxString& filename, int x1, int y // ---------------------------------------------------------------------------- #if wxUSE_DATAOBJ -class WXDLLEXPORT wxMetafileDataObject : public wxDataObject +class WXDLLEXPORT wxMetafileDataObject : public wxDataObjectSimple { public: // ctors - wxMetafileDataObject() { m_width = 0; m_height = 0; }; - wxMetafileDataObject(const wxMetafile& metafile, int width = 0, int height = 0): - m_metafile(metafile), m_width(width), m_height(height) { } - - void SetMetafile(const wxMetafile& metafile, int w = 0, int h = 0) - { m_metafile = metafile; m_width = w; m_height = h; } - wxMetafile GetMetafile() const { return m_metafile; } - int GetWidth() const { return m_width; } - int GetHeight() const { return m_height; } - - virtual wxDataFormat GetFormat() const { return wxDF_METAFILE; } - -/* ?? - // implement base class pure virtuals - virtual wxDataFormat GetPreferredFormat() const - { return (wxDataFormat) wxDataObject::Text; } - virtual bool IsSupportedFormat(wxDataFormat format) const - { return format == wxDataObject::Text || format == wxDataObject::Locale; } - virtual size_t GetDataSize() const - { return m_strText.Len() + 1; } // +1 for trailing '\0'of course - virtual void GetDataHere(void *pBuf) const - { memcpy(pBuf, m_strText.c_str(), GetDataSize()); } -*/ - -private: + wxMetafileDataObject() + : wxDataObjectSimple(wxDF_METAFILE) { }; + wxMetafileDataObject(const wxMetafile& metafile) + : wxDataObjectSimple(wxDF_METAFILE), m_metafile(metafile) { } + + // virtual functions which you may override if you want to provide data on + // demand only - otherwise, the trivial default versions will be used + virtual void SetMetafile(const wxMetafile& metafile) + { m_metafile = metafile; } + virtual wxMetafile GetMetafile() const + { return m_metafile; } + + // implement base class pure virtuals + virtual size_t GetDataSize() const; + virtual bool GetDataHere(void *buf) const; + virtual bool SetData(size_t len, const void *buf); + +protected: wxMetafile m_metafile; - int m_width; - int m_height; }; #endif diff --git a/include/wx/mac/window.h b/include/wx/mac/window.h index df3ad41985..8c226ac79d 100644 --- a/include/wx/mac/window.h +++ b/include/wx/mac/window.h @@ -214,6 +214,7 @@ public: public : static bool MacGetWindowFromPoint( const wxPoint &point , wxWindowMac** outWin ) ; + virtual bool MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac** outWin ) ; virtual void MacRedraw( RgnHandle updatergn , long time , bool erase) ; virtual bool MacCanFocus() const { return true ; } @@ -248,7 +249,6 @@ public : bool MacIsWindowScrollbar( const wxScrollBar* sb ) { return (m_hScrollBar == sb || m_vScrollBar == sb) ; } static wxWindowMac* s_lastMouseWindow ; private: - virtual bool MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac** outWin ) ; protected: // RgnHandle m_macUpdateRgn ; // bool m_macEraseOnRedraw ;