Applied patch for multiple file selection, documented.

[wxWidgets.git] / samples / dnd / dnd.cpp

diff --git a/samples/dnd/dnd.cpp b/samples/dnd/dnd.cpp
index 5bfcff4ecceca7de5a16512e3e1d552792eae635..0b26e485d87ddba1c55d05254cce19255fc9e160 100644 (file)
--- a/samples/dnd/dnd.cpp
+++ b/samples/dnd/dnd.cpp
@@ -43,15 +43,12 @@
 // file names) we drop on them
 // ----------------------------------------------------------------------------
 
 // file names) we drop on them
 // ----------------------------------------------------------------------------
 

-typedef long wxDropPointCoord;
-

 class DnDText : public wxTextDropTarget
 {
 public:
     DnDText(wxListBox *pOwner) { m_pOwner = pOwner; }
 
 class DnDText : public wxTextDropTarget
 {
 public:
     DnDText(wxListBox *pOwner) { m_pOwner = pOwner; }
 

-    virtual bool OnDropText(wxDropPointCoord x, wxDropPointCoord y,
-                            const wxChar* psz);
+    virtual bool OnDropText(wxCoord x, wxCoord y, const wxString& text);

 
 private:
     wxListBox *m_pOwner;
 
 private:
     wxListBox *m_pOwner;


@@ -62,8 +59,8 @@ class DnDFile : public wxFileDropTarget
 public:
     DnDFile(wxListBox *pOwner) { m_pOwner = pOwner; }
 
 public:
     DnDFile(wxListBox *pOwner) { m_pOwner = pOwner; }
 

-  virtual bool OnDropFiles(wxDropPointCoord x, wxDropPointCoord y,
-                           size_t nFiles, const wxChar* const aszFiles[] );
+    virtual bool OnDropFiles(wxCoord x, wxCoord y,
+                             const wxArrayString& filenames);

 
 private:
     wxListBox *m_pOwner;
 
 private:
     wxListBox *m_pOwner;


@@ -98,24 +95,30 @@ public:
     void OnNewFrame(wxCommandEvent& event);
     void OnHelp (wxCommandEvent& event);
     void OnLogClear(wxCommandEvent& event);
     void OnNewFrame(wxCommandEvent& event);
     void OnHelp (wxCommandEvent& event);
     void OnLogClear(wxCommandEvent& event);

+

     void OnCopy(wxCommandEvent& event);
     void OnPaste(wxCommandEvent& event);
     void OnCopy(wxCommandEvent& event);
     void OnPaste(wxCommandEvent& event);

+

     void OnCopyBitmap(wxCommandEvent& event);
     void OnPasteBitmap(wxCommandEvent& event);
     void OnCopyBitmap(wxCommandEvent& event);
     void OnPasteBitmap(wxCommandEvent& event);

-    void OnClipboardHasText(wxCommandEvent& event);
-    void OnClipboardHasBitmap(wxCommandEvent& event);
+
+    void OnCopyFiles(wxCommandEvent& event);

 
     void OnLeftDown(wxMouseEvent& event);
     void OnRightDown(wxMouseEvent& event);
 
 
     void OnLeftDown(wxMouseEvent& event);
     void OnRightDown(wxMouseEvent& event);
 

+    void OnUpdateUIPasteText(wxUpdateUIEvent& event);
+    void OnUpdateUIPasteBitmap(wxUpdateUIEvent& event);
+

     DECLARE_EVENT_TABLE()
 
 private:
     wxListBox  *m_ctrlFile,
     DECLARE_EVENT_TABLE()
 
 private:
     wxListBox  *m_ctrlFile,

-    *m_ctrlText;
+               *m_ctrlText;

     wxTextCtrl *m_ctrlLog;
 
     wxTextCtrl *m_ctrlLog;
 

-    wxLog *m_pLog, *m_pLogPrev;
+    wxLog *m_pLog,
+          *m_pLogPrev;

 
     wxString  m_strText;
     wxBitmap  m_bitmap;
 
     wxString  m_strText;
     wxBitmap  m_bitmap;


@@ -145,12 +148,12 @@ public:
     {
     }
 
     {
     }
 

+    // this is for debugging - lets us see when exactly an object is freed
+    // (this may be later than you think if it's on the clipboard, for example)
+    virtual ~DnDShape() { }
+

     // the functions used for drag-and-drop: they dump and restore a shape into
     // the functions used for drag-and-drop: they dump and restore a shape into

-    // some bitwise-copiable data
-    //
-    // NB: here we profit from the fact that wxPoint, wxSize and wxColour are
-    //     POD (plain old data) and so can be copied directly - but it wouldn't
-    //     work for other types!
+    // some bitwise-copiable data (might use streams too...)

     // ------------------------------------------------------------------------
 
     // restore from buffer
     // ------------------------------------------------------------------------
 
     // restore from buffer


@@ -179,10 +182,12 @@ public:
     const wxColour& GetColour() const { return m_col; }
     const wxSize& GetSize() const { return m_size; }
 
     const wxColour& GetColour() const { return m_col; }
     const wxSize& GetSize() const { return m_size; }
 

+    void Move(const wxPoint& pos) { m_pos = pos; }
+

     // to implement in derived classes
     virtual Kind GetKind() const = 0;
 
     // to implement in derived classes
     virtual Kind GetKind() const = 0;
 

-    virtual void Draw(wxDC& dc) = 0
+    virtual void Draw(wxDC& dc)

     {
         dc.SetPen(wxPen(m_col, 1, wxSOLID));
     }
     {
         dc.SetPen(wxPen(m_col, 1, wxSOLID));
     }


@@ -212,6 +217,12 @@ public:
                        const wxColour& col)
         : DnDShape(pos, size, col)
     {
                        const wxColour& col)
         : DnDShape(pos, size, col)
     {

+        wxLogMessage("DnDTriangularShape is being created");
+    }
+
+    virtual ~DnDTriangularShape()
+    {
+        wxLogMessage("DnDTriangularShape is being deleted");

     }
 
     virtual Kind GetKind() const { return Triangle; }
     }
 
     virtual Kind GetKind() const { return Triangle; }


