X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3a5bcc4db0851bf8cd3063917511b0b17c7f9679..bcfe86f0b5aae2ea3cd6c5e9a202d19bdbb21b25:/src/generic/dragimgg.cpp diff --git a/src/generic/dragimgg.cpp b/src/generic/dragimgg.cpp index 5890d2dc9a..d861987d17 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,39 +17,30 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "dragimgg.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #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" -#include "wx/dcscreen.h" -#include "wx/dcmemory.h" -#include "wx/settings.h" + #include + #include "wx/window.h" + #include "wx/frame.h" + #include "wx/dcclient.h" + #include "wx/dcscreen.h" + #include "wx/dcmemory.h" + #include "wx/settings.h" + #include "wx/intl.h" + #include "wx/log.h" + #include "wx/image.h" #endif -#include "wx/log.h" -#include "wx/intl.h" - #define wxUSE_IMAGE_IN_DRAGIMAGE 1 -#if wxUSE_IMAGE_IN_DRAGIMAGE -#include "wx/image.h" -#endif - #include "wx/generic/dragimgg.h" // ---------------------------------------------------------------------------- @@ -76,14 +67,67 @@ wxGenericDragImage::~wxGenericDragImage() void wxGenericDragImage::Init() { - m_isDirty = FALSE; - m_isShown = FALSE; - m_windowDC = (wxDC*) NULL; - m_window = (wxWindow*) NULL; - m_fullScreen = FALSE; - m_pBackingBitmap = (wxBitmap*) NULL; + m_isDirty = false; + m_isShown = false; + m_windowDC = NULL; + m_window = NULL; + m_fullScreen = false; +#ifdef wxHAS_NATIVE_OVERLAY + m_dcOverlay = NULL; +#else + m_pBackingBitmap = NULL; +#endif +} + +#if WXWIN_COMPATIBILITY_2_6 +wxGenericDragImage::wxGenericDragImage(const wxCursor& cursor, const wxPoint& WXUNUSED(cursorHotspot)) +{ + Init(); + Create(cursor); } +wxGenericDragImage::wxGenericDragImage(const wxBitmap& image, const wxCursor& cursor, const wxPoint& WXUNUSED(cursorHotspot)) +{ + Init(); + + Create(image, cursor); +} + +wxGenericDragImage::wxGenericDragImage(const wxIcon& image, const wxCursor& cursor, const wxPoint& WXUNUSED(cursorHotspot)) +{ + Init(); + + Create(image, cursor); +} + +wxGenericDragImage::wxGenericDragImage(const wxString& str, const wxCursor& cursor, const wxPoint& WXUNUSED(cursorHotspot)) +{ + Init(); + + Create(str, cursor); +} + +bool wxGenericDragImage::Create(const wxCursor& cursor, const wxPoint& WXUNUSED(cursorHotspot)) +{ + return Create(cursor); +} + +bool wxGenericDragImage::Create(const wxBitmap& image, const wxCursor& cursor, const wxPoint& WXUNUSED(cursorHotspot)) +{ + return Create(image, cursor); +} + +bool wxGenericDragImage::Create(const wxIcon& image, const wxCursor& cursor, const wxPoint& WXUNUSED(cursorHotspot)) +{ + return Create(image, cursor); +} + +bool wxGenericDragImage::Create(const wxString& str, const wxCursor& cursor, const wxPoint& WXUNUSED(cursorHotspot)) +{ + return Create(str, cursor); +} +#endif // WXWIN_COMPATIBILITY_2_6 + // Attributes //////////////////////////////////////////////////////////////////////////// @@ -96,7 +140,7 @@ bool wxGenericDragImage::Create(const wxCursor& cursor) { m_cursor = cursor; - return TRUE; + return true; } // Create a drag image from a bitmap and optional cursor @@ -108,7 +152,7 @@ bool wxGenericDragImage::Create(const wxBitmap& image, const wxCursor& cursor) m_cursor = cursor; m_bitmap = image; - return TRUE ; + return true ; } // Create a drag image from an icon and optional cursor @@ -120,7 +164,7 @@ bool wxGenericDragImage::Create(const wxIcon& image, const wxCursor& cursor) m_cursor = cursor; m_icon = image; - return TRUE ; + return true ; } // Create a drag image from a string and optional cursor @@ -128,7 +172,7 @@ bool wxGenericDragImage::Create(const wxString& str, const wxCursor& cursor) { wxFont font(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); - long w, h; + wxCoord w = 0, h = 0; wxScreenDC dc; dc.SetFont(font); dc.GetTextExtent(str, & w, & h); @@ -143,7 +187,7 @@ bool wxGenericDragImage::Create(const wxString& str, const wxCursor& cursor) dc2.SetFont(font); dc2.SetBackground(* wxWHITE_BRUSH); dc2.Clear(); - dc2.SetBackgroundMode(wxTRANSPARENT); + dc2.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT); dc2.SetTextForeground(* wxLIGHT_GREY); dc2.DrawText(str, 0, 0); dc2.DrawText(str, 1, 0); @@ -158,7 +202,7 @@ bool wxGenericDragImage::Create(const wxString& str, const wxCursor& cursor) dc2.SelectObject(wxNullBitmap); -#if wxUSE_IMAGE_IN_DRAGIMAGE +#if wxUSE_IMAGE_IN_DRAGIMAGE && (!defined(__WXMSW__) || wxUSE_WXDIB) // Make the bitmap masked wxImage image = bitmap.ConvertToImage(); image.SetMaskColour(255, 255, 255); @@ -192,7 +236,7 @@ bool wxGenericDragImage::BeginDrag(const wxPoint& hotspot, bool fullScreen, wxRect* rect) { - wxASSERT_MSG( (window != 0), wxT("Window must not be null in BeginDrag.")); + wxCHECK_MSG( window, false, wxT("Window must not be null in BeginDrag.")); // The image should be offset by this amount m_offset = hotspot; @@ -202,25 +246,22 @@ bool wxGenericDragImage::BeginDrag(const wxPoint& hotspot, if (rect) m_boundingRect = * rect; - m_isDirty = FALSE; - m_isDirty = FALSE; + m_isDirty = false; + m_isShown = false; - if (window) + if (m_cursor.IsOk()) { - window->CaptureMouse(); - - if (m_cursor.Ok()) - { - m_oldCursor = window->GetCursor(); - window->SetCursor(m_cursor); - } + m_oldCursor = window->GetCursor(); + window->SetCursor(m_cursor); } + window->CaptureMouse(); + // Make a copy of the window so we can repair damage done as the image is // dragged. wxSize clientSize; - wxPoint pt(0, 0); + wxPoint pt; if (!m_fullScreen) { clientSize = window->GetClientSize(); @@ -244,10 +285,12 @@ bool wxGenericDragImage::BeginDrag(const wxPoint& hotspot, } } +#ifndef wxHAS_NATIVE_OVERLAY wxBitmap* backing = (m_pBackingBitmap ? m_pBackingBitmap : (wxBitmap*) & m_backingBitmap); - if (!backing->Ok() || (backing->GetWidth() < clientSize.x || backing->GetHeight() < clientSize.y)) + if (!backing->IsOk() || (backing->GetWidth() < clientSize.x || backing->GetHeight() < clientSize.y)) (*backing) = wxBitmap(clientSize.x, clientSize.y); +#endif // !wxHAS_NATIVE_OVERLAY if (!m_fullScreen) { @@ -266,7 +309,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 @@ -278,16 +321,16 @@ 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))) + if (fullScreenRect->GetParent() && !wxDynamicCast(fullScreenRect, wxFrame)) fullScreenRect->GetParent()->ClientToScreen(& x, & y); 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 @@ -302,7 +345,7 @@ bool wxGenericDragImage::EndDrag() #endif m_window->ReleaseMouse(); - if (m_cursor.Ok() && m_oldCursor.Ok()) + if (m_cursor.IsOk() && m_oldCursor.IsOk()) { m_window->SetCursor(m_oldCursor); } @@ -310,21 +353,26 @@ bool wxGenericDragImage::EndDrag() if (m_windowDC) { +#ifdef wxHAS_NATIVE_OVERLAY + m_overlay.Reset(); +#else m_windowDC->DestroyClippingRegion(); - delete m_windowDC; - m_windowDC = (wxDC*) NULL; +#endif + wxDELETE(m_windowDC); } +#ifndef wxHAS_NATIVE_OVERLAY m_repairBitmap = wxNullBitmap; +#endif - return TRUE; + return true; } // Move the image: call from OnMouseMove. Pt is in window client coordinates if window // is non-NULL, or in screen coordinates if NULL. bool wxGenericDragImage::Move(const wxPoint& pt) { - wxASSERT_MSG( (m_windowDC != (wxDC*) NULL), wxT("No window DC in wxGenericDragImage::Move()") ); + wxASSERT_MSG( (m_windowDC != NULL), wxT("No window DC in wxGenericDragImage::Move()") ); wxPoint pt2(pt); if (m_fullScreen) @@ -334,22 +382,22 @@ bool wxGenericDragImage::Move(const wxPoint& pt) wxPoint oldPos = m_position; bool eraseOldImage = (m_isDirty && m_isShown); - + if (m_isShown) - RedrawImage(oldPos - m_offset, pt2 - m_offset, eraseOldImage, TRUE); + RedrawImage(oldPos - m_offset, pt2 - m_offset, eraseOldImage, true); 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()") ); - + wxASSERT_MSG( (m_windowDC != NULL), wxT("No window DC in wxGenericDragImage::Show()") ); + // Show at the current position if (!m_isShown) @@ -357,6 +405,7 @@ bool wxGenericDragImage::Show() // This is where we restore the backing bitmap, in case // something has changed on the window. +#ifndef wxHAS_NATIVE_OVERLAY wxBitmap* backing = (m_pBackingBitmap ? m_pBackingBitmap : (wxBitmap*) & m_backingBitmap); wxMemoryDC memDC; memDC.SelectObject(* backing); @@ -365,14 +414,15 @@ bool wxGenericDragImage::Show() //memDC.Blit(0, 0, m_boundingRect.width, m_boundingRect.height, m_windowDC, m_boundingRect.x, m_boundingRect.y); memDC.SelectObject(wxNullBitmap); +#endif // !wxHAS_NATIVE_OVERLAY - 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, @@ -384,31 +434,41 @@ bool wxGenericDragImage::UpdateBackingFromWindow(wxDC& windowDC, wxMemoryDC& des bool wxGenericDragImage::Hide() { - wxASSERT_MSG( (m_windowDC != (wxDC*) NULL), wxT("No window DC in wxGenericDragImage::Hide()") ); + wxASSERT_MSG( (m_windowDC != NULL), wxT("No window DC in wxGenericDragImage::Hide()") ); // Repair the old position 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 -bool wxGenericDragImage::RedrawImage(const wxPoint& oldPos, const wxPoint& newPos, +bool wxGenericDragImage::RedrawImage(const wxPoint& oldPos, + const wxPoint& newPos, bool eraseOld, bool drawNew) { if (!m_windowDC) - return FALSE; + return false; +#ifdef wxHAS_NATIVE_OVERLAY + wxUnusedVar(oldPos); + + wxDCOverlay dcoverlay( m_overlay, (wxWindowDC*) m_windowDC ) ; + if ( eraseOld ) + dcoverlay.Clear() ; + if (drawNew) + DoDrawImage(*m_windowDC, newPos); +#else // !wxHAS_NATIVE_OVERLAY wxBitmap* backing = (m_pBackingBitmap ? m_pBackingBitmap : (wxBitmap*) & m_backingBitmap); - if (!backing->Ok()) - return FALSE; + if (!backing->IsOk()) + return false; wxRect oldRect(GetImageRect(oldPos)); wxRect newRect(GetImageRect(newPos)); @@ -439,7 +499,7 @@ bool wxGenericDragImage::RedrawImage(const wxPoint& oldPos, const wxPoint& newPo // keep reallocating all the time. int excess = 50; - if (!m_repairBitmap.Ok() || (m_repairBitmap.GetWidth() < fullRect.GetWidth() || m_repairBitmap.GetHeight() < fullRect.GetHeight())) + if (!m_repairBitmap.IsOk() || (m_repairBitmap.GetWidth() < fullRect.GetWidth() || m_repairBitmap.GetHeight() < fullRect.GetHeight())) { m_repairBitmap = wxBitmap(fullRect.GetWidth() + excess, fullRect.GetHeight() + excess); } @@ -471,35 +531,36 @@ bool wxGenericDragImage::RedrawImage(const wxPoint& oldPos, const wxPoint& newPo memDCTemp.SelectObject(wxNullBitmap); memDC.SelectObject(wxNullBitmap); +#endif // wxHAS_NATIVE_OVERLAY/!wxHAS_NATIVE_OVERLAY - return TRUE; + 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()) + if (m_bitmap.IsOk()) { dc.DrawBitmap(m_bitmap, pos.x, pos.y, (m_bitmap.GetMask() != 0)); - return TRUE; + return true; } - else if (m_icon.Ok()) + else if (m_icon.IsOk()) { 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) wxRect wxGenericDragImage::GetImageRect(const wxPoint& pos) const { - if (m_bitmap.Ok()) + if (m_bitmap.IsOk()) { return wxRect(pos.x, pos.y, m_bitmap.GetWidth(), m_bitmap.GetHeight()); } - else if (m_icon.Ok()) + else if (m_icon.IsOk()) { return wxRect(pos.x, pos.y, m_icon.GetWidth(), m_icon.GetHeight()); }