Modifications to get wxNanoX compiling again

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

diff --git a/samples/dnd/dnd.cpp b/samples/dnd/dnd.cpp
index f0fe76f9048417dc4f423b56725c8039c9f3beba..9af14885d2bec1d2f95d4fb80758f9197d80f622 100644 (file)
--- a/samples/dnd/dnd.cpp
+++ b/samples/dnd/dnd.cpp
@@ -23,6 +23,18 @@
     #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
+
+#define USE_RESOURCES 0
+#if !wxUSE_RESOURCES
+#undef USE_RESOURCES
+#define USE_RESOURCES 0
+#endif
+

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


@@ -32,10 +44,22 @@
 #include "wx/image.h"
 #include "wx/clipbrd.h"
 #include "wx/colordlg.h"
 #include "wx/image.h"
 #include "wx/clipbrd.h"
 #include "wx/colordlg.h"

-#include "wx/resource.h"
+#if USE_RESOURCES
+    #include "wx/resource.h"
+#else
+    #include "wx/sizer.h"
+#endif

 
 

-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#ifdef USE_METAFILES
+    #include "wx/metafile.h"
+#endif // Windows
+
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)

     #include "mondrian.xpm"
     #include "mondrian.xpm"

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

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


@@ -66,6 +90,42 @@ private:
     wxListBox *m_pOwner;
 };
 
     wxListBox *m_pOwner;
 };
 

+// ----------------------------------------------------------------------------
+// Define a custom dtop target accepting URLs
+// ----------------------------------------------------------------------------
+
+class URLDropTarget : public wxDropTarget
+{
+public:
+    URLDropTarget() { SetDataObject(new wxURLDataObject); }
+
+    void OnDropURL(wxCoord x, wxCoord y, const wxString& text)
+    {
+        // of course, a real program would do something more useful here...
+        wxMessageBox(text, _T("wxDnD sample: got URL"),
+                     wxICON_INFORMATION | wxOK);
+    }
+
+    // URLs can't be moved, only copied
+    virtual wxDragResult OnDragOver(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
+                                    wxDragResult def)
+        {
+            return wxDragLink;  // At least IE 5.x needs wxDragLink, the
+                                // other browsers on MSW seem okay with it too.
+        }
+
+    // translate this to calls to OnDropURL() just for convenience
+    virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def)
+    {
+        if ( !GetData() )
+            return wxDragNone;
+
+        OnDropURL(x, y, ((wxURLDataObject *)m_dataObject)->GetURL());
+
+        return def;
+    }
+};
+

 // ----------------------------------------------------------------------------
 // Define a new application type
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Define a new application type
 // ----------------------------------------------------------------------------


@@ -78,6 +138,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
 // ----------------------------------------------------------------------------


@@ -89,17 +224,26 @@ public:
     ~DnDFrame();
 
     void OnPaint(wxPaintEvent& event);
     ~DnDFrame();
 
     void OnPaint(wxPaintEvent& event);

+    void OnSize(wxSizeEvent& 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 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 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);
 


@@ -110,13 +254,13 @@ public:
 
 private:
     wxListBox  *m_ctrlFile,
 
 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;
 
     wxString  m_strText;

-    wxBitmap  m_bitmap;

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


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