@@ -229,7 +240,9 @@ public:
         dc.DrawLine(p2, p3);
         dc.DrawLine(p3, p1);
 
         dc.DrawLine(p2, p3);
         dc.DrawLine(p3, p1);
 

+#ifdef __WXMSW__

         dc.FloodFill(GetCentre(), m_col, wxFLOOD_BORDER);
         dc.FloodFill(GetCentre(), m_col, wxFLOOD_BORDER);

+#endif

     }
 };
 
     }
 };
 


@@ -241,6 +254,12 @@ public:
                         const wxColour& col)
         : DnDShape(pos, size, col)
     {
                         const wxColour& col)
         : DnDShape(pos, size, col)
     {

+        wxLogMessage("DnDRectangularShape is being created");
+    }
+
+    virtual ~DnDRectangularShape()
+    {
+        wxLogMessage("DnDRectangularShape is being deleted");

     }
 
     virtual Kind GetKind() const { return Rectangle; }
     }
 
     virtual Kind GetKind() const { return Rectangle; }


@@ -258,7 +277,9 @@ public:
         dc.DrawLine(p3, p4);
         dc.DrawLine(p4, p1);
 
         dc.DrawLine(p3, p4);
         dc.DrawLine(p4, p1);
 

+#ifdef __WXMSW__

         dc.FloodFill(GetCentre(), m_col, wxFLOOD_BORDER);
         dc.FloodFill(GetCentre(), m_col, wxFLOOD_BORDER);

+#endif

     }
 };
 
     }
 };
 


@@ -270,6 +291,12 @@ public:
                      const wxColour& col)
         : DnDShape(pos, size, col)
     {
                      const wxColour& col)
         : DnDShape(pos, size, col)
     {

+        wxLogMessage("DnDEllipticShape is being created");
+    }
+
+    virtual ~DnDEllipticShape()
+    {
+        wxLogMessage("DnDEllipticShape is being deleted");

     }
 
     virtual Kind GetKind() const { return Ellipse; }
     }
 
     virtual Kind GetKind() const { return Ellipse; }


@@ -279,7 +306,9 @@ public:
 
         dc.DrawEllipse(m_pos, m_size);
 
 
         dc.DrawEllipse(m_pos, m_size);
 

+#ifdef __WXMSW__

         dc.FloodFill(GetCentre(), m_col, wxFLOOD_BORDER);
         dc.FloodFill(GetCentre(), m_col, wxFLOOD_BORDER);

+#endif

     }
 };
 
     }
 };
 


@@ -294,9 +323,24 @@ class DnDShapeDataObject : public wxDataObject
 public:
     // ctor doesn't copy the pointer, so it shouldn't go away while this object
     // is alive
 public:
     // ctor doesn't copy the pointer, so it shouldn't go away while this object
     // is alive

-    DnDShapeDataObject(DnDShape *shape)
+    DnDShapeDataObject(DnDShape *shape = (DnDShape *)NULL)

     {
     {

-        m_shape = shape;
+        if ( shape )
+        {
+            // we need to copy the shape because the one we're handled may be
+            // deleted while it's still on the clipboard (for example) - and we
+            // reuse the serialisation methods here to copy it
+            void *buf = malloc(shape->DnDShape::GetDataSize());
+            shape->GetDataHere(buf);
+            m_shape = DnDShape::New(buf);
+
+            free(buf);
+        }
+        else
+        {
+            // nothing to copy
+            m_shape = NULL;
+        }

 
         // this string should uniquely identify our format, but is otherwise
         // arbitrary
 
         // this string should uniquely identify our format, but is otherwise
         // arbitrary


@@ -307,24 +351,52 @@ public:
         m_hasBitmap = FALSE;
     }
 
         m_hasBitmap = FALSE;
     }
 

+    virtual ~DnDShapeDataObject() { delete m_shape; }
+
+    // after a call to this function, the shape is owned by the caller and it
+    // is responsible for deleting it!
+    //
+    // NB: a better solution would be to make DnDShapes ref counted and this
+    //     is what should probably be done in a real life program, otherwise
+    //     the ownership problems become too complicated really fast
+    DnDShape *GetShape()
+    {
+        DnDShape *shape = m_shape;
+
+        m_shape = (DnDShape *)NULL;
+        m_hasBitmap = FALSE;
+
+        return shape;
+    }
+

     // implement base class pure virtuals
     // ----------------------------------
 
     // implement base class pure virtuals
     // ----------------------------------
 

-    virtual wxDataFormat GetPreferredFormat() const
+    virtual wxDataFormat GetPreferredFormat(Direction WXUNUSED(dir)) const

     {
         return m_formatShape;
     }
 
     {
         return m_formatShape;
     }
 

-    virtual size_t GetFormatCount() const
+    virtual size_t GetFormatCount(Direction dir) const

     {
     {

-        // +1 for our custom format
-        return m_dataobj.GetFormatCount() + 1;
+        // our custom format is supported by both GetData() and SetData()
+        size_t nFormats = 1;
+        if ( dir == Get )
+        {
+            // but the bitmap format(s) are only supported for output
+            nFormats += m_dataobj.GetFormatCount(dir);
+        }
+
+        return nFormats;

     }
 
     }
 

-    virtual void GetAllFormats(wxDataFormat *formats) const
+    virtual void GetAllFormats(wxDataFormat *formats, Direction dir) const

     {
         formats[0] = m_formatShape;
     {
         formats[0] = m_formatShape;

-        m_dataobj.GetAllFormats(&formats[1]);
+        if ( dir == Get )
+        {
+            m_dataobj.GetAllFormats(&formats[1], dir);
+        }

     }
 
     virtual size_t GetDataSize(const wxDataFormat& format) const
     }
 
     virtual size_t GetDataSize(const wxDataFormat& format) const


