updated opengl

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

diff --git a/samples/dnd/dnd.cpp b/samples/dnd/dnd.cpp
index 7b1cc72b94999d5122c65a1ed5f952be739ca280..96b14ad47786c19f77be79290dcc923360133013 100644 (file)
--- a/samples/dnd/dnd.cpp
+++ b/samples/dnd/dnd.cpp
@@ -23,6 +23,12 @@
     #error This sample requires drag and drop support in the library
 #endif
 
     #error This sample requires drag and drop support in the library
 #endif
 

+// under Windows we also support data transfer of metafiles as an extra bonus,
+// but they're not available under other platforms
+#ifdef __WINDOWS__
+    #define USE_METAFILES
+#endif // Windows
+

 #include "wx/intl.h"
 #include "wx/log.h"
 
 #include "wx/intl.h"
 #include "wx/log.h"
 


@@ -34,8 +40,16 @@
 #include "wx/colordlg.h"
 #include "wx/resource.h"
 
 #include "wx/colordlg.h"
 #include "wx/resource.h"
 

+#ifdef USE_METAFILES
+    #include "wx/metafile.h"
+#endif // Windows
+

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

+
+    #include "dnd_copy.xpm"
+    #include "dnd_move.xpm"
+    #include "dnd_none.xpm"

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


@@ -78,6 +92,81 @@ public:
 
 IMPLEMENT_APP(DnDApp);
 
 
 IMPLEMENT_APP(DnDApp);
 

+// ----------------------------------------------------------------------------
+// Define canvas class to show a bitmap
+// ----------------------------------------------------------------------------
+
+class DnDCanvasBitmap : public wxScrolledWindow
+{
+public:
+    DnDCanvasBitmap(wxWindow *parent) : wxScrolledWindow(parent) { }
+
+    void SetBitmap(const wxBitmap& bitmap)
+    {
+        m_bitmap = bitmap;
+
+        SetScrollbars(10, 10,
+                      m_bitmap.GetWidth() / 10, m_bitmap.GetHeight() / 10);
+
+        Refresh();
+    }
+
+    void OnPaint(wxPaintEvent& event)
+    {
+        wxPaintDC dc(this);
+
+        if ( m_bitmap.Ok() )
+        {
+            PrepareDC(dc);
+
+            dc.DrawBitmap(m_bitmap, 0, 0);
+        }
+    }
+
+private:
+    wxBitmap m_bitmap;
+
+    DECLARE_EVENT_TABLE()
+};
+
+#ifdef USE_METAFILES
+
+// and the same thing fo metafiles
+class DnDCanvasMetafile : public wxScrolledWindow
+{
+public:
+    DnDCanvasMetafile(wxWindow *parent) : wxScrolledWindow(parent) { }
+
+    void SetMetafile(const wxMetafile& metafile)
+    {
+        m_metafile = metafile;
+
+        SetScrollbars(10, 10,
+                      m_metafile.GetWidth() / 10, m_metafile.GetHeight() / 10);
+
+        Refresh();
+    }
+
+    void OnPaint(wxPaintEvent& event)
+    {
+        wxPaintDC dc(this);
+
+        if ( m_metafile.Ok() )
+        {
+            PrepareDC(dc);
+
+            m_metafile.Play(&dc);
+        }
+    }
+
+private:
+    wxMetafile m_metafile;
+
+    DECLARE_EVENT_TABLE()
+};
+
+#endif // USE_METAFILES
+

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


@@ -95,11 +184,19 @@ 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);
 

+#ifdef USE_METAFILES
+    void OnPasteMetafile(wxCommandEvent& event);
+#endif // USE_METAFILES
+
+    void OnCopyFiles(wxCommandEvent& event);
+

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


@@ -117,7 +214,6 @@ private:
           *m_pLogPrev;
 
     wxString  m_strText;
           *m_pLogPrev;
 
     wxString  m_strText;

-    wxBitmap  m_bitmap;

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


@@ -345,6 +441,9 @@ public:
         // 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;
         // 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;

+#ifdef USE_METAFILES
+        m_hasMetaFile = FALSE;
+#endif // Windows

     }
 
     virtual ~DnDShapeDataObject() { delete m_shape; }
     }
 
     virtual ~DnDShapeDataObject() { delete m_shape; }


@@ -361,6 +460,9 @@ public:
 
         m_shape = (DnDShape *)NULL;
         m_hasBitmap = FALSE;
 
         m_shape = (DnDShape *)NULL;
         m_hasBitmap = FALSE;