+        wxLogMessage(wxT("DnDTriangularShape is being created"));

     }
 
     virtual ~DnDTriangularShape()
     {
     }
 
     virtual ~DnDTriangularShape()
     {

-        wxLogMessage("DnDTriangularShape is being deleted");
+        wxLogMessage(wxT("DnDTriangularShape is being deleted"));

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


@@ -248,11 +393,12 @@ public:
                         const wxColour& col)
         : DnDShape(pos, size, col)
     {
                         const wxColour& col)
         : DnDShape(pos, size, col)
     {

+        wxLogMessage(wxT("DnDRectangularShape is being created"));

     }
 
     virtual ~DnDRectangularShape()
     {
     }
 
     virtual ~DnDRectangularShape()
     {

-        wxLogMessage("DnDRectangularShape is being deleted");
+        wxLogMessage(wxT("DnDRectangularShape is being deleted"));

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


@@ -284,11 +430,12 @@ public:
                      const wxColour& col)
         : DnDShape(pos, size, col)
     {
                      const wxColour& col)
         : DnDShape(pos, size, col)
     {

+        wxLogMessage(wxT("DnDEllipticShape is being created"));

     }
 
     virtual ~DnDEllipticShape()
     {
     }
 
     virtual ~DnDEllipticShape()
     {

-        wxLogMessage("DnDEllipticShape is being deleted");
+        wxLogMessage(wxT("DnDEllipticShape is being deleted"));

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


@@ -308,7 +455,7 @@ public:
 // A wxDataObject specialisation for the application-specific data
 // ----------------------------------------------------------------------------
 
 // A wxDataObject specialisation for the application-specific data
 // ----------------------------------------------------------------------------
 

-static const char *shapeFormatId = "wxShape";
+static const wxChar *shapeFormatId = wxT("wxShape");

 
 class DnDShapeDataObject : public wxDataObject
 {
 
 class DnDShapeDataObject : public wxDataObject
 {


@@ -341,12 +488,31 @@ 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; }
 

-    // accessors
-    DnDShape *GetShape() const { return 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;
+#ifdef USE_METAFILES
+        m_hasMetaFile = FALSE;
+#endif // Windows
+
+        return shape;
+    }

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


@@ -363,7 +529,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;


@@ -374,7 +544,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

         }
     }
 
         }
     }
 


@@ -384,12 +562,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),
+                          wxT("unexpected format") );
+

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

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

         }
     }
 
         }
     }
 


@@ -401,21 +591,32 @@ 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( format == wxDF_BITMAP, "unsupported format" );
+            wxASSERT_MSG( m_dobjBitmap.IsSupported(format),
+                          wxT("unexpected format") );

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

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

         }
     }
 
     virtual bool SetData(const wxDataFormat& format,
                          size_t len, const void *buf)
     {
         }
     }
 
     virtual bool SetData(const wxDataFormat& format,
                          size_t len, const void *buf)
     {

-        wxCHECK_MSG( format == m_formatShape, FALSE, "unsupported format" );
+        wxCHECK_MSG( format == m_formatShape, FALSE,
+                     wxT( "unsupported format") );

 
         delete m_shape;
         m_shape = DnDShape::New(buf);
 
         delete m_shape;
         m_shape = DnDShape::New(buf);


@@ -423,17 +624,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
 };


@@ -499,7 +712,7 @@ public:
 
     void OnDrag(wxMouseEvent& event);
     void OnPaint(wxPaintEvent& event);
 
     void OnDrag(wxMouseEvent& 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;


@@ -523,29 +736,39 @@ 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 void OnLeave()
         { m_frame->SetStatusText("Mouse left the frame"); }

-    virtual bool OnData(wxCoord x, wxCoord y)
+    virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def)

     {
         if ( !GetData() )
         {
     {
         if ( !GetData() )
         {

-            wxLogError("Failed to get drag and drop data");
+            wxLogError(wxT("Failed to get drag and drop data"));

 
 

-            return FALSE;
+            return wxDragNone;

         }
 
         m_frame->OnDrop(x, y,
                         ((DnDShapeDataObject *)GetDataObject())->GetShape());
 
         }
 
         m_frame->OnDrop(x, y,
                         ((DnDShapeDataObject *)GetDataObject())->GetShape());
 

-        return TRUE;
+        return def;

     }
 
 private:
     DnDShapeFrame *m_frame;
 };
 
     }
 
 private:
     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
 // ----------------------------------------------------------------------------


@@ -562,8 +785,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,


@@ -583,6 +806,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)


@@ -590,6 +817,7 @@ BEGIN_EVENT_TABLE(DnDFrame, wxFrame)
     EVT_LEFT_DOWN(            DnDFrame::OnLeftDown)
     EVT_RIGHT_DOWN(           DnDFrame::OnRightDown)
     EVT_PAINT(                DnDFrame::OnPaint)
     EVT_LEFT_DOWN(            DnDFrame::OnLeftDown)
     EVT_RIGHT_DOWN(           DnDFrame::OnRightDown)
     EVT_PAINT(                DnDFrame::OnPaint)