@@ -335,32 +407,44 @@ public:
         }
         else
         {
         }
         else
         {

-            wxASSERT_MSG( format == wxDF_BITMAP, "unsupported format" );
-

             if ( !m_hasBitmap )
                 CreateBitmap();
 
             if ( !m_hasBitmap )
                 CreateBitmap();
 

-            return m_dataobj.GetDataSize(format);
+            return m_dataobj.GetDataSize();

         }
     }
 
         }
     }
 

-    virtual void GetDataHere(const wxDataFormat& format, void *pBuf) const
+    virtual bool GetDataHere(const wxDataFormat& format, void *pBuf) const

     {
         if ( format == m_formatShape )
         {
             m_shape->GetDataHere(pBuf);
     {
         if ( format == m_formatShape )
         {
             m_shape->GetDataHere(pBuf);

+
+            return TRUE;

         }
         else
         {
         }
         else
         {

-            wxASSERT_MSG( format == wxDF_BITMAP, "unsupported format" );
-

             if ( !m_hasBitmap )
                 CreateBitmap();
 
             if ( !m_hasBitmap )
                 CreateBitmap();
 

-            m_dataobj.GetDataHere(format, pBuf);
+            return m_dataobj.GetDataHere(pBuf);

         }
     }
 
         }
     }
 

+    virtual bool SetData(const wxDataFormat& format,
+                         size_t len, const void *buf)
+    {
+        wxCHECK_MSG( format == m_formatShape, FALSE, "unsupported format" );
+
+        delete m_shape;
+        m_shape = DnDShape::New(buf);
+
+        // the shape has changed
+        m_hasBitmap = FALSE;
+
+        return TRUE;
+    }
+

 private:
     // creates a bitmap and assigns it to m_dataobj (also sets m_hasBitmap)
     void CreateBitmap() const;
 private:
     // creates a bitmap and assigns it to m_dataobj (also sets m_hasBitmap)
     void CreateBitmap() const;


@@ -422,14 +506,25 @@ public:
     void SetShape(DnDShape *shape);
 
     // callbacks
     void SetShape(DnDShape *shape);
 
     // callbacks

+    void OnNewShape(wxCommandEvent& event);
+    void OnEditShape(wxCommandEvent& event);
+    void OnClearShape(wxCommandEvent& event);
+
+    void OnCopyShape(wxCommandEvent& event);
+    void OnPasteShape(wxCommandEvent& event);
+
+    void OnUpdateUICopy(wxUpdateUIEvent& event);
+    void OnUpdateUIPaste(wxUpdateUIEvent& event);
+

     void OnDrag(wxMouseEvent& event);
     void OnDrag(wxMouseEvent& event);

-    void OnEdit(wxMouseEvent& event);

     void OnPaint(wxPaintEvent& event);
     void OnPaint(wxPaintEvent& event);

-    void OnDrop(long x, long y, DnDShape *shape);
+    void OnDrop(wxCoord x, wxCoord y, DnDShape *shape);

 
 private:
     DnDShape *m_shape;
 
 
 private:
     DnDShape *m_shape;
 

+    static DnDShapeFrame *ms_lastDropTarget;
+

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -441,33 +536,34 @@ class DnDShapeDropTarget : public wxDropTarget
 {
 public:
     DnDShapeDropTarget(DnDShapeFrame *frame)
 {
 public:
     DnDShapeDropTarget(DnDShapeFrame *frame)

+        : wxDropTarget(new DnDShapeDataObject)

     {
         m_frame = frame;
     {
         m_frame = frame;

-
-        // the same as used by DnDShapeDataObject
-        m_formatShape.SetId(shapeFormatId);

     }
 
     // override base class (pure) virtuals
     }
 
     // override base class (pure) virtuals

-    virtual void OnEnter()
-        { m_frame->SetStatusText("Mouse entered the frame"); }
+    virtual wxDragResult OnEnter(wxCoord x, wxCoord y, wxDragResult def)
+        { m_frame->SetStatusText("Mouse entered the frame");
+         return OnDragOver(x, y, def); }

     virtual void OnLeave()
         { m_frame->SetStatusText("Mouse left the frame"); }
     virtual void OnLeave()
         { m_frame->SetStatusText("Mouse left the frame"); }

-    virtual bool OnDrop(long x, long y, const void *pData)
+    virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def)

     {
     {

-        m_frame->OnDrop(x, y, DnDShape::New(pData));
+        if ( !GetData() )
+        {
+            wxLogError("Failed to get drag and drop data");

 
 

-        return TRUE;
-    }
+            return wxDragNone;
+        }

 
 

-protected:
-    virtual size_t GetFormatCount() const { return 1; }
-    virtual wxDataFormat GetFormat(size_t WXUNUSED(n)) const
-        { return m_formatShape; }
+        m_frame->OnDrop(x, y,
+                        ((DnDShapeDataObject *)GetDataObject())->GetShape());
+
+        return def;
+    }

 
 private:
     DnDShapeFrame *m_frame;
 
 private:
     DnDShapeFrame *m_frame;

-    wxDataFormat m_formatShape;

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -486,10 +582,12 @@ enum
     Menu_Paste,
     Menu_CopyBitmap,
     Menu_PasteBitmap,
     Menu_Paste,
     Menu_CopyBitmap,
     Menu_PasteBitmap,

-    Menu_HasText,
-    Menu_HasBitmap,
-    Menu_ToBeGreyed,   /* for testing */
-    Menu_ToBeDeleted,  /* for testing */
+    Menu_CopyFiles,
+    Menu_Shape_New = 500,
+    Menu_Shape_Edit,
+    Menu_Shape_Clear,
+    Menu_ShapeClipboard_Copy,
+    Menu_ShapeClipboard_Paste,

     Button_Colour = 1001
 };
 
     Button_Colour = 1001
 };
 


