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 546028fb2c803416da630f0f316b94b9f34d3f06..0b26e485d87ddba1c55d05254cce19255fc9e160 100644 (file)
--- a/samples/dnd/dnd.cpp
+++ b/samples/dnd/dnd.cpp
@@ -4,9 +4,9 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     04/01/98
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     04/01/98

-// RCS-ID:
+// RCS-ID:      $Id$

 // Copyright:
 // Copyright:

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"


@@ -19,121 +19,671 @@
 #include "wx/wx.h"
 #endif
 
 #include "wx/wx.h"
 #endif
 

-#include  "wx/intl.h"
-#include  "wx/log.h"
+#if !wxUSE_DRAG_AND_DROP
+    #error This sample requires drag and drop support in the library
+#endif
+
+#include "wx/intl.h"
+#include "wx/log.h"

 
 

-#include  "wx/dnd.h"
+#include "wx/dnd.h"
+#include "wx/dirdlg.h"
+#include "wx/filedlg.h"
+#include "wx/image.h"
+#include "wx/clipbrd.h"
+#include "wx/colordlg.h"
+#include "wx/resource.h"

 
 

-#ifdef __WXGTK__
-#include "mondrian.xpm"
+#if defined(__WXGTK__) || defined(__WXMOTIF__)
+    #include "mondrian.xpm"

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------

-// Derive 2 simple classes which just put in the listbox the strings (text or
+// Derive two simple classes which just put in the listbox the strings (text or

 // file names) we drop on them
 // ----------------------------------------------------------------------------
 // file names) we drop on them
 // ----------------------------------------------------------------------------

