X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..5cce8340b28be2eecea1822434eeff7055840f9c:/src/generic/dragimgg.cpp diff --git a/src/generic/dragimgg.cpp b/src/generic/dragimgg.cpp index 37071c5a03..fd104aad66 100644 --- a/src/generic/dragimgg.cpp +++ b/src/generic/dragimgg.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dragimgg.cpp +// Name: src/generic/dragimgg.cpp // Purpose: Generic wxDragImage implementation // Author: Julian Smart // Modified by: @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ -#pragma implementation "dragimgg.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -28,9 +24,10 @@ #pragma hdrstop #endif +#if wxUSE_DRAGIMAGE + #ifndef WX_PRECOMP #include -#include "wx/setup.h" #include "wx/window.h" #include "wx/frame.h" #include "wx/dcclient.h" @@ -42,11 +39,7 @@ #include "wx/log.h" #include "wx/intl.h" -#ifdef __WIN16__ -#define wxUSE_IMAGE_IN_DRAGIMAGE 0 -#else #define wxUSE_IMAGE_IN_DRAGIMAGE 1 -#endif #if wxUSE_IMAGE_IN_DRAGIMAGE #include "wx/image.h" @@ -78,11 +71,11 @@ wxGenericDragImage::~wxGenericDragImage() void wxGenericDragImage::Init() { - m_isDirty = FALSE; - m_isShown = FALSE; + m_isDirty = false; + m_isShown = false; m_windowDC = (wxDC*) NULL; m_window = (wxWindow*) NULL; - m_fullScreen = FALSE; + m_fullScreen = false; m_pBackingBitmap = (wxBitmap*) NULL; } @@ -94,58 +87,55 @@ void wxGenericDragImage::Init() //////////////////////////////////////////////////////////////////////////// // Create a drag image with a virtual image (need to override DoDrawImage, GetImageRect) -bool wxGenericDragImage::Create(const wxCursor& cursor, const wxPoint& hotspot) +bool wxGenericDragImage::Create(const wxCursor& cursor) { m_cursor = cursor; - m_hotspot = hotspot; - return TRUE; + 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 ; + 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 ; + 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)); + wxFont font(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); - long w, h; + long w = 0, h = 0; wxScreenDC dc; dc.SetFont(font); dc.GetTextExtent(str, & w, & h); dc.SetFont(wxNullFont); wxMemoryDC dc2; - dc2.SetFont(font); // Sometimes GetTextExtent isn't accurate enough, so make it longer wxBitmap bitmap((int) ((w+2) * 1.5), (int) h+2); dc2.SelectObject(bitmap); + dc2.SetFont(font); dc2.SetBackground(* wxWHITE_BRUSH); dc2.Clear(); dc2.SetBackgroundMode(wxTRANSPARENT); @@ -163,29 +153,33 @@ bool wxGenericDragImage::Create(const wxString& str, const wxCursor& cursor, con dc2.SelectObject(wxNullBitmap); -#if wxUSE_IMAGE_IN_DRAGIMAGE +#if wxUSE_IMAGE_IN_DRAGIMAGE && (!defined(__WXMSW__) || wxUSE_WXDIB) // Make the bitmap masked - wxImage image(bitmap); + wxImage image = bitmap.ConvertToImage(); image.SetMaskColour(255, 255, 255); - bitmap = image.ConvertToBitmap(); + bitmap = wxBitmap(image); #endif - return Create(bitmap, cursor, hotspot); + return Create(bitmap, cursor); } +#if wxUSE_TREECTRL // Create a drag image for the given tree control item bool wxGenericDragImage::Create(const wxTreeCtrl& treeCtrl, wxTreeItemId& id) { wxString str = treeCtrl.GetItemText(id); return Create(str); } +#endif +#if wxUSE_LISTCTRL // Create a drag image for the given list control item bool wxGenericDragImage::Create(const wxListCtrl& listCtrl, long id) { wxString str = listCtrl.GetItemText(id); return Create(str); } +#endif // Begin drag bool wxGenericDragImage::BeginDrag(const wxPoint& hotspot, @@ -203,8 +197,8 @@ bool wxGenericDragImage::BeginDrag(const wxPoint& hotspot, if (rect) m_boundingRect = * rect; - m_isDirty = FALSE; - m_isDirty = FALSE; + m_isDirty = false; + m_isDirty = false; if (window) { @@ -221,7 +215,7 @@ bool wxGenericDragImage::BeginDrag(const wxPoint& hotspot, // dragged. wxSize clientSize; - wxPoint pt(0, 0); + wxPoint pt; if (!m_fullScreen) { clientSize = window->GetClientSize(); @@ -251,7 +245,9 @@ bool wxGenericDragImage::BeginDrag(const wxPoint& hotspot, (*backing) = wxBitmap(clientSize.x, clientSize.y); if (!m_fullScreen) + { m_windowDC = new wxClientDC(window); + } else { m_windowDC = new wxScreenDC; @@ -265,7 +261,7 @@ bool wxGenericDragImage::BeginDrag(const wxPoint& hotspot, m_boundingRect.width, m_boundingRect.height); } - return TRUE; + return true; } // Begin drag. hotspot is the location of the drag position relative to the upper-left @@ -277,7 +273,7 @@ bool wxGenericDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, wxW int x = fullScreenRect->GetPosition().x; int y = fullScreenRect->GetPosition().y; - + wxSize sz = fullScreenRect->GetSize(); if (fullScreenRect->GetParent() && !fullScreenRect->IsKindOf(CLASSINFO(wxFrame))) @@ -286,7 +282,7 @@ bool wxGenericDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, wxW rect.x = x; rect.y = y; rect.width = sz.x; rect.height = sz.y; - return BeginDrag(hotspot, window, TRUE, & rect); + return BeginDrag(hotspot, window, true, & rect); } // End drag @@ -294,7 +290,13 @@ bool wxGenericDragImage::EndDrag() { if (m_window) { - m_window->ReleaseMouse(); +#ifdef __WXMSW__ + // Under Windows we can be pretty sure this test will give + // the correct results + if (wxWindow::GetCapture() == m_window) +#endif + m_window->ReleaseMouse(); + if (m_cursor.Ok() && m_oldCursor.Ok()) { m_window->SetCursor(m_oldCursor); @@ -310,7 +312,7 @@ bool wxGenericDragImage::EndDrag() m_repairBitmap = wxNullBitmap; - return TRUE; + return true; } // Move the image: call from OnMouseMove. Pt is in window client coordinates if window @@ -319,26 +321,30 @@ bool wxGenericDragImage::Move(const wxPoint& pt) { 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; bool eraseOldImage = (m_isDirty && m_isShown); - + if (m_isShown) - RedrawImage(oldPos - m_offset, pt - m_offset, eraseOldImage, TRUE); + RedrawImage(oldPos - m_offset, pt2 - m_offset, eraseOldImage, true); - m_position = pt; + m_position = pt2; if (m_isShown) - m_isDirty = TRUE; + m_isDirty = true; - return TRUE; + return true; } bool wxGenericDragImage::Show() { wxASSERT_MSG( (m_windowDC != (wxDC*) NULL), wxT("No window DC in wxGenericDragImage::Show()") ); - + // Show at the current position if (!m_isShown) @@ -355,19 +361,20 @@ bool wxGenericDragImage::Show() //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_offset, m_position - m_offset, FALSE, TRUE); + RedrawImage(m_position - m_offset, m_position - m_offset, false, true); } - m_isShown = TRUE; - m_isDirty = TRUE; + m_isShown = true; + m_isDirty = true; - return TRUE; + 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); + return destDC.Blit(destRect.x, destRect.y, destRect.width, destRect.height, & windowDC, + sourceRect.x, sourceRect.y); } bool wxGenericDragImage::Hide() @@ -378,13 +385,13 @@ bool wxGenericDragImage::Hide() if (m_isShown && m_isDirty) { - RedrawImage(m_position - m_offset, m_position - m_offset, TRUE, FALSE); + RedrawImage(m_position - m_offset, m_position - m_offset, true, false); } - m_isShown = FALSE; - m_isDirty = FALSE; + m_isShown = false; + m_isDirty = false; - return TRUE; + return true; } // More efficient: erase and redraw simultaneously if possible @@ -392,11 +399,11 @@ bool wxGenericDragImage::RedrawImage(const wxPoint& oldPos, const wxPoint& newPo bool eraseOld, bool drawNew) { if (!m_windowDC) - return FALSE; + return false; wxBitmap* backing = (m_pBackingBitmap ? m_pBackingBitmap : (wxBitmap*) & m_backingBitmap); if (!backing->Ok()) - return FALSE; + return false; wxRect oldRect(GetImageRect(oldPos)); wxRect newRect(GetImageRect(newPos)); @@ -460,7 +467,7 @@ bool wxGenericDragImage::RedrawImage(const wxPoint& oldPos, const wxPoint& newPo memDCTemp.SelectObject(wxNullBitmap); memDC.SelectObject(wxNullBitmap); - return TRUE; + return true; } // Override this if you are using a virtual image (drawing your own image) @@ -469,15 +476,15 @@ 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; + return true; } else if (m_icon.Ok()) { dc.DrawIcon(m_icon, pos.x, pos.y); - return TRUE; + return true; } else - return FALSE; + return false; } // Override this if you are using a virtual image (drawing your own image) @@ -497,3 +504,4 @@ wxRect wxGenericDragImage::GetImageRect(const wxPoint& pos) const } } +#endif // wxUSE_DRAGIMAGE