@@ -504,8 +602,10 @@ BEGIN_EVENT_TABLE(DnDFrame, wxFrame)
     EVT_MENU(Menu_Paste,      DnDFrame::OnPaste)
     EVT_MENU(Menu_CopyBitmap, DnDFrame::OnCopyBitmap)
     EVT_MENU(Menu_PasteBitmap,DnDFrame::OnPasteBitmap)
     EVT_MENU(Menu_Paste,      DnDFrame::OnPaste)
     EVT_MENU(Menu_CopyBitmap, DnDFrame::OnCopyBitmap)
     EVT_MENU(Menu_PasteBitmap,DnDFrame::OnPasteBitmap)

-    EVT_MENU(Menu_HasText,    DnDFrame::OnClipboardHasText)
-    EVT_MENU(Menu_HasBitmap,  DnDFrame::OnClipboardHasBitmap)
+    EVT_MENU(Menu_CopyFiles,  DnDFrame::OnCopyFiles)
+
+    EVT_UPDATE_UI(Menu_Paste,       DnDFrame::OnUpdateUIPasteText)
+    EVT_UPDATE_UI(Menu_PasteBitmap, DnDFrame::OnUpdateUIPasteBitmap)

 
     EVT_LEFT_DOWN(            DnDFrame::OnLeftDown)
     EVT_RIGHT_DOWN(           DnDFrame::OnRightDown)
 
     EVT_LEFT_DOWN(            DnDFrame::OnLeftDown)
     EVT_RIGHT_DOWN(           DnDFrame::OnRightDown)


@@ -513,13 +613,23 @@ BEGIN_EVENT_TABLE(DnDFrame, wxFrame)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(DnDShapeFrame, wxFrame)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(DnDShapeFrame, wxFrame)

-    EVT_RIGHT_DOWN(DnDShapeFrame::OnDrag)
-    EVT_LEFT_DCLICK(DnDShapeFrame::OnEdit)
+    EVT_MENU(Menu_Shape_New,    DnDShapeFrame::OnNewShape)
+    EVT_MENU(Menu_Shape_Edit,   DnDShapeFrame::OnEditShape)
+    EVT_MENU(Menu_Shape_Clear,  DnDShapeFrame::OnClearShape)
+
+    EVT_MENU(Menu_ShapeClipboard_Copy,  DnDShapeFrame::OnCopyShape)
+    EVT_MENU(Menu_ShapeClipboard_Paste, DnDShapeFrame::OnPasteShape)
+
+    EVT_UPDATE_UI(Menu_ShapeClipboard_Copy,  DnDShapeFrame::OnUpdateUICopy)
+    EVT_UPDATE_UI(Menu_ShapeClipboard_Paste, DnDShapeFrame::OnUpdateUIPaste)
+
+    EVT_LEFT_DOWN(DnDShapeFrame::OnDrag)
+

     EVT_PAINT(DnDShapeFrame::OnPaint)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(DnDShapeDialog, wxDialog)
     EVT_PAINT(DnDShapeFrame::OnPaint)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(DnDShapeDialog, wxDialog)

-    EVT_BUTTON(Button_Colour, OnColour)
+    EVT_BUTTON(Button_Colour, DnDShapeDialog::OnColour)

 END_EVENT_TABLE()
 
 // ============================================================================
 END_EVENT_TABLE()
 
 // ============================================================================