+    EVT_SIZE(                 DnDFrame::OnSize)

 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(DnDShapeFrame, wxFrame)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(DnDShapeFrame, wxFrame)


@@ -609,9 +837,19 @@ BEGIN_EVENT_TABLE(DnDShapeFrame, wxFrame)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(DnDShapeDialog, wxDialog)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(DnDShapeDialog, wxDialog)

-    EVT_BUTTON(Button_Colour, OnColour)
+    EVT_BUTTON(Button_Colour, DnDShapeDialog::OnColour)
+END_EVENT_TABLE()
+
+BEGIN_EVENT_TABLE(DnDCanvasBitmap, wxScrolledWindow)
+    EVT_PAINT(DnDCanvasBitmap::OnPaint)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

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

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


@@ -619,6 +857,7 @@ 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()
 {

+#if USE_RESOURCES

     // load our ressources
     wxPathList pathList;
     pathList.Add(".");
     // load our ressources
     wxPathList pathList;
     pathList.Add(".");


@@ -630,22 +869,34 @@ bool DnDApp::OnInit()
     wxString path = pathList.FindValidPath("dnd.wxr");
     if ( !path )
     {
     wxString path = pathList.FindValidPath("dnd.wxr");
     if ( !path )
     {

-        wxLogError("Can't find the resource file dnd.wxr in the current "
-                   "directory, aborting.");
+        wxLogError(wxT("Can't find the resource file dnd.wxr in the current ")
+                   wxT("directory, aborting."));

 
         return FALSE;
     }
 
     wxDefaultResourceTable->ParseResourceFile(path);
 
         return FALSE;
     }
 
     wxDefaultResourceTable->ParseResourceFile(path);

+#endif
+
+    // 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);


@@ -674,7 +925,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...");


@@ -682,11 +933,17 @@ DnDFrame::DnDFrame(wxFrame *frame, char *title, int x, int y, int w, int h)
     help_menu->Append(Menu_About, "&About");
 
     wxMenu *clip_menu = new wxMenu;
     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->Append(Menu_Copy, "&Copy text\tCtrl-C");
+    clip_menu->Append(Menu_Paste, "&Paste text\tCtrl-V");

     clip_menu->AppendSeparator();
     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\tCtrl-Shift-C");
+    clip_menu->Append(Menu_PasteBitmap, "Paste b&itmap\tCtrl-Shift-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");


@@ -711,17 +968,14 @@ 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);
 

-    // associate drop targets with 2 text controls
+    // associate drop targets with the controls

     m_ctrlFile->SetDropTarget(new DnDFile(m_ctrlFile));
     m_ctrlText->SetDropTarget(new DnDText(m_ctrlText));
     m_ctrlFile->SetDropTarget(new DnDFile(m_ctrlFile));
     m_ctrlText->SetDropTarget(new DnDText(m_ctrlText));

+    m_ctrlLog->SetDropTarget(new URLDropTarget);

 
     wxLayoutConstraints *c;
 
 
     wxLayoutConstraints *c;
 


@@ -757,6 +1011,13 @@ void DnDFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
     Close(TRUE);
 }
 
     Close(TRUE);
 }
 

+void DnDFrame::OnSize(wxSizeEvent& event)
+{
+    Refresh();
+
+    event.Skip();
+}
+

 void DnDFrame::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
     int w = 0;
 void DnDFrame::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
     int w = 0;


@@ -764,25 +1025,30 @@ void DnDFrame::OnPaint(wxPaintEvent& WXUNUSED(event))
     GetClientSize( &w, &h );
 
     wxPaintDC dc(this);
     GetClientSize( &w, &h );
 
     wxPaintDC dc(this);

+    dc.Clear();

     dc.SetFont( wxFont( 24, wxDECORATIVE, wxNORMAL, wxNORMAL, FALSE, "charter" ) );
     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) );
 }
 


@@ -790,7 +1056,7 @@ void DnDFrame::OnNewFrame(wxCommandEvent& WXUNUSED(event))
 {
     (new DnDShapeFrame(this))->Show(TRUE);
 
 {
     (new DnDShapeFrame(this))->Show(TRUE);
 

-    wxLogStatus(this, "Double click the new frame to select a shape for it");
+    wxLogStatus(this, wxT("Double click the new frame to select a shape for it"));

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


@@ -848,6 +1114,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) )


