X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9e2896e5c8944c5f5227fa080e1b781c4a6f2600..7946d7deaac081a745dc616a5eb13ae864865fa2:/samples/dnd/dnd.cpp diff --git a/samples/dnd/dnd.cpp b/samples/dnd/dnd.cpp index ebadcfcd0c..96b14ad477 100644 --- 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 +// 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" @@ -34,8 +40,16 @@ #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" + + #include "dnd_copy.xpm" + #include "dnd_move.xpm" + #include "dnd_none.xpm" #endif // ---------------------------------------------------------------------------- @@ -78,6 +92,81 @@ public: 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 // ---------------------------------------------------------------------------- @@ -95,11 +184,19 @@ public: 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); +#ifdef USE_METAFILES + void OnPasteMetafile(wxCommandEvent& event); +#endif // USE_METAFILES + + void OnCopyFiles(wxCommandEvent& event); + void OnLeftDown(wxMouseEvent& event); void OnRightDown(wxMouseEvent& event); @@ -110,13 +207,13 @@ public: private: wxListBox *m_ctrlFile, - *m_ctrlText; + *m_ctrlText; wxTextCtrl *m_ctrlLog; - wxLog *m_pLog, *m_pLogPrev; + wxLog *m_pLog, + *m_pLogPrev; wxString m_strText; - wxBitmap m_bitmap; }; // ---------------------------------------------------------------------------- @@ -212,6 +309,7 @@ public: const wxColour& col) : DnDShape(pos, size, col) { + wxLogMessage("DnDTriangularShape is being created"); } virtual ~DnDTriangularShape() @@ -248,6 +346,7 @@ public: const wxColour& col) : DnDShape(pos, size, col) { + wxLogMessage("DnDRectangularShape is being created"); } virtual ~DnDRectangularShape() @@ -284,6 +383,7 @@ public: const wxColour& col) : DnDShape(pos, size, col) { + wxLogMessage("DnDEllipticShape is being created"); } virtual ~DnDEllipticShape() @@ -341,12 +441,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; +#ifdef USE_METAFILES + m_hasMetaFile = FALSE; +#endif // Windows } 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 // ---------------------------------- @@ -363,7 +482,11 @@ public: 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; @@ -374,7 +497,15 @@ public: 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 +515,24 @@ public: { 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 { + wxASSERT_MSG( m_dobjBitmap.IsSupported(format), + "unexpected format" ); + if ( !m_hasBitmap ) CreateBitmap(); - return m_dataobj.GetDataSize(); + return m_dobjBitmap.GetDataSize(); } } @@ -401,14 +544,24 @@ public: return TRUE; } +#ifdef USE_METAFILES + else if ( m_dobjMetaFile.IsSupported(format) ) + { + if ( !m_hasMetaFile ) + CreateMetaFile(); + + return m_dobjMetaFile.GetDataHere(format, pBuf); + } +#endif // Windows else { - wxASSERT_MSG( format == wxDF_BITMAP, "unsupported format" ); + wxASSERT_MSG( m_dobjBitmap.IsSupported(format), + "unexpected format" ); if ( !m_hasBitmap ) CreateBitmap(); - return m_dataobj.GetDataHere(pBuf); + return m_dobjBitmap.GetDataHere(pBuf); } } @@ -423,17 +576,29 @@ public: // the shape has changed m_hasBitmap = FALSE; +#ifdef USE_METAFILES + m_hasMetaFile = FALSE; +#endif // Windows + 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; +#ifdef USE_METAFILES + void CreateMetaFile() const; +#endif // Windows 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 }; @@ -499,7 +664,7 @@ public: 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; @@ -523,29 +688,39 @@ public: } // 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 bool OnData(wxCoord x, wxCoord y) + virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def) { if ( !GetData() ) { wxLogError("Failed to get drag and drop data"); - return FALSE; + return wxDragNone; } m_frame->OnDrop(x, y, ((DnDShapeDataObject *)GetDataObject())->GetShape()); - return TRUE; + return def; } 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 // ---------------------------------------------------------------------------- @@ -562,8 +737,8 @@ enum 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, @@ -583,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) +#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) @@ -609,9 +788,19 @@ BEGIN_EVENT_TABLE(DnDShapeFrame, wxFrame) 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() +#ifdef USE_METAFILES +BEGIN_EVENT_TABLE(DnDCanvasMetafile, wxScrolledWindow) + EVT_PAINT(DnDCanvasMetafile::OnPaint) +END_EVENT_TABLE() +#endif // USE_METAFILES + // ============================================================================ // implementation // ============================================================================ @@ -619,22 +808,50 @@ END_EVENT_TABLE() // `Main program' equivalent, creating windows and returning main app frame bool DnDApp::OnInit() { + // load our ressources + wxPathList pathList; + pathList.Add("."); +#ifdef __WXMSW__ + pathList.Add("./Debug"); + pathList.Add("./Release"); +#endif // wxMSW + + wxString path = pathList.FindValidPath("dnd.wxr"); + if ( !path ) + { + wxLogError("Can't find the resource file dnd.wxr in the current " + "directory, aborting."); + + return FALSE; + } + + wxDefaultResourceTable->ParseResourceFile(path); + + // switch on trace messages +#if defined(__WXGTK__) + wxLog::AddTraceMask(_T("clipboard")); +#elif defined(__WXMSW__) + wxLog::AddTraceMask(wxTRACE_OleCalls); +#endif + #if wxUSE_LIBPNG wxImage::AddHandler( new wxPNGHandler ); #endif + // 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", - 50, 50, 450, 340); + 10, 100, 650, 340); // activate it frame->Show(TRUE); SetTopWindow(frame); - wxDefaultResourceTable->ParseResourceFile("dnd.wxr"); - return TRUE; } @@ -657,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; - 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..."); @@ -668,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_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"); @@ -694,11 +917,7 @@ DnDFrame::DnDFrame(wxFrame *frame, char *title, int x, int y, int w, int h) 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); @@ -748,24 +967,28 @@ void DnDFrame::OnPaint(wxPaintEvent& WXUNUSED(event)) 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) { +#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) ); } @@ -831,6 +1054,8 @@ void DnDFrame::OnHelp(wxCommandEvent& /* event */) void DnDFrame::OnLogClear(wxCommandEvent& /* event */ ) { m_ctrlLog->Clear(); + m_ctrlText->Clear(); + m_ctrlFile->Clear(); } void DnDFrame::OnLeftDown(wxMouseEvent &WXUNUSED(event) ) @@ -839,7 +1064,15 @@ void DnDFrame::OnLeftDown(wxMouseEvent &WXUNUSED(event) ) { // 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; @@ -859,18 +1092,13 @@ void DnDFrame::OnLeftDown(wxMouseEvent &WXUNUSED(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() @@ -972,20 +1200,112 @@ void DnDFrame::OnPasteBitmap(wxCommandEvent& WXUNUSED(event)) } wxBitmapDataObject data; - if ( !wxTheClipboard->GetData(&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(); + 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(); +} + +#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 // --------------------------------------------------------------------------- @@ -1029,7 +1349,7 @@ void DnDFrame::OnPaste(wxCommandEvent& WXUNUSED(event)) } wxTextDataObject text; - if ( !wxTheClipboard->GetData(&text) ) + if ( !wxTheClipboard->GetData(text) ) { wxLogError(_T("Can't paste data from the clipboard")); } @@ -1168,15 +1488,13 @@ DnDShapeFrame::DnDShapeFrame(wxFrame *parent) : 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(); - 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"); @@ -1193,16 +1511,20 @@ DnDShapeFrame::DnDShapeFrame(wxFrame *parent) SetDropTarget(new DnDShapeDropTarget(this)); m_shape = NULL; + + SetBackgroundColour(*wxWHITE); } DnDShapeFrame::~DnDShapeFrame() { - delete m_shape; + if (m_shape) + delete m_shape; } void DnDShapeFrame::SetShape(DnDShape *shape) { - delete m_shape; + if (m_shape) + delete m_shape; m_shape = shape; Refresh(); } @@ -1219,7 +1541,7 @@ void DnDShapeFrame::OnDrag(wxMouseEvent& event) // 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) ) @@ -1258,15 +1580,17 @@ void DnDShapeFrame::OnDrag(wxMouseEvent& event) //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; + wxPoint pt(x, y); + wxString s; - s.Printf("Shape dropped at (%ld, %ld)", x, y); + s.Printf("Shape dropped at (%ld, %ld)", pt.x, pt.y); SetStatusText(s); - shape->Move(ScreenToClient(wxPoint(x, y))); + shape->Move(pt); SetShape(shape); } @@ -1299,13 +1623,31 @@ void DnDShapeFrame::OnClearShape(wxCommandEvent& event) 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) ) + if ( wxTheClipboard->GetData(shapeDataObject) ) { SetShape(shapeDataObject.GetShape()); } @@ -1328,9 +1670,15 @@ void DnDShapeFrame::OnUpdateUIPaste(wxUpdateUIEvent& event) void DnDShapeFrame::OnPaint(wxPaintEvent& event) { if ( m_shape ) - m_shape->Draw(wxPaintDC(this)); + { + wxPaintDC dc(this); + + m_shape->Draw(dc); + } else + { event.Skip(); + } } // ---------------------------------------------------------------------------- @@ -1367,6 +1715,28 @@ DnDShape *DnDShape::New(const void *buf) // 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(); @@ -1382,7 +1752,44 @@ void DnDShapeDataObject::CreateBitmap() const dc.SelectObject(wxNullBitmap); DnDShapeDataObject *self = (DnDShapeDataObject *)this; // const_cast - self->m_dataobj.SetBitmap(bitmap); + self->m_dobjBitmap.SetBitmap(bitmap); 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