@@ -529,22 +639,50 @@ END_EVENT_TABLE()
 // `Main program' equivalent, creating windows and returning main app frame
 bool DnDApp::OnInit()
 {
 // `Main program' equivalent, creating windows and returning main app frame
 bool DnDApp::OnInit()
 {

+    // load our ressources
+    wxPathList pathList;
+    pathList.Add(".");
+#ifdef __WXMSW__
+    pathList.Add("./Debug");
+    pathList.Add("./Release");
+#endif // wxMSW
+
+    wxString path = pathList.FindValidPath("dnd.wxr");
+    if ( !path )
+    {
+        wxLogError("Can't find the resource file dnd.wxr in the current "
+                   "directory, aborting.");
+
+        return FALSE;
+    }
+
+    wxDefaultResourceTable->ParseResourceFile(path);
+
+    // switch on trace messages
+#if defined(__WXGTK__)
+    wxLog::AddTraceMask(_T("clipboard"));
+#elif defined(__WXMSW__)
+    wxLog::AddTraceMask(wxTRACE_OleCalls);
+#endif
+

 #if wxUSE_LIBPNG
     wxImage::AddHandler( new wxPNGHandler );
 #endif
 
 #if wxUSE_LIBPNG
     wxImage::AddHandler( new wxPNGHandler );
 #endif
 

+    // under X we usually want to use the primary selection by default (which
+    // is shared with other apps)
+    wxTheClipboard->UsePrimarySelection();
+

     // create the main frame window
     DnDFrame *frame = new DnDFrame((wxFrame  *) NULL,
                                    "Drag-and-Drop/Clipboard wxWindows Sample",
     // create the main frame window
     DnDFrame *frame = new DnDFrame((wxFrame  *) NULL,
                                    "Drag-and-Drop/Clipboard wxWindows Sample",

-                                   50, 50, 450, 340);
+                                   10, 10, 450, 340);

 
     // activate it
     frame->Show(TRUE);
 
     SetTopWindow(frame);
 
 
     // activate it
     frame->Show(TRUE);
 
     SetTopWindow(frame);
 

-    wxDefaultResourceTable->ParseResourceFile("dnd.wxr");
-

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -567,7 +705,7 @@ DnDFrame::DnDFrame(wxFrame *frame, char *title, int x, int y, int w, int h)
     file_menu->Append(Menu_Quit, "E&xit");
 
     wxMenu *log_menu = new wxMenu;
     file_menu->Append(Menu_Quit, "E&xit");
 
     wxMenu *log_menu = new wxMenu;

-    log_menu->Append(Menu_Clear, "Clear");
+    log_menu->Append(Menu_Clear, "Clear\tCtrl-L");

 
     wxMenu *help_menu = new wxMenu;
     help_menu->Append(Menu_Help, "&Help...");
 
     wxMenu *help_menu = new wxMenu;
     help_menu->Append(Menu_Help, "&Help...");


@@ -578,11 +716,10 @@ DnDFrame::DnDFrame(wxFrame *frame, char *title, int x, int y, int w, int h)
     clip_menu->Append(Menu_Copy, "&Copy text\tCtrl+C");
     clip_menu->Append(Menu_Paste, "&Paste text\tCtrl+V");
     clip_menu->AppendSeparator();
     clip_menu->Append(Menu_Copy, "&Copy text\tCtrl+C");
     clip_menu->Append(Menu_Paste, "&Paste text\tCtrl+V");
     clip_menu->AppendSeparator();

-    clip_menu->Append(Menu_CopyBitmap, "&Copy bitmap");
-    clip_menu->Append(Menu_PasteBitmap, "&Paste bitmap");
+    clip_menu->Append(Menu_CopyBitmap, "&Copy bitmap\tAlt+C");
+    clip_menu->Append(Menu_PasteBitmap, "&Paste bitmap\tAlt+V");

     clip_menu->AppendSeparator();
     clip_menu->AppendSeparator();

-    clip_menu->Append(Menu_HasText, "Clipboard has &text\tCtrl+T");
-    clip_menu->Append(Menu_HasBitmap, "Clipboard has a &bitmap\tCtrl+B");
+    clip_menu->Append(Menu_CopyFiles, "&Copy files\tCtrl+F");

 
     wxMenuBar *menu_bar = new wxMenuBar;
     menu_bar->Append(file_menu, "&File");
 
     wxMenuBar *menu_bar = new wxMenuBar;
     menu_bar->Append(file_menu, "&File");


@@ -598,16 +735,16 @@ DnDFrame::DnDFrame(wxFrame *frame, char *title, int x, int y, int w, int h)
 
     wxString strFile("Drop files here!"), strText("Drop text on me");
 
 
     wxString strFile("Drop files here!"), strText("Drop text on me");
 

-    m_ctrlFile  = new wxListBox(this, -1, pos, size, 1, &strFile, wxLB_HSCROLL | wxLB_ALWAYS_SB );
-    m_ctrlText  = new wxListBox(this, -1, pos, size, 1, &strText, wxLB_HSCROLL | wxLB_ALWAYS_SB );
+    m_ctrlFile  = new wxListBox(this, -1, pos, size, 1, &strFile,
+                                wxLB_HSCROLL | wxLB_ALWAYS_SB );
+    m_ctrlText  = new wxListBox(this, -1, pos, size, 1, &strText,
+                                wxLB_HSCROLL | wxLB_ALWAYS_SB );

 
     m_ctrlLog   = new wxTextCtrl(this, -1, "", pos, size,
 
     m_ctrlLog   = new wxTextCtrl(this, -1, "", pos, size,

-                               wxTE_MULTILINE | wxTE_READONLY |
-                               wxSUNKEN_BORDER );
+                                 wxTE_MULTILINE | wxTE_READONLY |
+                                 wxSUNKEN_BORDER );

 
 

-    // redirect log messages to the text window and switch on OLE messages
-    // logging
-    wxLog::AddTraceMask(wxTRACE_OleCalls);
+    // redirect log messages to the text window

     m_pLog = new wxLogTextCtrl(m_ctrlLog);
     m_pLogPrev = wxLog::SetActiveTarget(m_pLog);
 
     m_pLog = new wxLogTextCtrl(m_ctrlLog);
     m_pLogPrev = wxLog::SetActiveTarget(m_pLog);
 


@@ -637,7 +774,7 @@ DnDFrame::DnDFrame(wxFrame *frame, char *title, int x, int y, int w, int h)
     c = new wxLayoutConstraints;
     c->left.SameAs    (this, wxLeft);
     c->right.SameAs   (this, wxRight);
     c = new wxLayoutConstraints;
     c->left.SameAs    (this, wxLeft);
     c->right.SameAs   (this, wxRight);

-    c->height.PercentOf(this, wxHeight, 30);
+    c->height.PercentOf(this, wxHeight, 50);

     c->top.SameAs(m_ctrlText, wxBottom);
     m_ctrlLog->SetConstraints(c);
 
     c->top.SameAs(m_ctrlText, wxBottom);
     m_ctrlLog->SetConstraints(c);
 


@@ -659,50 +796,35 @@ void DnDFrame::OnPaint(wxPaintEvent& WXUNUSED(event))
     dc.SetFont( wxFont( 24, wxDECORATIVE, wxNORMAL, wxNORMAL, FALSE, "charter" ) );
     dc.DrawText( "Drag text from here!", 20, h-50 );
 
     dc.SetFont( wxFont( 24, wxDECORATIVE, wxNORMAL, wxNORMAL, FALSE, "charter" ) );
     dc.DrawText( "Drag text from here!", 20, h-50 );
 

-    if (m_bitmap.Ok())
-        dc.DrawBitmap( m_bitmap, 280, h-120, TRUE );
-}
-
-void DnDFrame::OnClipboardHasText(wxCommandEvent& WXUNUSED(event))
-{
-    if ( !wxTheClipboard->Open() )
+    if ( m_bitmap.Ok() )

     {
     {

-        wxLogError( _T("Can't open clipboard.") );
-
-        return;
-    }
-
-    if ( !wxTheClipboard->IsSupported( wxDF_TEXT ) )
-    {
-        wxLogMessage( _T("No text on the clipboard") );
-    }
-    else
-    {
-        wxLogMessage( _T("There is text on the clipboard") );
+        // 4/5 is 80% taken by other windows, 20 is arbitrary margin
+        dc.DrawBitmap(m_bitmap,
+                      w - m_bitmap.GetWidth() - 20,
+                      (4*h)/5 + 20);

     }
     }

-
-    wxTheClipboard->Close();

 }
 
 }
 