+#ifdef USE_METAFILES
+        m_hasMetaFile = FALSE;
+#endif // Windows

 
         return shape;
     }
 
         return shape;
     }


@@ -380,7 +482,11 @@ public:
         if ( dir == Get )
         {
             // but the bitmap format(s) are only supported for output
         if ( dir == Get )
         {
             // but the bitmap format(s) are only supported for output

-            nFormats += m_dataobj.GetFormatCount(dir);
+            nFormats += m_dobjBitmap.GetFormatCount(dir);
+
+#ifdef USE_METAFILES
+            nFormats += m_dobjMetaFile.GetFormatCount(dir);
+#endif // Windows

         }
 
         return nFormats;
         }
 
         return nFormats;


@@ -391,7 +497,15 @@ public:
         formats[0] = m_formatShape;
         if ( dir == Get )
         {
         formats[0] = m_formatShape;
         if ( dir == Get )
         {

-            m_dataobj.GetAllFormats(&formats[1], dir);
+            // in Get direction we additionally support bitmaps and metafiles
+            // under Windows
+            m_dobjBitmap.GetAllFormats(&formats[1], dir);
+
+#ifdef USE_METAFILES
+            // don't assume that m_dobjBitmap has only 1 format
+            m_dobjMetaFile.GetAllFormats(&formats[1 +
+                    m_dobjBitmap.GetFormatCount(dir)], dir);
+#endif // Windows

         }
     }
 
         }
     }
 


@@ -401,12 +515,24 @@ public:
         {
             return m_shape->GetDataSize();
         }
         {
             return m_shape->GetDataSize();
         }

+#ifdef USE_METAFILES
+        else if ( m_dobjMetaFile.IsSupported(format) )
+        {
+            if ( !m_hasMetaFile )
+                CreateMetaFile();
+
+            return m_dobjMetaFile.GetDataSize(format);
+        }
+#endif // Windows

         else
         {
         else
         {

+            wxASSERT_MSG( m_dobjBitmap.IsSupported(format),
+                          "unexpected format" );
+

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

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

         }
     }
 
         }
     }
 


@@ -418,12 +544,24 @@ public:
 
             return TRUE;
         }
 
             return TRUE;
         }

+#ifdef USE_METAFILES
+        else if ( m_dobjMetaFile.IsSupported(format) )
+        {
+            if ( !m_hasMetaFile )
+                CreateMetaFile();
+
+            return m_dobjMetaFile.GetDataHere(format, pBuf);
+        }
+#endif // Windows

         else
         {
         else
         {

+            wxASSERT_MSG( m_dobjBitmap.IsSupported(format),
+                          "unexpected format" );
+

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

-            return m_dataobj.GetDataHere(pBuf);
+            return m_dobjBitmap.GetDataHere(pBuf);

         }
     }
 
         }
     }
 


@@ -438,17 +576,29 @@ public:
         // the shape has changed
         m_hasBitmap = FALSE;
 
         // the shape has changed
         m_hasBitmap = FALSE;
 

+#ifdef USE_METAFILES
+        m_hasMetaFile = FALSE;
+#endif // Windows
+

         return TRUE;
     }
 
 private:
         return TRUE;
     }
 
 private:

-    // creates a bitmap and assigns it to m_dataobj (also sets m_hasBitmap)
+    // creates a bitmap and assigns it to m_dobjBitmap (also sets m_hasBitmap)

     void CreateBitmap() const;
     void CreateBitmap() const;

+#ifdef USE_METAFILES
+    void CreateMetaFile() const;
+#endif // Windows

 
     wxDataFormat        m_formatShape;  // our custom format
 
 
     wxDataFormat        m_formatShape;  // our custom format
 

-    wxBitmapDataObject  m_dataobj;      // it handles bitmaps
-    bool                m_hasBitmap;    // true if m_dataobj has valid bitmap
+    wxBitmapDataObject  m_dobjBitmap;   // it handles bitmaps
+    bool                m_hasBitmap;    // true if m_dobjBitmap has valid bitmap
+
+#ifdef USE_METAFILES
+    wxMetaFileDataObject m_dobjMetaFile;// handles metafiles
+    bool                 m_hasMetaFile; // true if we have valid metafile
+#endif // Windows

 
     DnDShape           *m_shape;        // our data
 };
 
     DnDShape           *m_shape;        // our data
 };