@@ -856,7 +1124,15 @@ 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,
+                            wxDROP_ICON(dnd_copy),
+                            wxDROP_ICON(dnd_move),
+                            wxDROP_ICON(dnd_none));

 
         const char *pc;
 
 
         const char *pc;
 


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

-    wxMenu *menu = new wxMenu;
-
-    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");
+    wxMenu menu("Dnd sample menu");

 
 

-    menu->Delete( Menu_ToBeDeleted );
-    menu->Enable( Menu_ToBeGreyed, FALSE );
+    menu.Append(Menu_Drag, "&Test drag...");
+    menu.AppendSeparator();
+    menu.Append(Menu_About, "&About");

 
 

-    PopupMenu( menu, event.GetX(), event.GetY() );
+    PopupMenu( &menu, event.GetX(), event.GetY() );

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


@@ -946,7 +1217,7 @@ void DnDFrame::OnCopyBitmap(wxCommandEvent& WXUNUSED(event))
     wxLogStatus( _T("Decoding image file...") );
     wxYield();
 
     wxLogStatus( _T("Decoding image file...") );
     wxYield();
 

-    wxBitmap bitmap( image.ConvertToBitmap() );
+    wxBitmap bitmap( image );

 
     if ( !wxTheClipboard->Open() )
     {
 
     if ( !wxTheClipboard->Open() )
     {


@@ -995,14 +1266,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();
+}
+
+#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();
 }
 
     }
 
     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(wxT("Can't open clipboard"));
+        }
+        else
+        {
+            if ( !wxTheClipboard->AddData(dobj) )
+            {
+                wxLogError(wxT("Can't copy file(s) to the clipboard"));
+            }
+            else
+            {
+                wxLogStatus(this, wxT("%d file%s copied to the clipboard"),
+                            count, count == 1 ? wxT("") : wxT("s"));
+            }
+        }
+    }
+    else
+    {
+        wxLogStatus(this, wxT("Aborted"));
+    }
+#else // !MSW
+    wxLogError(wxT("Sorry, not implemented"));
+#endif // MSW/!MSW
+}
+

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


@@ -1088,9 +1451,14 @@ bool DnDFile::OnDropFiles(wxCoord, wxCoord, const wxArrayString& filenames)
 // ----------------------------------------------------------------------------
 
 DnDShapeDialog::DnDShapeDialog(wxFrame *parent, DnDShape *shape)
 // ----------------------------------------------------------------------------
 
 DnDShapeDialog::DnDShapeDialog(wxFrame *parent, DnDShape *shape)