+

 class DnDText : public wxTextDropTarget
 {
 public:
 class DnDText : public wxTextDropTarget
 {
 public:

-  DnDText(wxListBox *pOwner) { m_pOwner = pOwner; }
+    DnDText(wxListBox *pOwner) { m_pOwner = pOwner; }

 
 

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

 
 private:
 
 private:

-  wxListBox *m_pOwner;
+    wxListBox *m_pOwner;

 };
 
 class DnDFile : public wxFileDropTarget
 {
 public:
 };
 
 class DnDFile : public wxFileDropTarget
 {
 public:

-  DnDFile(wxListBox *pOwner) { m_pOwner = pOwner; }
+    DnDFile(wxListBox *pOwner) { m_pOwner = pOwner; }

 
 

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

 
 private:
 
 private:

-  wxListBox *m_pOwner;
+    wxListBox *m_pOwner;

 };
 
 // ----------------------------------------------------------------------------
 // Define a new application type
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------
 // Define a new application type
 // ----------------------------------------------------------------------------

+

 class DnDApp : public wxApp
 class DnDApp : public wxApp

-{ 
+{

 public:
 public:

-  bool OnInit();
+    virtual bool OnInit();

 };
 
 IMPLEMENT_APP(DnDApp);
 
 // ----------------------------------------------------------------------------
 };
 
 IMPLEMENT_APP(DnDApp);
 
 // ----------------------------------------------------------------------------

-// Define a new frame type
+// Define a new frame type for the main frame

 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------

+

 class DnDFrame : public wxFrame
 class DnDFrame : public wxFrame

-{ 
+{
+public:
+    DnDFrame(wxFrame *frame, char *title, int x, int y, int w, int h);
+    ~DnDFrame();
+
+    void OnPaint(wxPaintEvent& event);
+    void OnQuit (wxCommandEvent& event);
+    void OnAbout(wxCommandEvent& event);
+    void OnDrag (wxCommandEvent& event);
+    void OnNewFrame(wxCommandEvent& event);
+    void OnHelp (wxCommandEvent& event);
+    void OnLogClear(wxCommandEvent& event);
+
+    void OnCopy(wxCommandEvent& event);
+    void OnPaste(wxCommandEvent& event);
+
+    void OnCopyBitmap(wxCommandEvent& event);
+    void OnPasteBitmap(wxCommandEvent& event);
+
+    void OnCopyFiles(wxCommandEvent& event);
+
+    void OnLeftDown(wxMouseEvent& event);
+    void OnRightDown(wxMouseEvent& event);
+
+    void OnUpdateUIPasteText(wxUpdateUIEvent& event);
+    void OnUpdateUIPasteBitmap(wxUpdateUIEvent& event);
+
+    DECLARE_EVENT_TABLE()
+
+private:
+    wxListBox  *m_ctrlFile,
+               *m_ctrlText;
+    wxTextCtrl *m_ctrlLog;
+
+    wxLog *m_pLog,
+          *m_pLogPrev;
+
+    wxString  m_strText;
+    wxBitmap  m_bitmap;
+};
+
+// ----------------------------------------------------------------------------
+// A shape is an example of application-specific data which may be transported
+// via drag-and-drop or clipboard: in our case, we have different geometric
+// shapes, each one with its own colour and position
+// ----------------------------------------------------------------------------
+
+class DnDShape
+{
+public:
+    enum Kind
+    {
+        None,
+        Triangle,
+        Rectangle,
+        Ellipse
+    };
+
+    DnDShape(const wxPoint& pos,
+             const wxSize& size,
+             const wxColour& col)
+        : m_pos(pos), m_size(size), m_col(col)
+    {
+    }
+
+    // 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
+    // some bitwise-copiable data (might use streams too...)
+    // ------------------------------------------------------------------------
+
+    // restore from buffer
+    static DnDShape *New(const void *buf);
+
+    virtual size_t GetDataSize() const
+    {
+        return sizeof(ShapeDump);
+    }
+
+    virtual void GetDataHere(void *buf) const
+    {
+        ShapeDump& dump = *(ShapeDump *)buf;
+        dump.x = m_pos.x;
+        dump.y = m_pos.y;
+        dump.w = m_size.x;
+        dump.h = m_size.y;
+        dump.r = m_col.Red();
+        dump.g = m_col.Green();
+        dump.b = m_col.Blue();
+        dump.k = GetKind();
+    }
+
+    // accessors
+    const wxPoint& GetPosition() const { return m_pos; }
+    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;
+
+    virtual void Draw(wxDC& dc)
+    {
+        dc.SetPen(wxPen(m_col, 1, wxSOLID));
+    }
+
+protected:
+    wxPoint GetCentre() const
+        { return wxPoint(m_pos.x + m_size.x / 2, m_pos.y + m_size.y / 2); }
+
+    struct ShapeDump
+    {
+        int x, y,       // position
+            w, h,       // size
+            r, g, b,    // colour
+            k;          // kind
+    };
+
+    wxPoint  m_pos;
+    wxSize   m_size;
+    wxColour m_col;
+};
+
+class DnDTriangularShape : public DnDShape
+{
+public:
+    DnDTriangularShape(const wxPoint& pos,
+                       const wxSize& size,
+                       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 void Draw(wxDC& dc)
+    {
+        DnDShape::Draw(dc);
+
+        // well, it's a bit difficult to describe a triangle by position and
+        // size, but we're not doing geometry here, do we? ;-)
+        wxPoint p1(m_pos);
+        wxPoint p2(m_pos.x + m_size.x, m_pos.y);
+        wxPoint p3(m_pos.x, m_pos.y + m_size.y);
+
+        dc.DrawLine(p1, p2);
+        dc.DrawLine(p2, p3);
+        dc.DrawLine(p3, p1);
+
+#ifdef __WXMSW__
+        dc.FloodFill(GetCentre(), m_col, wxFLOOD_BORDER);
+#endif
+    }
+};
+
+class DnDRectangularShape : public DnDShape
+{
+public:
+    DnDRectangularShape(const wxPoint& pos,
+                        const wxSize& size,
+                        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 void Draw(wxDC& dc)
+    {
+        DnDShape::Draw(dc);
+
+        wxPoint p1(m_pos);
+        wxPoint p2(p1.x + m_size.x, p1.y);
+        wxPoint p3(p2.x, p2.y + m_size.y);
+        wxPoint p4(p1.x, p3.y);
+
+        dc.DrawLine(p1, p2);
+        dc.DrawLine(p2, p3);
+        dc.DrawLine(p3, p4);
+        dc.DrawLine(p4, p1);
+
+#ifdef __WXMSW__
+        dc.FloodFill(GetCentre(), m_col, wxFLOOD_BORDER);
+#endif
+    }
+};
+
+class DnDEllipticShape : public DnDShape
+{
+public:
+    DnDEllipticShape(const wxPoint& pos,
+                     const wxSize& size,
+                     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 void Draw(wxDC& dc)
+    {
+        DnDShape::Draw(dc);
+
+        dc.DrawEllipse(m_pos, m_size);
+
+#ifdef __WXMSW__
+        dc.FloodFill(GetCentre(), m_col, wxFLOOD_BORDER);
+#endif
+    }
+};
+
+// ----------------------------------------------------------------------------
+// A wxDataObject specialisation for the application-specific data
+// ----------------------------------------------------------------------------
+
+static const char *shapeFormatId = "wxShape";
+
+class DnDShapeDataObject : public wxDataObject
+{
+public:
+    // ctor doesn't copy the pointer, so it shouldn't go away while this object
+    // is alive
+    DnDShapeDataObject(DnDShape *shape = (DnDShape *)NULL)
+    {
+        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
+        m_formatShape.SetId(shapeFormatId);
+
+        // we don't draw the shape to a bitmap until it's really needed (i.e.
+        // we're asked to do so)
+        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
+    // ----------------------------------
+
+    virtual wxDataFormat GetPreferredFormat(Direction WXUNUSED(dir)) const
+    {
+        return m_formatShape;
+    }
+
+    virtual size_t GetFormatCount(Direction dir) const
+    {
+        // 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, Direction dir) const
+    {
+        formats[0] = m_formatShape;
+        if ( dir == Get )
+        {
+            m_dataobj.GetAllFormats(&formats[1], dir);
+        }
+    }
+
+    virtual size_t GetDataSize(const wxDataFormat& format) const
+    {
+        if ( format == m_formatShape )
+        {
+            return m_shape->GetDataSize();
+        }
+        else
+        {
+            if ( !m_hasBitmap )
+                CreateBitmap();
+
+            return m_dataobj.GetDataSize();
+        }
+    }
+
+    virtual bool GetDataHere(const wxDataFormat& format, void *pBuf) const
+    {
+        if ( format == m_formatShape )
+        {
+            m_shape->GetDataHere(pBuf);
+
+            return TRUE;
+        }
+        else
+        {
+            if ( !m_hasBitmap )
+                CreateBitmap();
+
+            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;
+
+    wxDataFormat        m_formatShape;  // our custom format
+
+    wxBitmapDataObject  m_dataobj;      // it handles bitmaps
+    bool                m_hasBitmap;    // true if m_dataobj has valid bitmap
+
+    DnDShape           *m_shape;        // our data
+};
+
+// ----------------------------------------------------------------------------
+// A dialog to edit shape properties
+// ----------------------------------------------------------------------------
+
+class DnDShapeDialog : public wxDialog
+{
+public:
+    DnDShapeDialog(wxFrame *parent, DnDShape *shape);
+
+    DnDShape *GetShape() const;
+
+    virtual bool TransferDataToWindow();
+    virtual bool TransferDataFromWindow();
+
+    void OnColour(wxCommandEvent& event);
+
+private:
+    // input
+    DnDShape *m_shape;
+
+    // output
+    DnDShape::Kind m_shapeKind;
+    wxPoint  m_pos;
+    wxSize   m_size;
+    wxColour m_col;
+
+    // controls
+    wxRadioBox *m_radio;
+    wxTextCtrl *m_textX,
+               *m_textY,
+               *m_textW,
+               *m_textH;
+
+    DECLARE_EVENT_TABLE()
+};
+
+// ----------------------------------------------------------------------------
+// A frame for the shapes which can be drag-and-dropped between frames
+// ----------------------------------------------------------------------------
+
+class DnDShapeFrame : public wxFrame
+{

 public:
 public:

-  DnDFrame(wxFrame *frame, char *title, int x, int y, int w, int h);
- ~DnDFrame();
+    DnDShapeFrame(wxFrame *parent);
+    ~DnDShapeFrame();
+
+    void SetShape(DnDShape *shape);

 
 

-  void OnPaint(wxPaintEvent& event);
-  void OnQuit (wxCommandEvent& event);
-  void OnAbout(wxCommandEvent& event);
-  void OnDrag (wxCommandEvent& event);
-  void OnHelp (wxCommandEvent& event);
-  void OnLogClear(wxCommandEvent& event);
+    // callbacks
+    void OnNewShape(wxCommandEvent& event);
+    void OnEditShape(wxCommandEvent& event);
+    void OnClearShape(wxCommandEvent& event);

 
 

-  void OnLeftDown(wxMouseEvent& event);
-  void OnRightDown(wxMouseEvent& event);
+    void OnCopyShape(wxCommandEvent& event);
+    void OnPasteShape(wxCommandEvent& event);

 
 

-  bool OnClose();
-  
-  DECLARE_EVENT_TABLE()
+    void OnUpdateUICopy(wxUpdateUIEvent& event);
+    void OnUpdateUIPaste(wxUpdateUIEvent& event);
+
+    void OnDrag(wxMouseEvent& event);
+    void OnPaint(wxPaintEvent& event);
+    void OnDrop(wxCoord x, wxCoord y, DnDShape *shape);

 
 private:
 
 private:

-  wxListBox  *m_ctrlFile,
-             *m_ctrlText;
-  wxTextCtrl *m_ctrlLog;
+    DnDShape *m_shape;
+
+    static DnDShapeFrame *ms_lastDropTarget;
+
+    DECLARE_EVENT_TABLE()
+};
+
+// ----------------------------------------------------------------------------
+// wxDropTarget derivation for DnDShapes
+// ----------------------------------------------------------------------------
+
+class DnDShapeDropTarget : public wxDropTarget
+{
+public:
+    DnDShapeDropTarget(DnDShapeFrame *frame)
+        : wxDropTarget(new DnDShapeDataObject)
+    {
+        m_frame = frame;
+    }

 
 

-  wxLog *m_pLog, *m_pLogPrev;
+    // override base class (pure) virtuals
+    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 wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def)
+    {
+        if ( !GetData() )
+        {
+            wxLogError("Failed to get drag and drop data");
+
+            return wxDragNone;
+        }
+
+        m_frame->OnDrop(x, y,
+                        ((DnDShapeDataObject *)GetDataObject())->GetShape());
+
+        return def;
+    }

 
 

-  wxString m_strText;
+private:
+    DnDShapeFrame *m_frame;

 };
 
 // ----------------------------------------------------------------------------
 // IDs for the menu commands
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------
 // IDs for the menu commands
 // ----------------------------------------------------------------------------

+

 enum
 {
 enum
 {

-  Menu_Quit = 1,
-  Menu_Drag,
-  Menu_About = 101,
-  Menu_Help,
-  Menu_Clear,
+    Menu_Quit = 1,
+    Menu_Drag,
+    Menu_NewFrame,
+    Menu_About = 101,
+    Menu_Help,
+    Menu_Clear,
+    Menu_Copy,
+    Menu_Paste,
+    Menu_CopyBitmap,
+    Menu_PasteBitmap,
+    Menu_CopyFiles,
+    Menu_Shape_New = 500,
+    Menu_Shape_Edit,
+    Menu_Shape_Clear,
+    Menu_ShapeClipboard_Copy,
+    Menu_ShapeClipboard_Paste,
+    Button_Colour = 1001

 };
 
 BEGIN_EVENT_TABLE(DnDFrame, wxFrame)
 };
 
 BEGIN_EVENT_TABLE(DnDFrame, wxFrame)

-  EVT_MENU(Menu_Quit,  DnDFrame::OnQuit)
-  EVT_MENU(Menu_About, DnDFrame::OnAbout)
-  EVT_MENU(Menu_Drag,  DnDFrame::OnDrag)
-  EVT_MENU(Menu_Help,  DnDFrame::OnHelp)
-  EVT_MENU(Menu_Clear, DnDFrame::OnLogClear)
-  EVT_LEFT_DOWN(OnLeftDown)
-  EVT_RIGHT_DOWN(OnRightDown)
+    EVT_MENU(Menu_Quit,       DnDFrame::OnQuit)
+    EVT_MENU(Menu_About,      DnDFrame::OnAbout)
+    EVT_MENU(Menu_Drag,       DnDFrame::OnDrag)
+    EVT_MENU(Menu_NewFrame,   DnDFrame::OnNewFrame)
+    EVT_MENU(Menu_Help,       DnDFrame::OnHelp)
+    EVT_MENU(Menu_Clear,      DnDFrame::OnLogClear)
+    EVT_MENU(Menu_Copy,       DnDFrame::OnCopy)
+    EVT_MENU(Menu_Paste,      DnDFrame::OnPaste)
+    EVT_MENU(Menu_CopyBitmap, DnDFrame::OnCopyBitmap)
+    EVT_MENU(Menu_PasteBitmap,DnDFrame::OnPasteBitmap)
+    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_PAINT(                DnDFrame::OnPaint)
+END_EVENT_TABLE()
+
+BEGIN_EVENT_TABLE(DnDShapeFrame, wxFrame)
+    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_BUTTON(Button_Colour, DnDShapeDialog::OnColour)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

+// ============================================================================
+// implementation
+// ============================================================================
+

 // `Main program' equivalent, creating windows and returning main app frame
 // `Main program' equivalent, creating windows and returning main app frame

-bool DnDApp::OnInit(void)
+bool DnDApp::OnInit()

 {
 {

-  // create the main frame window
-  DnDFrame *frame = new DnDFrame((wxFrame  *) NULL, "Drag & Drop wxWindows App", 
-                                 50, 50, 450, 340);
+    // 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
+
+    // under X we usually want to use the primary selection by default (which
+    // is shared with other apps)
+    wxTheClipboard->UsePrimarySelection();

 
 

-  // activate it
-  frame->Show(TRUE);
+    // create the main frame window
+    DnDFrame *frame = new DnDFrame((wxFrame  *) NULL,
+                                   "Drag-and-Drop/Clipboard wxWindows Sample",
+                                   10, 10, 450, 340);

 
 

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

 
 

-  return TRUE;
+    SetTopWindow(frame);
+
+    return TRUE;

 }
 
 DnDFrame::DnDFrame(wxFrame *frame, char *title, int x, int y, int w, int h)
 }
 
 DnDFrame::DnDFrame(wxFrame *frame, char *title, int x, int y, int w, int h)


@@ -141,217 +691,845 @@ DnDFrame::DnDFrame(wxFrame *frame, char *title, int x, int y, int w, int h)
           m_strText("wxWindows drag & drop works :-)")
 
 {
           m_strText("wxWindows drag & drop works :-)")
 
 {

+    // frame icon and status bar
+    SetIcon(wxICON(mondrian));
+
+    CreateStatusBar();
+
+    // construct menu
+    wxMenu *file_menu = new wxMenu;
+    file_menu->Append(Menu_Drag, "&Test drag...");
+    file_menu->AppendSeparator();
+    file_menu->Append(Menu_NewFrame, "&New frame\tCtrl-N");
+    file_menu->AppendSeparator();
+    file_menu->Append(Menu_Quit, "E&xit");
+
+    wxMenu *log_menu = new wxMenu;
+    log_menu->Append(Menu_Clear, "Clear\tCtrl-L");
+
+    wxMenu *help_menu = new wxMenu;
+    help_menu->Append(Menu_Help, "&Help...");
+    help_menu->AppendSeparator();
+    help_menu->Append(Menu_About, "&About");
+
+    wxMenu *clip_menu = new wxMenu;
+    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\tAlt+C");
+    clip_menu->Append(Menu_PasteBitmap, "&Paste bitmap\tAlt+V");
+    clip_menu->AppendSeparator();
+    clip_menu->Append(Menu_CopyFiles, "&Copy files\tCtrl+F");
+
+    wxMenuBar *menu_bar = new wxMenuBar;
+    menu_bar->Append(file_menu, "&File");
+    menu_bar->Append(log_menu,  "&Log");
+    menu_bar->Append(clip_menu, "&Clipboard");
+    menu_bar->Append(help_menu, "&Help");
+
+    SetMenuBar(menu_bar);
+
+    // make a panel with 3 subwindows
+    wxPoint pos(0, 0);
+    wxSize  size(400, 200);
+
+    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_ctrlLog   = new wxTextCtrl(this, -1, "", pos, size,
+                                 wxTE_MULTILINE | wxTE_READONLY |
+                                 wxSUNKEN_BORDER );
+
+    // redirect log messages to the text window
+    m_pLog = new wxLogTextCtrl(m_ctrlLog);
+    m_pLogPrev = wxLog::SetActiveTarget(m_pLog);
+
+    // associate drop targets with 2 text controls
+    m_ctrlFile->SetDropTarget(new DnDFile(m_ctrlFile));
+    m_ctrlText->SetDropTarget(new DnDText(m_ctrlText));
+
+    wxLayoutConstraints *c;
+
+    // Top-left listbox
+    c = new wxLayoutConstraints;
+    c->left.SameAs(this, wxLeft);
+    c->top.SameAs(this, wxTop);
+    c->right.PercentOf(this, wxRight, 50);
+    c->height.PercentOf(this, wxHeight, 30);
+    m_ctrlFile->SetConstraints(c);
+
+    // Top-right listbox
+    c = new wxLayoutConstraints;
+    c->left.SameAs    (m_ctrlFile, wxRight);
+    c->top.SameAs     (this, wxTop);
+    c->right.SameAs   (this, wxRight);
+    c->height.PercentOf(this, wxHeight, 30);
+    m_ctrlText->SetConstraints(c);
+
+    // Lower text control
+    c = new wxLayoutConstraints;
+    c->left.SameAs    (this, wxLeft);
+    c->right.SameAs   (this, wxRight);
+    c->height.PercentOf(this, wxHeight, 50);
+    c->top.SameAs(m_ctrlText, wxBottom);
+    m_ctrlLog->SetConstraints(c);
+
+    SetAutoLayout(TRUE);
+}
+
+void DnDFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
+{
+    Close(TRUE);
+}
+
+void DnDFrame::OnPaint(wxPaintEvent& WXUNUSED(event))
+{
+    int w = 0;
+    int h = 0;
+    GetClientSize( &w, &h );
+
+    wxPaintDC dc(this);
+    dc.SetFont( wxFont( 24, wxDECORATIVE, wxNORMAL, wxNORMAL, FALSE, "charter" ) );
+    dc.DrawText( "Drag text from here!", 20, h-50 );
+
+    if ( m_bitmap.Ok() )
+    {
+        // 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);
+    }
+}
+
+void DnDFrame::OnUpdateUIPasteText(wxUpdateUIEvent& event)
+{
+#ifdef __WXDEBUG__
+    // too many trace messages if we don't do it - this function is called
+    // very often
+    wxLogNull nolog;
+#endif
+
+    event.Enable( wxTheClipboard->IsSupported(wxDF_TEXT) );
+}
+
+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
+
+    event.Enable( wxTheClipboard->IsSupported(wxDF_BITMAP) );
+}
+
+void DnDFrame::OnNewFrame(wxCommandEvent& WXUNUSED(event))
+{
+    (new DnDShapeFrame(this))->Show(TRUE);
+
+    wxLogStatus(this, "Double click the new frame to select a shape for it");
+}
+
+void DnDFrame::OnDrag(wxCommandEvent& WXUNUSED(event))
+{
+    wxString strText = wxGetTextFromUser
+        (
+         "After you enter text in this dialog, press any mouse\n"
+         "button in the bottom (empty) part of the frame and \n"
+         "drag it anywhere - you will be in fact dragging the\n"
+         "text object containing this text",
+         "Please enter some text", m_strText, this
+        );
+
+    m_strText = strText;
+}
+
+void DnDFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
+{
+    wxMessageBox("Drag-&-Drop Demo\n"
+                 "Please see \"Help|Help...\" for details\n"
+                 "Copyright (c) 1998 Vadim Zeitlin",
+                 "About wxDnD",
+                 wxICON_INFORMATION | wxOK,
+                 this);
+}
+
+void DnDFrame::OnHelp(wxCommandEvent& /* event */)
+{
+    wxMessageDialog dialog(this,
+            "This small program demonstrates drag & drop support in wxWindows. The program window\n"
+            "consists of 3 parts: the bottom pane is for debug messages, so that you can see what's\n"
+            "going on inside. The top part is split into 2 listboxes, the left one accepts files\n"
+            "and the right one accepts text.\n"
+            "\n"
+            "To test wxDropTarget: open wordpad (write.exe), select some text in it and drag it to\n"
+            "the right listbox (you'll notice the usual visual feedback, i.e. the cursor will change).\n"
+            "Also, try dragging some files (you can select several at once) from Windows Explorer (or \n"
+            "File Manager) to the left pane. Hold down Ctrl/Shift keys when you drop text (doesn't \n"
+            "work with files) and see what changes.\n"
+            "\n"
+            "To test wxDropSource: just press any mouse button on the empty zone of the window and drag\n"
+            "it to wordpad or any other droptarget accepting text (and of course you can just drag it\n"
+            "to the right pane). Due to a lot of trace messages, the cursor might take some time to \n"
+            "change, don't release the mouse button until it does. You can change the string being\n"
+            "dragged in in \"File|Test drag...\" dialog.\n"
+            "\n"
+            "\n"
+            "Please send all questions/bug reports/suggestions &c to \n"
+            "Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>",
+            "wxDnD Help");
+
+    dialog.ShowModal();
+}
+
+void DnDFrame::OnLogClear(wxCommandEvent& /* event */ )
+{
+    m_ctrlLog->Clear();
+    m_ctrlText->Clear();
+    m_ctrlFile->Clear();
+}
+
+void DnDFrame::OnLeftDown(wxMouseEvent &WXUNUSED(event) )
+{
+    if ( !m_strText.IsEmpty() )
+    {
+        // start drag operation
+        wxTextDataObject textData(m_strText);
+/*
+        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;
+
+        switch ( source.DoDragDrop(TRUE) )
+        {
+            case wxDragError:   pc = "Error!";    break;
+            case wxDragNone:    pc = "Nothing";   break;
+            case wxDragCopy:    pc = "Copied";    break;
+            case wxDragMove:    pc = "Moved";     break;
+            case wxDragCancel:  pc = "Cancelled"; break;
+            default:            pc = "Huh?";      break;
+        }
+
+        SetStatusText(wxString("Drag result: ") + pc);
+    }
+}
+
+void DnDFrame::OnRightDown(wxMouseEvent &event )
+{
+    wxMenu menu("Dnd sample menu");
+
+    menu.Append(Menu_Drag, "&Test drag...");
+    menu.AppendSeparator();
+    menu.Append(Menu_About, "&About");
+
+    PopupMenu( &menu, event.GetX(), event.GetY() );
+}
+
+DnDFrame::~DnDFrame()
+{
+    if ( m_pLog != NULL ) {
+        if ( wxLog::SetActiveTarget(m_pLogPrev) == m_pLog )
+            delete m_pLog;
+    }
+}
+
+// ---------------------------------------------------------------------------
+// bitmap clipboard
+// ---------------------------------------------------------------------------

 
 

+void DnDFrame::OnCopyBitmap(wxCommandEvent& WXUNUSED(event))
+{
+    // PNG support is not always compiled in under Windows, so use BMP there

 #ifdef __WXMSW__
 #ifdef __WXMSW__

-  // frame icon and status bar
-  SetIcon(wxIcon("mondrian"));
+    wxFileDialog dialog(this, "Open a BMP file", "", "", "BMP files (*.bmp)|*.bmp", 0);

 #else
 #else

-  SetIcon(wxIcon(mondrian_xpm));
-#endif  
-  
-//  const int widths[] = { -1 };
-  CreateStatusBar();
+    wxFileDialog dialog(this, "Open a PNG file", "", "", "PNG files (*.png)|*.png", 0);
+#endif
+
+    if (dialog.ShowModal() != wxID_OK)
+    {
+        wxLogMessage( _T("Aborted file open") );
+        return;
+    }

 
 

-  // construct menu
-  wxMenu *file_menu = new wxMenu;
-  file_menu->Append(Menu_Drag, "&Test drag...");
-  file_menu->AppendSeparator();
-  file_menu->Append(Menu_Quit, "E&xit");
+    if (dialog.GetPath().IsEmpty())
+    {
+        wxLogMessage( _T("Returned empty string.") );
+        return;
+    }

 
 

-  wxMenu *log_menu = new wxMenu;
-  log_menu->Append(Menu_Clear, "Clear");
+    if (!wxFileExists(dialog.GetPath()))
+    {
+        wxLogMessage( _T("File doesn't exist.") );
+        return;
+    }

 
 

-  wxMenu *help_menu = new wxMenu;
-  help_menu->Append(Menu_Help, "&Help...");
-  help_menu->AppendSeparator();
-  help_menu->Append(Menu_About, "&About");
+    wxImage image;
+    image.LoadFile( dialog.GetPath(),
+#ifdef __WXMSW__
+                    wxBITMAP_TYPE_BMP
+#else
+                    wxBITMAP_TYPE_PNG
+#endif
+                  );
+    if (!image.Ok())
+    {
+        wxLogError( _T("Invalid image file...") );
+        return;
+    }

 
 

-  wxMenuBar *menu_bar = new wxMenuBar;
-  menu_bar->Append(file_menu, "&File");
-  menu_bar->Append(log_menu,  "&Log");
-  menu_bar->Append(help_menu, "&Help");
+    wxLogStatus( _T("Decoding image file...") );
+    wxYield();

 
 

-  SetMenuBar(menu_bar);
-  
-  // make a panel with 3 subwindows
-  wxPoint pos(0, 0);
-  wxSize  size(400, 200);
+    wxBitmap bitmap( image.ConvertToBitmap() );

 
 

-  wxString strFile("Drop files here!"), strText("Drop text on me");
+    if ( !wxTheClipboard->Open() )
+    {
+        wxLogError(_T("Can't open clipboard."));

 
 

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

 
 

-  m_ctrlLog   = new wxTextCtrl(this, -1, "", pos, size, 
-                               wxTE_MULTILINE | wxTE_READONLY | 
-                               wxSUNKEN_BORDER| wxHSCROLL);
+    wxLogMessage( _T("Creating wxBitmapDataObject...") );
+    wxYield();

 
 

-  // redirect log messages to the text window (don't forget to delete it!)
-  m_pLog = new wxLogTextCtrl(m_ctrlLog);
-  m_pLogPrev = wxLog::SetActiveTarget(m_pLog);
+    if ( !wxTheClipboard->AddData(new wxBitmapDataObject(bitmap)) )
+    {
+        wxLogError(_T("Can't copy image to the clipboard."));
+    }
+    else
+    {
+        wxLogMessage(_T("Image has been put on the clipboard.") );
+        wxLogMessage(_T("You can paste it now and look at it.") );
+    }

 
 

-  // associate drop targets with 2 text controls
-  m_ctrlFile->SetDropTarget(new DnDFile(m_ctrlFile));
-  m_ctrlText->SetDropTarget(new DnDText(m_ctrlText));  
+    wxTheClipboard->Close();
+}

 
 

-  wxLayoutConstraints *c;
+void DnDFrame::OnPasteBitmap(wxCommandEvent& WXUNUSED(event))
+{
+    if ( !wxTheClipboard->Open() )
+    {
+        wxLogError(_T("Can't open clipboard."));

 
 

-  // Top-left listbox
-  c = new wxLayoutConstraints;
-  c->left.SameAs               (this, wxLeft);
-  c->top.SameAs                        (this, wxTop);
-  c->right.PercentOf(this, wxRight, 50);
-  c->height.PercentOf(this, wxHeight, 40);
-  m_ctrlFile->SetConstraints(c);
+        return;
+    }

 
 

-  // Top-right listbox
-  c = new wxLayoutConstraints;
-  c->left.SameAs    (m_ctrlFile, wxRight);
-  c->top.SameAs     (this, wxTop);
-  c->right.SameAs   (this, wxRight);
-  c->height.PercentOf(this, wxHeight, 40);
-  m_ctrlText->SetConstraints(c);
+    if ( !wxTheClipboard->IsSupported(wxDF_BITMAP) )
+    {
+        wxLogWarning(_T("No bitmap on clipboard"));

 
 

-  // Lower text control
-  c = new wxLayoutConstraints;
-  c->left.SameAs    (this, wxLeft);
-  c->right.SameAs   (this, wxRight);
-  c->height.PercentOf(this, wxHeight, 40);
-  c->top.SameAs(m_ctrlText, wxBottom);
+        wxTheClipboard->Close();
+        return;
+    }

 
 

-  m_ctrlLog->SetConstraints(c);
+    wxBitmapDataObject data;
+    if ( !wxTheClipboard->GetData(data) )
+    {
+        wxLogError(_T("Can't paste bitmap from the clipboard"));
+    }
+    else
+    {
+        wxLogMessage(_T("Bitmap pasted from the clipboard") );
+        m_bitmap = data.GetBitmap();
+        Refresh();
+    }

 
 

-  SetAutoLayout(TRUE);
+    wxTheClipboard->Close();

 }
 
 }
 

-void DnDFrame::OnQuit(wxCommandEvent& /* event */)
+// ----------------------------------------------------------------------------
+// file clipboard
+// ----------------------------------------------------------------------------
+
+void DnDFrame::OnCopyFiles(wxCommandEvent& WXUNUSED(event))

 {
 {

-  Close(TRUE);
+#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

 }
 
 }
 

-void DnDFrame::OnDrag(wxCommandEvent& /* event */)
+// ---------------------------------------------------------------------------
+// text clipboard
+// ---------------------------------------------------------------------------
+
+void DnDFrame::OnCopy(wxCommandEvent& WXUNUSED(event))

 {
 {

-  wxString strText = wxGetTextFromUser
-  (
-    "After you enter text in this dialog, press any mouse\n"
-    "button in the bottom (empty) part of the frame and \n"
-    "drag it anywhere - you will be in fact dragging the\n"
-    "text object containing this text",
-    "Please enter some text", m_strText, this
-  );
+    if ( !wxTheClipboard->Open() )
+    {
+        wxLogError(_T("Can't open clipboard."));
+
+        return;
+    }
+
+    if ( !wxTheClipboard->AddData(new wxTextDataObject(m_strText)) )
+    {
+        wxLogError(_T("Can't copy data to the clipboard"));
+    }
+    else
+    {
+        wxLogMessage(_T("Text '%s' put on the clipboard"), m_strText.c_str());
+    }

 
 

-  m_strText = strText;
+    wxTheClipboard->Close();

 }
 
 }
 

-void DnDFrame::OnAbout(wxCommandEvent& /* event */)
+void DnDFrame::OnPaste(wxCommandEvent& WXUNUSED(event))

 {
 {

-  wxMessageDialog dialog(this, 
-                         "Drag-&-Drop Demo\n"
-                         "Please see \"Help|Help...\" for details\n"
-                         "Copyright (c) 1998 Vadim Zeitlin",
-                         "About wxDnD");
+    if ( !wxTheClipboard->Open() )
+    {
+        wxLogError(_T("Can't open clipboard."));
+
+        return;
+    }

 
 

-  dialog.ShowModal();
+    if ( !wxTheClipboard->IsSupported(wxDF_TEXT) )
+    {
+        wxLogWarning(_T("No text data on clipboard"));
+
+        wxTheClipboard->Close();
+        return;
+    }
+
+    wxTextDataObject text;
+    if ( !wxTheClipboard->GetData(text) )
+    {
+        wxLogError(_T("Can't paste data from the clipboard"));
+    }
+    else
+    {
+        wxLogMessage(_T("Text '%s' pasted from the clipboard"),
+                     text.GetText().c_str());
+    }
+
+    wxTheClipboard->Close();

 }
 
 }
 

-void DnDFrame::OnHelp(wxCommandEvent& /* event */)
+// ----------------------------------------------------------------------------
+// Notifications called by the base class
+// ----------------------------------------------------------------------------
+
+bool DnDText::OnDropText(wxCoord, wxCoord, const wxString& text)

 {
 {

-  wxMessageDialog dialog(this, 
-"This small program demonstrates drag & drop support in wxWindows. The program window\n"
-"consists of 3 parts: the bottom pane is for debug messages, so that you can see what's\n"
-"going on inside. The top part is split into 2 listboxes, the left one accepts files\n" 
-"and the right one accepts text.\n"
-"\n"
-"To test wxDropTarget: open wordpad (write.exe), select some text in it and drag it to\n" 
-"the right listbox (you'll notice the usual visual feedback, i.e. the cursor will change).\n" 
-"Also, try dragging some files (you can select several at once) from Windows Explorer (or \n"
-"File Manager) to the left pane. Hold down Ctrl/Shift keys when you drop text (doesn't \n"
-"work with files) and see what changes.\n"
-"\n"
-"To test wxDropSource: just press any mouse button on the empty zone of the window and drag\n" 
-"it to wordpad or any other droptarget accepting text (and of course you can just drag it\n"
-"to the right pane). Due to a lot of trace messages, the cursor might take some time to \n"
-"change, don't release the mouse button until it does. You can change the string being\n" 
-"dragged in in \"File|Test drag...\" dialog.\n"
-"\n"
-"\n"
-"Please send all questions/bug reports/suggestions &c to \n"
-"Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>",
-                        "wxDnD Help");
-
-  dialog.ShowModal();
+    m_pOwner->Append(text);
+
+    return TRUE;

 }
 
 }
 

-void DnDFrame::OnLogClear(wxCommandEvent& /* event */ )
+bool DnDFile::OnDropFiles(wxCoord, wxCoord, const wxArrayString& filenames)

 {
 {

-  m_ctrlLog->Clear();
+    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++ ) {
+        m_pOwner->Append(filenames[n]);
+    }
+
+    return TRUE;

 }
 
 }
 

-bool DnDFrame::OnClose() 
-{ 
-  return TRUE; 
+// ----------------------------------------------------------------------------
+// DnDShapeDialog
+// ----------------------------------------------------------------------------
+
+DnDShapeDialog::DnDShapeDialog(wxFrame *parent, DnDShape *shape)
+{
+    m_shape = shape;
+
+    LoadFromResource(parent, "dialogShape");
+
+    m_textX = (wxTextCtrl *)wxFindWindowByName("textX", this);
+    m_textY = (wxTextCtrl *)wxFindWindowByName("textY", this);
+    m_textW = (wxTextCtrl *)wxFindWindowByName("textW", this);
+    m_textH = (wxTextCtrl *)wxFindWindowByName("textH", this);
+
+    m_radio = (wxRadioBox *)wxFindWindowByName("radio", this);

 }
 
 }
 

-void DnDFrame::OnLeftDown(wxMouseEvent &WXUNUSED(event) )
+DnDShape *DnDShapeDialog::GetShape() const

 {
 {

-  if ( !m_strText.IsEmpty() ) {
-    // start drag operation
-    
-    wxTextDataObject data(m_strText);
-    wxDropSource dragSource(data, this);
-    const char *pc;
+    switch ( m_shapeKind )
+    {
+        default:
+        case DnDShape::None:      return NULL;
+        case DnDShape::Triangle:  return new DnDTriangularShape(m_pos, m_size, m_col);
+        case DnDShape::Rectangle: return new DnDRectangularShape(m_pos, m_size, m_col);
+        case DnDShape::Ellipse:   return new DnDEllipticShape(m_pos, m_size, m_col);
+    }
+}

 
 

-    switch ( dragSource.DoDragDrop(TRUE) ) {
-      case wxDropSource::Error:   pc = "Error!";    break;
-      case wxDropSource::None:    pc = "Nothing";   break;
-      case wxDropSource::Copy:    pc = "Copied";    break;
-      case wxDropSource::Move:    pc = "Moved";     break;
-      case wxDropSource::Cancel:  pc = "Cancelled"; break;
-      default:                    pc = "Huh?";      break;
+bool DnDShapeDialog::TransferDataToWindow()
+{
+
+    if ( m_shape )
+    {
+        m_radio->SetSelection(m_shape->GetKind());
+        m_pos = m_shape->GetPosition();
+        m_size = m_shape->GetSize();
+        m_col = m_shape->GetColour();
+    }
+    else
+    {
+        m_radio->SetSelection(DnDShape::None);
+        m_pos = wxPoint(1, 1);
+        m_size = wxSize(100, 100);

     }
 
     }
 

-    SetStatusText(wxString("Drag result: ") + pc);
-  }
+    m_textX->SetValue(wxString() << m_pos.x);
+    m_textY->SetValue(wxString() << m_pos.y);
+    m_textW->SetValue(wxString() << m_size.x);
+    m_textH->SetValue(wxString() << m_size.y);
+
+    return TRUE;

 }
 
 }
 

-void DnDFrame::OnRightDown(wxMouseEvent &event )
+bool DnDShapeDialog::TransferDataFromWindow()

 {
 {

-  wxMenu *menu = new wxMenu;
-  
-  menu->Append(Menu_Drag, "&Test drag...");
-  menu->Append(Menu_About, "&About");
-  menu->Append(Menu_Quit, "E&xit");
-  
-  PopupMenu( menu, event.GetX(), event.GetY() );
+    m_shapeKind = (DnDShape::Kind)m_radio->GetSelection();
+
+    m_pos.x = atoi(m_textX->GetValue());
+    m_pos.y = atoi(m_textY->GetValue());
+    m_size.x = atoi(m_textW->GetValue());
+    m_size.y = atoi(m_textH->GetValue());
+
+    if ( !m_pos.x || !m_pos.y || !m_size.x || !m_size.y )
+    {
+        wxMessageBox("All sizes and positions should be non null!",
+                     "Invalid shape", wxICON_HAND | wxOK, this);
+
+        return FALSE;
+    }
+
+    return TRUE;

 }
 
 }
 

-DnDFrame::~DnDFrame()
+void DnDShapeDialog::OnColour(wxCommandEvent& WXUNUSED(event))

 {
 {

-  if ( m_pLog != NULL ) {
-    if ( wxLog::SetActiveTarget(m_pLogPrev) == m_pLog )
-      delete m_pLog;
-  }
+    wxColourData data;
+    data.SetChooseFull(TRUE);
+    for (int i = 0; i < 16; i++)
+    {
+        wxColour colour(i*16, i*16, i*16);
+        data.SetCustomColour(i, colour);
+    }
+
+    wxColourDialog dialog(this, &data);
+    if ( dialog.ShowModal() == wxID_OK )
+    {
+        m_col = dialog.GetColourData().GetColour();
+    }

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

-// Notifications called by the base class
+// DnDShapeFrame

 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------

-bool DnDText::OnDropText(long, long, const char *psz)
+
+DnDShapeFrame *DnDShapeFrame::ms_lastDropTarget = NULL;
+
+DnDShapeFrame::DnDShapeFrame(wxFrame *parent)
+             : wxFrame(parent, -1, "Shape Frame",
+                       wxDefaultPosition, wxSize(250, 150))
+{
+    CreateStatusBar();
+
+    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;
+    
+    SetBackgroundColour(*wxWHITE);
+}
+
+DnDShapeFrame::~DnDShapeFrame()
+{
+    if (m_shape) 
+        delete m_shape;
+}
+
+void DnDShapeFrame::SetShape(DnDShape *shape)
+{
+    if (m_shape) 
+        delete m_shape;
+    m_shape = shape;
+    Refresh();
+}
+
+// callbacks
+void DnDShapeFrame::OnDrag(wxMouseEvent& event)
+{
+    if ( !m_shape )
+    {
+        event.Skip();
+
+        return;
+    }
+
+    // start drag operation
+    DnDShapeDataObject shapeData(m_shape);
+    wxDropSource source(shapeData, this);
+
+    const char *pc = NULL;
+    switch ( source.DoDragDrop(TRUE) )
+    {
+        default:
+        case wxDragError:
+            wxLogError("An error occured during drag and drop operation");
+            break;
+
+        case wxDragNone:
+            SetStatusText("Nothing happened");
+            break;
+
+        case wxDragCopy:
+            pc = "copied";
+            break;
+
+        case wxDragMove:
+            pc = "moved";
+            if ( ms_lastDropTarget != this )
+            {
+                // don't delete the shape if we dropped it on ourselves!
+                SetShape(NULL);
+            }
+            break;
+
+        case wxDragCancel:
+            SetStatusText("Drag and drop operation cancelled");
+            break;
+    }
+
+    if ( pc )
+    {
+        SetStatusText(wxString("Shape successfully ") + pc);
+    }
+    //else: status text already set
+}
+
+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 )
+    {
+        SetShape(dlg.GetShape());
+
+        if ( m_shape )
+        {
+            SetStatusText("You can now drag the shape to another frame");
+        }
+    }
+}
+
+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 )
+    {
+        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
+    {
+        wxLogStatus("No shape on the clipboard");
+    }
+}
+
+void DnDShapeFrame::OnUpdateUICopy(wxUpdateUIEvent& event)
+{
+    event.Enable( m_shape != NULL );
+}
+
+void DnDShapeFrame::OnUpdateUIPaste(wxUpdateUIEvent& event)
+{
+    event.Enable( wxTheClipboard->IsSupported(wxDataFormat(shapeFormatId)) );
+}
+
+void DnDShapeFrame::OnPaint(wxPaintEvent& event)

 {
 {

-  m_pOwner->Append(psz);
+    if ( m_shape )
+    {
+        wxPaintDC dc(this);

 
 

-  return TRUE;
+        m_shape->Draw(dc);
+    }
+    else
+    {
+        event.Skip();
+    }

 }
 
 }
 

-bool DnDFile::OnDropFiles(long, long, size_t nFiles, 
-                          const char * const aszFiles[])
+// ----------------------------------------------------------------------------
+// DnDShape
+// ----------------------------------------------------------------------------
+
+DnDShape *DnDShape::New(const void *buf)

 {
 {

-  wxString str;
-  str.Printf("%d files dropped", nFiles);
-  m_pOwner->Append(str);
-  for ( size_t n = 0; n < nFiles; n++ ) {
-    m_pOwner->Append(aszFiles[n]);
-  }
+    const ShapeDump& dump = *(const ShapeDump *)buf;
+    switch ( dump.k )
+    {
+        case Triangle:
+            return new DnDTriangularShape(wxPoint(dump.x, dump.y),
+                                          wxSize(dump.w, dump.h),
+                                          wxColour(dump.r, dump.g, dump.b));
+
+        case Rectangle:
+            return new DnDRectangularShape(wxPoint(dump.x, dump.y),
+                                           wxSize(dump.w, dump.h),
+                                           wxColour(dump.r, dump.g, dump.b));
+
+        case Ellipse:
+            return new DnDEllipticShape(wxPoint(dump.x, dump.y),
+                                        wxSize(dump.w, dump.h),
+                                        wxColour(dump.r, dump.g, dump.b));
+
+        default:
+            wxFAIL_MSG("invalid shape!");
+            return NULL;
+    }
+}
+
+// ----------------------------------------------------------------------------
+// DnDShapeDataObject
+// ----------------------------------------------------------------------------

 
 

-  return TRUE;
+void DnDShapeDataObject::CreateBitmap() const
+{
+    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);
+    dc.SetBrush(wxBrush("white", wxSOLID));
+    dc.Clear();
+    m_shape->Draw(dc);
+    dc.SelectObject(wxNullBitmap);
+
+    DnDShapeDataObject *self = (DnDShapeDataObject *)this; // const_cast
+    self->m_dataobj.SetBitmap(bitmap);
+    self->m_hasBitmap = TRUE;

 }
 }

+