@@ -538,8 +688,8 @@ public:
     }
 
     // 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 wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def)
     virtual void OnLeave()
         { m_frame->SetStatusText("Mouse left the frame"); }
     virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def)


@@ -561,6 +711,16 @@ private:
     DnDShapeFrame *m_frame;
 };
 
     DnDShapeFrame *m_frame;
 };
 

+// ----------------------------------------------------------------------------
+// functions prototypes
+// ----------------------------------------------------------------------------
+
+static void ShowBitmap(const wxBitmap& bitmap);
+
+#ifdef USE_METAFILES
+static void ShowMetaFile(const wxMetaFile& metafile);
+#endif // USE_METAFILES
+

 // ----------------------------------------------------------------------------
 // IDs for the menu commands
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // IDs for the menu commands
 // ----------------------------------------------------------------------------


@@ -577,8 +737,8 @@ enum
     Menu_Paste,
     Menu_CopyBitmap,
     Menu_PasteBitmap,
     Menu_Paste,
     Menu_CopyBitmap,
     Menu_PasteBitmap,

-    Menu_ToBeGreyed,   /* for testing */
-    Menu_ToBeDeleted,  /* for testing */
+    Menu_PasteMFile,
+    Menu_CopyFiles,

     Menu_Shape_New = 500,
     Menu_Shape_Edit,
     Menu_Shape_Clear,
     Menu_Shape_New = 500,
     Menu_Shape_Edit,
     Menu_Shape_Clear,


@@ -598,6 +758,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)

+#ifdef USE_METAFILES
+    EVT_MENU(Menu_PasteMFile, DnDFrame::OnPasteMetafile)
+#endif // USE_METAFILES
+    EVT_MENU(Menu_CopyFiles,  DnDFrame::OnCopyFiles)

 
     EVT_UPDATE_UI(Menu_Paste,       DnDFrame::OnUpdateUIPasteText)
     EVT_UPDATE_UI(Menu_PasteBitmap, DnDFrame::OnUpdateUIPasteBitmap)
 
     EVT_UPDATE_UI(Menu_Paste,       DnDFrame::OnUpdateUIPasteText)
     EVT_UPDATE_UI(Menu_PasteBitmap, DnDFrame::OnUpdateUIPasteBitmap)


@@ -627,6 +791,16 @@ BEGIN_EVENT_TABLE(DnDShapeDialog, wxDialog)
     EVT_BUTTON(Button_Colour, DnDShapeDialog::OnColour)
 END_EVENT_TABLE()
 
     EVT_BUTTON(Button_Colour, DnDShapeDialog::OnColour)
 END_EVENT_TABLE()
 

+BEGIN_EVENT_TABLE(DnDCanvasBitmap, wxScrolledWindow)
+    EVT_PAINT(DnDCanvasBitmap::OnPaint)
+END_EVENT_TABLE()
+
+#ifdef USE_METAFILES
+BEGIN_EVENT_TABLE(DnDCanvasMetafile, wxScrolledWindow)
+    EVT_PAINT(DnDCanvasMetafile::OnPaint)
+END_EVENT_TABLE()
+#endif // USE_METAFILES
+

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -653,14 +827,25 @@ bool DnDApp::OnInit()
 
     wxDefaultResourceTable->ParseResourceFile(path);
 
 
     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, 100, 650, 340);

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


@@ -689,7 +874,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\tDel");
+    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...");


@@ -700,8 +885,14 @@ 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\tAlt+C");
-    clip_menu->Append(Menu_PasteBitmap, "&Paste bitmap\tAlt+V");
+    clip_menu->Append(Menu_CopyBitmap, "Copy &bitmap\tAlt+C");
+    clip_menu->Append(Menu_PasteBitmap, "Paste b&itmap\tAlt+V");
+#ifdef USE_METAFILES
+    clip_menu->AppendSeparator();
+    clip_menu->Append(Menu_PasteMFile, "Paste &metafile\tCtrl-M");
+#endif // USE_METAFILES
+    clip_menu->AppendSeparator();
+    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");


@@ -726,11 +917,7 @@ DnDFrame::DnDFrame(wxFrame *frame, char *title, int x, int y, int w, int h)
                                  wxTE_MULTILINE | wxTE_READONLY |
                                  wxSUNKEN_BORDER );
 
                                  wxTE_MULTILINE | wxTE_READONLY |
                                  wxSUNKEN_BORDER );
 