-void DnDFrame::OnClipboardHasBitmap(wxCommandEvent& WXUNUSED(event))
+void DnDFrame::OnUpdateUIPasteText(wxUpdateUIEvent& event)

 {
 {

-    if ( !wxTheClipboard->Open() )
-    {
-        wxLogError( _T("Can't open clipboard.") );
+#ifdef __WXDEBUG__
+    // too many trace messages if we don't do it - this function is called
+    // very often
+    wxLogNull nolog;
+#endif

 
 

-        return;
-    }
+    event.Enable( wxTheClipboard->IsSupported(wxDF_TEXT) );
+}

 
 

-    if ( !wxTheClipboard->IsSupported( wxDF_BITMAP ) )
-    {
-        wxLogMessage( _T("No bitmap on the clipboard") );
-    }
-    else
-    {
-        wxLogMessage( _T("There is a bitmap on the clipboard") );
-    }
+void DnDFrame::OnUpdateUIPasteBitmap(wxUpdateUIEvent& event)
+{
+#ifdef __WXDEBUG__
+    // too many trace messages if we don't do it - this function is called
+    // very often
+    wxLogNull nolog;
+#endif

 
 

-    wxTheClipboard->Close();
+    event.Enable( wxTheClipboard->IsSupported(wxDF_BITMAP) );

 }
 
 void DnDFrame::OnNewFrame(wxCommandEvent& WXUNUSED(event))
 }
 
 void DnDFrame::OnNewFrame(wxCommandEvent& WXUNUSED(event))


@@ -767,6 +889,8 @@ void DnDFrame::OnHelp(wxCommandEvent& /* event */)
 void DnDFrame::OnLogClear(wxCommandEvent& /* event */ )
 {
     m_ctrlLog->Clear();
 void DnDFrame::OnLogClear(wxCommandEvent& /* event */ )
 {
     m_ctrlLog->Clear();

+    m_ctrlText->Clear();
+    m_ctrlFile->Clear();

 }
 
 void DnDFrame::OnLeftDown(wxMouseEvent &WXUNUSED(event) )
 }
 
 void DnDFrame::OnLeftDown(wxMouseEvent &WXUNUSED(event) )


@@ -775,7 +899,19 @@ void DnDFrame::OnLeftDown(wxMouseEvent &WXUNUSED(event) )
     {
         // start drag operation
         wxTextDataObject textData(m_strText);
     {
         // start drag operation
         wxTextDataObject textData(m_strText);

-        wxDropSource source(textData, this, wxICON(mondrian));
+/*
+        wxFileDataObject textData;
+        textData.AddFile( "/file1.txt" );
+        textData.AddFile( "/file2.txt" );
+*/
+        wxDropSource source(textData, this
+
+#ifdef __WXMSW__
+                            ,wxCURSOR_PENCIL,           // for copy
+                            wxCURSOR_SPRAYCAN,          // for move
+                            wxCURSOR_QUESTION_ARROW     // for nothing
+#endif
+                            );

 
         const char *pc;
 
 
         const char *pc;
 


@@ -795,18 +931,13 @@ void DnDFrame::OnLeftDown(wxMouseEvent &WXUNUSED(event) )
 
 void DnDFrame::OnRightDown(wxMouseEvent &event )
 {
 
 void DnDFrame::OnRightDown(wxMouseEvent &event )
 {

-    wxMenu *menu = new wxMenu;
+    wxMenu menu("Dnd sample menu");

 
 

-    menu->Append(Menu_Drag, "&Test drag...");
-    menu->Append(Menu_About, "&About");
-    menu->Append(Menu_Quit, "E&xit");
-    menu->Append(Menu_ToBeDeleted, "To be deleted");
-    menu->Append(Menu_ToBeGreyed, "To be greyed");
+    menu.Append(Menu_Drag, "&Test drag...");
+    menu.AppendSeparator();
+    menu.Append(Menu_About, "&About");

 
 

-    menu->Delete( Menu_ToBeDeleted );
-    menu->Enable( Menu_ToBeGreyed, FALSE );
-
-    PopupMenu( menu, event.GetX(), event.GetY() );
+    PopupMenu( &menu, event.GetX(), event.GetY() );

 }
 
 DnDFrame::~DnDFrame()
 }
 
 DnDFrame::~DnDFrame()


@@ -908,7 +1039,7 @@ void DnDFrame::OnPasteBitmap(wxCommandEvent& WXUNUSED(event))
     }
 
     wxBitmapDataObject data;
     }
 
     wxBitmapDataObject data;

-    if ( !wxTheClipboard->GetData(&data) )
+    if ( !wxTheClipboard->GetData(data) )

     {
         wxLogError(_T("Can't paste bitmap from the clipboard"));
     }
     {
         wxLogError(_T("Can't paste bitmap from the clipboard"));
     }


@@ -922,6 +1053,58 @@ void DnDFrame::OnPasteBitmap(wxCommandEvent& WXUNUSED(event))
     wxTheClipboard->Close();
 }
 
     wxTheClipboard->Close();
 }
 