+#if !USE_RESOURCES
+  :wxDialog( parent, 6001, wxT("Choose Shape"), wxPoint( 10, 10 ),
+             wxSize( 40, 40 ),
+             wxRAISED_BORDER|wxCAPTION|wxTHICK_FRAME|wxSYSTEM_MENU )
+#endif

 {
     m_shape = shape;
 {
     m_shape = shape;

-
+#if USE_RESOURCES

     LoadFromResource(parent, "dialogShape");
 
     m_textX = (wxTextCtrl *)wxFindWindowByName("textX", this);
     LoadFromResource(parent, "dialogShape");
 
     m_textX = (wxTextCtrl *)wxFindWindowByName("textX", this);


@@ -1099,6 +1467,69 @@ DnDShapeDialog::DnDShapeDialog(wxFrame *parent, DnDShape *shape)
     m_textH = (wxTextCtrl *)wxFindWindowByName("textH", this);
 
     m_radio = (wxRadioBox *)wxFindWindowByName("radio", this);
     m_textH = (wxTextCtrl *)wxFindWindowByName("textH", this);
 
     m_radio = (wxRadioBox *)wxFindWindowByName("radio", this);

+#else
+    wxBoxSizer* topSizer = new wxBoxSizer( wxVERTICAL );
+
+    // radio box
+    wxBoxSizer* shapesSizer = new wxBoxSizer( wxHORIZONTAL );
+    const wxString choices[] = { wxT("None"), wxT("Triangle"),
+                                 wxT("Rectangle"), wxT("Ellipse") };
+
+    m_radio = new wxRadioBox( this, -1, wxT("&Shape"),
+                              wxDefaultPosition, wxDefaultSize, 4, choices, 4,
+                              wxRA_SPECIFY_COLS );
+    shapesSizer->Add( m_radio, 0, wxGROW|wxALL, 5 );
+    topSizer->Add( shapesSizer, 0, wxALL, 2 );
+
+    // attributes
+    wxStaticBox* box = new wxStaticBox( this, -1, wxT("&Attributes") );
+    wxStaticBoxSizer* attrSizer = new wxStaticBoxSizer( box, wxHORIZONTAL );
+    wxFlexGridSizer* xywhSizer = new wxFlexGridSizer( 4, 2 );
+
+    wxStaticText* st;
+
+    st = new wxStaticText( this, -1, wxT("Position &X:") );
+    m_textX = new wxTextCtrl( this, -1, wxEmptyString, wxDefaultPosition,
+                              wxSize( 30, 20 ) );
+    xywhSizer->Add( st, 1, wxGROW|wxALL, 2 );
+    xywhSizer->Add( m_textX, 1, wxGROW|wxALL, 2 );
+
+    st = new wxStaticText( this, -1, wxT("Size &width:") );
+    m_textW = new wxTextCtrl( this, -1, wxEmptyString, wxDefaultPosition,
+                              wxSize( 30, 20 ) );
+    xywhSizer->Add( st, 1, wxGROW|wxALL, 2 );
+    xywhSizer->Add( m_textW, 1, wxGROW|wxALL, 2 );
+
+    st = new wxStaticText( this, -1, wxT("&Y:") );
+    m_textY = new wxTextCtrl( this, -1, wxEmptyString, wxDefaultPosition,
+                              wxSize( 30, 20 ) );
+    xywhSizer->Add( st, 1, wxALL|wxALIGN_RIGHT, 2 );
+    xywhSizer->Add( m_textY, 1, wxGROW|wxALL, 2 );
+
+    st = new wxStaticText( this, -1, wxT("&height:") );
+    m_textH = new wxTextCtrl( this, -1, wxEmptyString, wxDefaultPosition,
+                              wxSize( 30, 20 ) );
+    xywhSizer->Add( st, 1, wxALL|wxALIGN_RIGHT, 2 );
+    xywhSizer->Add( m_textH, 1, wxGROW|wxALL, 2 );
+
+    wxButton* col = new wxButton( this, Button_Colour, wxT("&Colour...") );
+    attrSizer->Add( xywhSizer, 1, wxGROW );
+    attrSizer->Add( col, 0, wxALL|wxALIGN_CENTRE_VERTICAL, 2 );
+    topSizer->Add( attrSizer, 0, wxGROW|wxALL, 5 );
+
+    // buttons
+    wxBoxSizer* buttonSizer = new wxBoxSizer( wxHORIZONTAL );
+    wxButton* bt;
+    bt = new wxButton( this, wxID_OK, wxT("Ok") );
+    buttonSizer->Add( bt, 0, wxALL, 2 );
+    bt = new wxButton( this, wxID_CANCEL, wxT("Cancel") );
+    buttonSizer->Add( bt, 0, wxALL, 2 );
+    topSizer->Add( buttonSizer, 0, wxALL|wxALIGN_RIGHT, 2 );
+
+    SetAutoLayout( TRUE );
+    SetSizer( topSizer );
+    topSizer->Fit( this );
+#endif

 }
 
 DnDShape *DnDShapeDialog::GetShape() const
 }
 
 DnDShape *DnDShapeDialog::GetShape() const