-#ifdef __WXMSW__
-    // redirect log messages to the text window and switch on OLE messages
-    // logging
-    wxLog::AddTraceMask(wxTRACE_OleCalls);
-#endif
+    // 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);
 


@@ -780,24 +967,28 @@ void DnDFrame::OnPaint(wxPaintEvent& WXUNUSED(event))
 
     wxPaintDC dc(this);
     dc.SetFont( wxFont( 24, wxDECORATIVE, wxNORMAL, wxNORMAL, FALSE, "charter" ) );
 
     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);
-    }
+    dc.DrawText( "Drag text from here!", 100, h-50 );

 }
 
 void DnDFrame::OnUpdateUIPasteText(wxUpdateUIEvent& event)
 {
 }
 
 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)
 {
     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) );
 }
 
     event.Enable( wxTheClipboard->IsSupported(wxDF_BITMAP) );
 }
 


@@ -863,6 +1054,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) )


@@ -871,10 +1064,15 @@ void DnDFrame::OnLeftDown(wxMouseEvent &WXUNUSED(event) )
     {
         // start drag operation
         wxTextDataObject textData(m_strText);
     {
         // start drag operation
         wxTextDataObject textData(m_strText);

+/*
+        wxFileDataObject textData;
+        textData.AddFile( "/file1.txt" );
+        textData.AddFile( "/file2.txt" );
+*/

         wxDropSource source(textData, this,
         wxDropSource source(textData, this,

-                            wxCURSOR_PENCIL,            // for copy
-                            wxCURSOR_SPRAYCAN,          // for move
-                            wxCURSOR_QUESTION_ARROW);   // for nothing
+                            wxDROP_ICON(dnd_copy),
+                            wxDROP_ICON(dnd_move),
+                            wxDROP_ICON(dnd_none));

 
         const char *pc;
 
 
         const char *pc;
 


@@ -894,18 +1092,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()


@@ -1013,14 +1206,106 @@ void DnDFrame::OnPasteBitmap(wxCommandEvent& WXUNUSED(event))
     }
     else
     {
     }
     else
     {

-        wxLogMessage(_T("Bitmap pasted from the clipboard") );
-        m_bitmap = data.GetBitmap();
-        Refresh();
+        const wxBitmap& bmp = data.GetBitmap();
+
+        wxLogMessage(_T("Bitmap %dx%d pasted from the clipboard"),
+                     bmp.GetWidth(), bmp.GetHeight());
+        ShowBitmap(bmp);

     }
 
     wxTheClipboard->Close();
 }
 
     }
 
     wxTheClipboard->Close();
 }
 

+#ifdef USE_METAFILES
+
+void DnDFrame::OnPasteMetafile(wxCommandEvent& WXUNUSED(event))
+{
+    if ( !wxTheClipboard->Open() )
+    {
+        wxLogError(_T("Can't open clipboard."));
+
+        return;
+    }
+
+    if ( !wxTheClipboard->IsSupported(wxDF_METAFILE) )
+    {
+        wxLogWarning(_T("No metafile on clipboard"));
+    }
+    else
+    {
+        wxMetaFileDataObject data;
+        if ( !wxTheClipboard->GetData(data) )
+        {
+            wxLogError(_T("Can't paste metafile from the clipboard"));
+        }
+        else
+        {
+            const wxMetaFile& mf = data.GetMetafile();
+
+            wxLogMessage(_T("Metafile %dx%d pasted from the clipboard"),
+                         mf.GetWidth(), mf.GetHeight());
+
+            ShowMetaFile(mf);
+        }
+    }
+
+    wxTheClipboard->Close();
+}
+
+#endif // USE_METAFILES
+
+// ----------------------------------------------------------------------------
+// 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
 // ---------------------------------------------------------------------------


@@ -1209,7 +1494,7 @@ DnDShapeFrame::DnDShapeFrame(wxFrame *parent)
     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_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");
+    menuShape->Append(Menu_Shape_Clear, "&Clear shape\tCtrl-L");

 
     wxMenu *menuClipboard = new wxMenu;
     menuClipboard->Append(Menu_ShapeClipboard_Copy, "&Copy\tCtrl-C");
 
     wxMenu *menuClipboard = new wxMenu;
     menuClipboard->Append(Menu_ShapeClipboard_Copy, "&Copy\tCtrl-C");


