// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "dragimgg.h"
#endif
#pragma hdrstop
#endif
+#if wxUSE_DRAGIMAGE
+
#ifndef WX_PRECOMP
#include <stdio.h>
#include "wx/setup.h"
// wxGenericDragImage ctors/dtor
// ----------------------------------------------------------------------------
-wxGenericDragImage::wxGenericDragImage()
-{
- Init();
-}
-
wxGenericDragImage::~wxGenericDragImage()
{
if (m_windowDC)
m_windowDC = (wxDC*) NULL;
m_window = (wxWindow*) NULL;
m_fullScreen = FALSE;
+ m_pBackingBitmap = (wxBitmap*) NULL;
}
// Attributes
// 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));
+ wxFont font(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
long w, h;
wxScreenDC dc;
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);
#if wxUSE_IMAGE_IN_DRAGIMAGE
// 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& 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;
}
}
- 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);
+ }
else
{
m_windowDC = new wxScreenDC;
{
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);
// 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;
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;
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
// 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;
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;
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));
}
wxMemoryDC memDC;
- memDC.SelectObject(m_backingBitmap);
+ memDC.SelectObject(* backing);
wxMemoryDC memDCTemp;
memDCTemp.SelectObject(m_repairBitmap);
// 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
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())
}
}
+#endif // wxUSE_DRAGIMAGE
projects / wxWidgets.git / blobdiff