@@ -1142,10 +1573,10 @@ bool DnDShapeDialog::TransferDataFromWindow()
 {
     m_shapeKind = (DnDShape::Kind)m_radio->GetSelection();
 
 {
     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());
+    m_pos.x = wxAtoi(m_textX->GetValue());
+    m_pos.y = wxAtoi(m_textY->GetValue());
+    m_size.x = wxAtoi(m_textW->GetValue());
+    m_size.y = wxAtoi(m_textH->GetValue());

 
     if ( !m_pos.x || !m_pos.y || !m_size.x || !m_size.y )
     {
 
     if ( !m_pos.x || !m_pos.y || !m_size.x || !m_size.y )
     {


@@ -1185,15 +1616,13 @@ DnDShapeFrame::DnDShapeFrame(wxFrame *parent)
              : wxFrame(parent, -1, "Shape Frame",
                        wxDefaultPosition, wxSize(250, 150))
 {
              : wxFrame(parent, -1, "Shape Frame",
                        wxDefaultPosition, wxSize(250, 150))
 {

-    SetBackgroundColour(*wxWHITE);
-

     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();
     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");
+    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");


@@ -1210,16 +1639,20 @@ DnDShapeFrame::DnDShapeFrame(wxFrame *parent)
     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();
 }


@@ -1236,14 +1669,14 @@ 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) )
     {
         default:
         case wxDragError:
 
     const char *pc = NULL;
     switch ( source.DoDragDrop(TRUE) )
     {
         default:
         case wxDragError:

-            wxLogError("An error occured during drag and drop operation");
+            wxLogError(wxT("An error occured during drag and drop operation"));

             break;
 
         case wxDragNone:
             break;
 
         case wxDragNone:


@@ -1275,15 +1708,17 @@ void DnDShapeFrame::OnDrag(wxMouseEvent& event)
     //else: status text already set
 }
 
     //else: status text already set
 }
 

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

 {
     ms_lastDropTarget = this;
 
 {
     ms_lastDropTarget = this;
 

+    wxPoint pt(x, y);
+

     wxString s;
     wxString s;

-    s.Printf("Shape dropped at (%ld, %ld)", x, y);
+    s.Printf(wxT("Shape dropped at (%ld, %ld)"), pt.x, pt.y);

     SetStatusText(s);
 
     SetStatusText(s);
 

-    shape->Move(ScreenToClient(wxPoint(x, y)));
+    shape->Move(pt);

     SetShape(shape);
 }
 
     SetShape(shape);
 }
 


@@ -1320,7 +1755,7 @@ void DnDShapeFrame::OnCopyShape(wxCommandEvent& event)
         wxClipboardLocker clipLocker;
         if ( !clipLocker )
         {
         wxClipboardLocker clipLocker;
         if ( !clipLocker )
         {

-            wxLogError("Can't open the clipboard");
+            wxLogError(wxT("Can't open the clipboard"));

 
             return;
         }
 
             return;
         }


@@ -1334,7 +1769,7 @@ void DnDShapeFrame::OnPasteShape(wxCommandEvent& event)
     wxClipboardLocker clipLocker;
     if ( !clipLocker )
     {
     wxClipboardLocker clipLocker;
     if ( !clipLocker )
     {

-        wxLogError("Can't open the clipboard");
+        wxLogError(wxT("Can't open the clipboard"));

 
         return;
     }
 
         return;
     }


@@ -1346,7 +1781,7 @@ void DnDShapeFrame::OnPasteShape(wxCommandEvent& event)
     }
     else
     {
     }
     else
     {

-        wxLogStatus("No shape on the clipboard");
+        wxLogStatus(wxT("No shape on the clipboard"));

     }
 }
 
     }
 }
 


@@ -1399,7 +1834,7 @@ DnDShape *DnDShape::New(const void *buf)
                                         wxColour(dump.r, dump.g, dump.b));
 
         default:
                                         wxColour(dump.r, dump.g, dump.b));
 
         default:

-            wxFAIL_MSG("invalid shape!");
+            wxFAIL_MSG(wxT("invalid shape!"));

             return NULL;
     }
 }
             return NULL;
     }
 }


@@ -1408,6 +1843,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();


@@ -1417,13 +1874,50 @@ void DnDShapeDataObject::CreateBitmap() const
     wxBitmap bitmap(x, y);
     wxMemoryDC dc;
     dc.SelectObject(bitmap);
     wxBitmap bitmap(x, y);
     wxMemoryDC dc;
     dc.SelectObject(bitmap);

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

     dc.Clear();
     m_shape->Draw(dc);
     dc.SelectObject(wxNullBitmap);
 
     DnDShapeDataObject *self = (DnDShapeDataObject *)this; // const_cast
     dc.Clear();
     m_shape->Draw(dc);
     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