+// ----------------------------------------------------------------------------
+// file clipboard
+// ----------------------------------------------------------------------------
+
+void DnDFrame::OnCopyFiles(wxCommandEvent& WXUNUSED(event))
+{
+#ifdef __WXMSW__
+    wxFileDialog dialog(this, "Select a file to copy", "", "",
+                         "All files (*.*)|*.*", 0);
+
+    wxArrayString filenames;
+    while ( dialog.ShowModal() == wxID_OK )
+    {
+        filenames.Add(dialog.GetPath());
+    }
+
+    if ( !filenames.IsEmpty() )
+    {
+        wxFileDataObject *dobj = new wxFileDataObject;
+        size_t count = filenames.GetCount();
+        for ( size_t n = 0; n < count; n++ )
+        {
+            dobj->AddFile(filenames[n]);
+        }
+
+        wxClipboardLocker locker;
+        if ( !locker )
+        {
+            wxLogError("Can't open clipboard");
+        }
+        else
+        {
+            if ( !wxTheClipboard->AddData(dobj) )
+            {
+                wxLogError("Can't copy file(s) to the clipboard");
+            }
+            else
+            {
+                wxLogStatus(this, "%d file%s copied to the clipboard",
+                            count, count == 1 ? "" : "s");
+            }
+        }
+    }
+    else
+    {
+        wxLogStatus(this, "Aborted");
+    }
+#else // !MSW
+    wxLogError("Sorry, not implemented");
+#endif // MSW/!MSW
+}
+

 // ---------------------------------------------------------------------------
 // text clipboard
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // text clipboard
 // ---------------------------------------------------------------------------


@@ -965,7 +1148,7 @@ void DnDFrame::OnPaste(wxCommandEvent& WXUNUSED(event))
     }
 
     wxTextDataObject text;
     }
 
     wxTextDataObject text;

-    if ( !wxTheClipboard->GetData(&text) )
+    if ( !wxTheClipboard->GetData(text) )

     {
         wxLogError(_T("Can't paste data from the clipboard"));
     }
     {
         wxLogError(_T("Can't paste data from the clipboard"));
     }


@@ -982,21 +1165,21 @@ void DnDFrame::OnPaste(wxCommandEvent& WXUNUSED(event))
 // Notifications called by the base class
 // ----------------------------------------------------------------------------
 
 // Notifications called by the base class
 // ----------------------------------------------------------------------------
 

-bool DnDText::OnDropText( wxDropPointCoord, wxDropPointCoord, const wxChar *psz )
+bool DnDText::OnDropText(wxCoord, wxCoord, const wxString& text)

 {
 {

-    m_pOwner->Append(psz);
+    m_pOwner->Append(text);

 
     return TRUE;
 }
 
 
     return TRUE;
 }
 