@@ -1226,19 +1511,19 @@ DnDShapeFrame::DnDShapeFrame(wxFrame *parent)
     SetDropTarget(new DnDShapeDropTarget(this));
 
     m_shape = NULL;
     SetDropTarget(new DnDShapeDropTarget(this));
 
     m_shape = NULL;

-    
+

     SetBackgroundColour(*wxWHITE);
 }
 
 DnDShapeFrame::~DnDShapeFrame()
 {
     SetBackgroundColour(*wxWHITE);
 }
 
 DnDShapeFrame::~DnDShapeFrame()
 {

-    if (m_shape) 
+    if (m_shape)

         delete m_shape;
 }
 
 void DnDShapeFrame::SetShape(DnDShape *shape)
 {
         delete m_shape;
 }
 
 void DnDShapeFrame::SetShape(DnDShape *shape)
 {

-    if (m_shape) 
+    if (m_shape)

         delete m_shape;
     m_shape = shape;
     Refresh();
         delete m_shape;
     m_shape = shape;
     Refresh();


@@ -1430,6 +1715,28 @@ DnDShape *DnDShape::New(const void *buf)
 // DnDShapeDataObject
 // ----------------------------------------------------------------------------
 
 // DnDShapeDataObject
 // ----------------------------------------------------------------------------
 

+#ifdef USE_METAFILES
+
+void DnDShapeDataObject::CreateMetaFile() const
+{
+    wxPoint pos = m_shape->GetPosition();
+    wxSize size = m_shape->GetSize();
+
+    wxMetaFileDC dcMF(wxEmptyString, pos.x + size.x, pos.y + size.y);
+
+    m_shape->Draw(dcMF);
+
+    wxMetafile *mf = dcMF.Close();
+
+    DnDShapeDataObject *self = (DnDShapeDataObject *)this; // const_cast
+    self->m_dobjMetaFile.SetMetafile(*mf);
+    self->m_hasMetaFile = TRUE;
+
+    delete mf;
+}
+
+#endif // Windows
+

 void DnDShapeDataObject::CreateBitmap() const
 {
     wxPoint pos = m_shape->GetPosition();
 void DnDShapeDataObject::CreateBitmap() const
 {
     wxPoint pos = m_shape->GetPosition();


@@ -1445,7 +1752,44 @@ void DnDShapeDataObject::CreateBitmap() const
     dc.SelectObject(wxNullBitmap);
 
     DnDShapeDataObject *self = (DnDShapeDataObject *)this; // const_cast
     dc.SelectObject(wxNullBitmap);
 
     DnDShapeDataObject *self = (DnDShapeDataObject *)this; // const_cast

-    self->m_dataobj.SetBitmap(bitmap);
+    self->m_dobjBitmap.SetBitmap(bitmap);

     self->m_hasBitmap = TRUE;
 }
 
     self->m_hasBitmap = TRUE;
 }
 

+// ----------------------------------------------------------------------------
+// global functions
+// ----------------------------------------------------------------------------
+
+static void ShowBitmap(const wxBitmap& bitmap)
+{
+    wxFrame *frame = new wxFrame(NULL, -1, _T("Bitmap view"));
+    frame->CreateStatusBar();
+    DnDCanvasBitmap *canvas = new DnDCanvasBitmap(frame);
+    canvas->SetBitmap(bitmap);
+
+    int w = bitmap.GetWidth(),
+        h = bitmap.GetHeight();
+    frame->SetStatusText(wxString::Format(_T("%dx%d"), w, h));
+
+    frame->SetClientSize(w > 100 ? 100 : w, h > 100 ? 100 : h);
+    frame->Show(TRUE);
+}
+
+#ifdef USE_METAFILES
+
+static void ShowMetaFile(const wxMetaFile& metafile)
+{
+    wxFrame *frame = new wxFrame(NULL, -1, _T("Metafile view"));
+    frame->CreateStatusBar();
+    DnDCanvasMetafile *canvas = new DnDCanvasMetafile(frame);
+    canvas->SetMetafile(metafile);
+
+    wxSize size = metafile.GetSize();
+    frame->SetStatusText(wxString::Format(_T("%dx%d"), size.x, size.y));
+
+    frame->SetClientSize(size.x > 100 ? 100 : size.x,
+                         size.y > 100 ? 100 : size.y);
+    frame->Show();
+}
+
+#endif // USE_METAFILES