X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bc1dcfc1aa7cb30753c10b06409afae8e895ffa0..1341230e80db9f532df40e28e8cb799136c4883d:/src/generic/dragimgg.cpp?ds=sidebyside diff --git a/src/generic/dragimgg.cpp b/src/generic/dragimgg.cpp index dc79dc7d74..40c71aba6f 100644 --- a/src/generic/dragimgg.cpp +++ b/src/generic/dragimgg.cpp @@ -68,11 +68,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxGenericDragImage, wxObject) // wxGenericDragImage ctors/dtor // ---------------------------------------------------------------------------- -wxGenericDragImage::wxGenericDragImage() -{ - Init(); -} - wxGenericDragImage::~wxGenericDragImage() { if (m_windowDC) @@ -88,6 +83,7 @@ void wxGenericDragImage::Init() m_windowDC = (wxDC*) NULL; m_window = (wxWindow*) NULL; m_fullScreen = FALSE; + m_pBackingBitmap = (wxBitmap*) NULL; } // Attributes @@ -97,34 +93,40 @@ void wxGenericDragImage::Init() // Operations //////////////////////////////////////////////////////////////////////////// +// Create a drag image with a virtual image (need to override DoDrawImage, GetImageRect) +bool wxGenericDragImage::Create(const wxCursor& cursor) +{ + m_cursor = cursor; + + return TRUE; +} + // Create a drag image from a bitmap and optional cursor -bool wxGenericDragImage::Create(const wxBitmap& image, const wxCursor& cursor, const wxPoint& hotspot) +bool wxGenericDragImage::Create(const wxBitmap& image, const wxCursor& cursor) { // We don't have to combine the cursor explicitly since we simply show the cursor // as we drag. This currently will only work within one window. m_cursor = cursor; - m_hotspot = hotspot; m_bitmap = image; return TRUE ; } // Create a drag image from an icon and optional cursor -bool wxGenericDragImage::Create(const wxIcon& image, const wxCursor& cursor, const wxPoint& hotspot) +bool wxGenericDragImage::Create(const wxIcon& image, const wxCursor& cursor) { // We don't have to combine the cursor explicitly since we simply show the cursor // as we drag. This currently will only work within one window. m_cursor = cursor; - m_hotspot = hotspot; m_icon = image; return TRUE ; } // Create a drag image from a string and optional cursor -bool wxGenericDragImage::Create(const wxString& str, const wxCursor& cursor, const wxPoint& hotspot) +bool wxGenericDragImage::Create(const wxString& str, const wxCursor& cursor) { wxFont font(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT)); @@ -165,7 +167,7 @@ bool wxGenericDragImage::Create(const wxString& str, const wxCursor& cursor, con bitmap = image.ConvertToBitmap(); #endif - return Create(bitmap, cursor, hotspot); + return Create(bitmap, cursor); } // Create a drag image for the given tree control item @@ -183,13 +185,15 @@ bool wxGenericDragImage::Create(const wxListCtrl& listCtrl, long id) } // Begin drag -bool wxGenericDragImage::BeginDrag(const wxPoint& WXUNUSED(hotspot), +bool wxGenericDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullScreen, wxRect* rect) { wxASSERT_MSG( (window != 0), wxT("Window must not be null in BeginDrag.")); + // The image should be offset by this amount + m_offset = hotspot; m_window = window; m_fullScreen = fullScreen; @@ -238,8 +242,10 @@ bool wxGenericDragImage::BeginDrag(const wxPoint& WXUNUSED(hotspot), } } - if (!m_backingBitmap.Ok() || (m_backingBitmap.GetWidth() < clientSize.x || m_backingBitmap.GetHeight() < clientSize.y)) - m_backingBitmap = wxBitmap(clientSize.x, clientSize.y); + wxBitmap* backing = (m_pBackingBitmap ? m_pBackingBitmap : (wxBitmap*) & m_backingBitmap); + + if (!backing->Ok() || (backing->GetWidth() < clientSize.x || backing->GetHeight() < clientSize.y)) + (*backing) = wxBitmap(clientSize.x, clientSize.y); if (!m_fullScreen) m_windowDC = new wxClientDC(window); @@ -308,7 +314,11 @@ bool wxGenericDragImage::EndDrag() // is non-NULL, or in screen coordinates if NULL. bool wxGenericDragImage::Move(const wxPoint& pt) { - wxASSERT_MSG( (m_windowDC != (wxDC*) NULL), "No window DC in wxGenericDragImage::Move()" ); + wxASSERT_MSG( (m_windowDC != (wxDC*) NULL), wxT("No window DC in wxGenericDragImage::Move()") ); + + wxPoint pt2(pt); + if (m_fullScreen) + pt2 = m_window->ClientToScreen(pt); // Erase at old position, then show at the current position wxPoint oldPos = m_position; @@ -316,9 +326,9 @@ bool wxGenericDragImage::Move(const wxPoint& pt) bool eraseOldImage = (m_isDirty && m_isShown); if (m_isShown) - RedrawImage(oldPos, pt, eraseOldImage, TRUE); + RedrawImage(oldPos - m_offset, pt2 - m_offset, eraseOldImage, TRUE); - m_position = pt; + m_position = pt2; if (m_isShown) m_isDirty = TRUE; @@ -328,7 +338,7 @@ bool wxGenericDragImage::Move(const wxPoint& pt) bool wxGenericDragImage::Show() { - wxASSERT_MSG( (m_windowDC != (wxDC*) NULL), "No window DC in wxGenericDragImage::Show()" ); + wxASSERT_MSG( (m_windowDC != (wxDC*) NULL), wxT("No window DC in wxGenericDragImage::Show()") ); // Show at the current position @@ -337,12 +347,16 @@ bool wxGenericDragImage::Show() // This is where we restore the backing bitmap, in case // something has changed on the window. + wxBitmap* backing = (m_pBackingBitmap ? m_pBackingBitmap : (wxBitmap*) & m_backingBitmap); wxMemoryDC memDC; - memDC.SelectObject(m_backingBitmap); - memDC.Blit(0, 0, m_boundingRect.width, m_boundingRect.height, m_windowDC, m_boundingRect.x, m_boundingRect.y); + memDC.SelectObject(* backing); + + UpdateBackingFromWindow(* m_windowDC, memDC, m_boundingRect, wxRect(0, 0, m_boundingRect.width, m_boundingRect.height)); + + //memDC.Blit(0, 0, m_boundingRect.width, m_boundingRect.height, m_windowDC, m_boundingRect.x, m_boundingRect.y); memDC.SelectObject(wxNullBitmap); - RedrawImage(m_position, m_position, FALSE, TRUE); + RedrawImage(m_position - m_offset, m_position - m_offset, FALSE, TRUE); } m_isShown = TRUE; @@ -351,15 +365,21 @@ bool wxGenericDragImage::Show() return TRUE; } +bool wxGenericDragImage::UpdateBackingFromWindow(wxDC& windowDC, wxMemoryDC& destDC, + const wxRect& sourceRect, const wxRect& destRect) const +{ + return destDC.Blit(destRect.x, destRect.y, destRect.width, destRect.height, & windowDC, sourceRect.x, sourceRect.y); +} + bool wxGenericDragImage::Hide() { - wxASSERT_MSG( (m_windowDC != (wxDC*) NULL), "No window DC in wxGenericDragImage::Hide()" ); + wxASSERT_MSG( (m_windowDC != (wxDC*) NULL), wxT("No window DC in wxGenericDragImage::Hide()") ); // Repair the old position if (m_isShown && m_isDirty) { - RedrawImage(m_position, m_position, TRUE, FALSE); + RedrawImage(m_position - m_offset, m_position - m_offset, TRUE, FALSE); } m_isShown = FALSE; @@ -375,7 +395,8 @@ bool wxGenericDragImage::RedrawImage(const wxPoint& oldPos, const wxPoint& newPo if (!m_windowDC) return FALSE; - if (!m_backingBitmap.Ok()) + wxBitmap* backing = (m_pBackingBitmap ? m_pBackingBitmap : (wxBitmap*) & m_backingBitmap); + if (!backing->Ok()) return FALSE; wxRect oldRect(GetImageRect(oldPos)); @@ -413,7 +434,7 @@ bool wxGenericDragImage::RedrawImage(const wxPoint& oldPos, const wxPoint& newPo } wxMemoryDC memDC; - memDC.SelectObject(m_backingBitmap); + memDC.SelectObject(* backing); wxMemoryDC memDCTemp; memDCTemp.SelectObject(m_repairBitmap); @@ -429,12 +450,8 @@ bool wxGenericDragImage::RedrawImage(const wxPoint& oldPos, const wxPoint& newPo // If drawing, draw the image onto the mem DC if (drawNew) { - int x = newPos.x - fullRect.x; - int y = newPos.y - fullRect.y; - if (m_bitmap.Ok()) - memDCTemp.DrawBitmap(m_bitmap, x, y, (m_bitmap.GetMask() != 0)); - else if (m_icon.Ok()) - memDCTemp.DrawIcon(m_icon, x, y); + wxPoint pos(newPos.x - fullRect.x, newPos.y - fullRect.y) ; + DoDrawImage(memDCTemp, pos); } // Now blit to the window @@ -447,6 +464,24 @@ bool wxGenericDragImage::RedrawImage(const wxPoint& oldPos, const wxPoint& newPo return TRUE; } +// Override this if you are using a virtual image (drawing your own image) +bool wxGenericDragImage::DoDrawImage(wxDC& dc, const wxPoint& pos) const +{ + if (m_bitmap.Ok()) + { + dc.DrawBitmap(m_bitmap, pos.x, pos.y, (m_bitmap.GetMask() != 0)); + return TRUE; + } + else if (m_icon.Ok()) + { + dc.DrawIcon(m_icon, pos.x, pos.y); + return TRUE; + } + else + return FALSE; +} + +// Override this if you are using a virtual image (drawing your own image) wxRect wxGenericDragImage::GetImageRect(const wxPoint& pos) const { if (m_bitmap.Ok())