-bool DnDFile::OnDropFiles( wxDropPointCoord, wxDropPointCoord, size_t nFiles,
-                           const wxChar* const aszFiles[])
+bool DnDFile::OnDropFiles(wxCoord, wxCoord, const wxArrayString& filenames)

 {
 {

+    size_t nFiles = filenames.GetCount();

     wxString str;
     str.Printf( _T("%d files dropped"), nFiles);
     m_pOwner->Append(str);
     for ( size_t n = 0; n < nFiles; n++ ) {
     wxString str;
     str.Printf( _T("%d files dropped"), nFiles);
     m_pOwner->Append(str);
     for ( size_t n = 0; n < nFiles; n++ ) {

-        m_pOwner->Append(aszFiles[n]);
+        m_pOwner->Append(filenames[n]);

     }
 
     return TRUE;
     }
 
     return TRUE;


@@ -1034,6 +1217,7 @@ DnDShape *DnDShapeDialog::GetShape() const
 
 bool DnDShapeDialog::TransferDataToWindow()
 {
 
 bool DnDShapeDialog::TransferDataToWindow()
 {

+

     if ( m_shape )
     {
         m_radio->SetSelection(m_shape->GetKind());
     if ( m_shape )
     {
         m_radio->SetSelection(m_shape->GetKind());


@@ -1097,29 +1281,49 @@ void DnDShapeDialog::OnColour(wxCommandEvent& WXUNUSED(event))
 // DnDShapeFrame
 // ----------------------------------------------------------------------------
 
 // DnDShapeFrame
 // ----------------------------------------------------------------------------
 

+DnDShapeFrame *DnDShapeFrame::ms_lastDropTarget = NULL;
+

 DnDShapeFrame::DnDShapeFrame(wxFrame *parent)
              : wxFrame(parent, -1, "Shape Frame",
                        wxDefaultPosition, wxSize(250, 150))
 {
 DnDShapeFrame::DnDShapeFrame(wxFrame *parent)
              : wxFrame(parent, -1, "Shape Frame",
                        wxDefaultPosition, wxSize(250, 150))
 {

-    SetBackgroundColour(*wxWHITE);
-

     CreateStatusBar();
 
     CreateStatusBar();
 

-    SetStatusText("Double click the frame to create a shape");
+    wxMenu *menuShape = new wxMenu;
+    menuShape->Append(Menu_Shape_New, "&New default shape\tCtrl-S");
+    menuShape->Append(Menu_Shape_Edit, "&Edit shape\tCtrl-E");
+    menuShape->AppendSeparator();
+    menuShape->Append(Menu_Shape_Clear, "&Clear shape\tDel");
+
+    wxMenu *menuClipboard = new wxMenu;
+    menuClipboard->Append(Menu_ShapeClipboard_Copy, "&Copy\tCtrl-C");
+    menuClipboard->Append(Menu_ShapeClipboard_Paste, "&Paste\tCtrl-V");
+
+    wxMenuBar *menubar = new wxMenuBar;
+    menubar->Append(menuShape, "&Shape");
+    menubar->Append(menuClipboard, "&Clipboard");
+
+    SetMenuBar(menubar);
+
+    SetStatusText("Press Ctrl-S to create a new shape");

 
     SetDropTarget(new DnDShapeDropTarget(this));
 
     m_shape = NULL;
 
     SetDropTarget(new DnDShapeDropTarget(this));
 
     m_shape = NULL;

+    
+    SetBackgroundColour(*wxWHITE);

 }
 
 DnDShapeFrame::~DnDShapeFrame()
 {
 }
 
 DnDShapeFrame::~DnDShapeFrame()
 {

-    delete m_shape;
+    if (m_shape) 
+        delete m_shape;

 }
 
 void DnDShapeFrame::SetShape(DnDShape *shape)
 {
 }
 
 void DnDShapeFrame::SetShape(DnDShape *shape)
 {

-    delete m_shape;
+    if (m_shape) 
+        delete m_shape;

     m_shape = shape;
     Refresh();
 }
     m_shape = shape;
     Refresh();
 }


@@ -1136,7 +1340,7 @@ void DnDShapeFrame::OnDrag(wxMouseEvent& event)
 
     // start drag operation
     DnDShapeDataObject shapeData(m_shape);
 
     // start drag operation
     DnDShapeDataObject shapeData(m_shape);

-    wxDropSource source(shapeData, this, wxICON(mondrian));
+    wxDropSource source(shapeData, this);

 
     const char *pc = NULL;
     switch ( source.DoDragDrop(TRUE) )
 
     const char *pc = NULL;
     switch ( source.DoDragDrop(TRUE) )


@@ -1156,7 +1360,11 @@ void DnDShapeFrame::OnDrag(wxMouseEvent& event)
 
         case wxDragMove:
             pc = "moved";
 
         case wxDragMove:
             pc = "moved";

-            SetShape(NULL);
+            if ( ms_lastDropTarget != this )
+            {
+                // don't delete the shape if we dropped it on ourselves!
+                SetShape(NULL);
+            }

             break;
 
         case wxDragCancel:
             break;
 
         case wxDragCancel:


@@ -1171,7 +1379,21 @@ void DnDShapeFrame::OnDrag(wxMouseEvent& event)
     //else: status text already set
 }
 
     //else: status text already set
 }
 

-void DnDShapeFrame::OnEdit(wxMouseEvent& event)
+void DnDShapeFrame::OnDrop(wxCoord x, wxCoord y, DnDShape *shape)
+{
+    ms_lastDropTarget = this;
+
+    wxPoint pt(x, y);
+
+    wxString s;
+    s.Printf("Shape dropped at (%ld, %ld)", pt.x, pt.y);
+    SetStatusText(s);
+
+    shape->Move(pt);
+    SetShape(shape);
+}
+
+void DnDShapeFrame::OnEditShape(wxCommandEvent& event)

 {
     DnDShapeDialog dlg(this, m_shape);
     if ( dlg.ShowModal() == wxID_OK )
 {
     DnDShapeDialog dlg(this, m_shape);
     if ( dlg.ShowModal() == wxID_OK )


@@ -1180,26 +1402,82 @@ void DnDShapeFrame::OnEdit(wxMouseEvent& event)
 
         if ( m_shape )
         {
 
         if ( m_shape )
         {

-            SetStatusText("Right click now drag the shape to another frame");
+            SetStatusText("You can now drag the shape to another frame");

         }
     }
 }
 
         }
     }
 }
 

-void DnDShapeFrame::OnPaint(wxPaintEvent& event)
+void DnDShapeFrame::OnNewShape(wxCommandEvent& event)
+{
+    SetShape(new DnDEllipticShape(wxPoint(10, 10), wxSize(80, 60), *wxRED));
+
+    SetStatusText("You can now drag the shape to another frame");
+}
+
+void DnDShapeFrame::OnClearShape(wxCommandEvent& event)
+{
+    SetShape(NULL);
+}
+
+void DnDShapeFrame::OnCopyShape(wxCommandEvent& event)

 {
     if ( m_shape )
 {
     if ( m_shape )

-        m_shape->Draw(wxPaintDC(this));
+    {
+        wxClipboardLocker clipLocker;
+        if ( !clipLocker )
+        {
+            wxLogError("Can't open the clipboard");
+
+            return;
+        }
+
+        wxTheClipboard->AddData(new DnDShapeDataObject(m_shape));
+    }
+}
+
+void DnDShapeFrame::OnPasteShape(wxCommandEvent& event)
+{
+    wxClipboardLocker clipLocker;
+    if ( !clipLocker )
+    {
+        wxLogError("Can't open the clipboard");
+
+        return;
+    }
+
+    DnDShapeDataObject shapeDataObject(NULL);
+    if ( wxTheClipboard->GetData(shapeDataObject) )
+    {
+        SetShape(shapeDataObject.GetShape());
+    }

     else
     else

-        event.Skip();
+    {
+        wxLogStatus("No shape on the clipboard");
+    }

 }
 
 }
 

-void DnDShapeFrame::OnDrop(long x, long y, DnDShape *shape)
+void DnDShapeFrame::OnUpdateUICopy(wxUpdateUIEvent& event)

 {
 {

-    wxString s;
-    s.Printf("Drop occured at (%ld, %ld)", x, y);
-    SetStatusText(s);
+    event.Enable( m_shape != NULL );
+}

 
 

-    SetShape(shape);
+void DnDShapeFrame::OnUpdateUIPaste(wxUpdateUIEvent& event)
+{
+    event.Enable( wxTheClipboard->IsSupported(wxDataFormat(shapeFormatId)) );
+}
+
+void DnDShapeFrame::OnPaint(wxPaintEvent& event)
+{
+    if ( m_shape )
+    {
+        wxPaintDC dc(this);
+
+        m_shape->Draw(dc);
+    }
+    else
+    {
+        event.Skip();
+    }

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -1238,9 +1516,15 @@ DnDShape *DnDShape::New(const void *buf)
 
 void DnDShapeDataObject::CreateBitmap() const
 {
 
 void DnDShapeDataObject::CreateBitmap() const
 {

-    wxBitmap bitmap;
+    wxPoint pos = m_shape->GetPosition();
+    wxSize size = m_shape->GetSize();
+    int x = pos.x + size.x,
+        y = pos.y + size.y;
+    wxBitmap bitmap(x, y);

     wxMemoryDC dc;
     dc.SelectObject(bitmap);
     wxMemoryDC dc;
     dc.SelectObject(bitmap);

+    dc.SetBrush(wxBrush("white", wxSOLID));
+    dc.Clear();

     m_shape->Draw(dc);
     dc.SelectObject(wxNullBitmap);
 
     m_shape->Draw(dc);
     dc.SelectObject(wxNullBitmap);