/////////////////////////////////////////////////////////////////////////////
-// Name: dragimgg.cpp
+// Name: src/generic/dragimgg.cpp
// Purpose: Generic wxDragImage implementation
// Author: Julian Smart
// Modified by:
// 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 <stdio.h>
-#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 <stdio.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 "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"
// ----------------------------------------------------------------------------
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;
+#ifdef wxHAS_NATIVE_OVERLAY
+ m_dcOverlay = NULL;
+#else
m_pBackingBitmap = (wxBitmap*) 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
////////////////////////////////////////////////////////////////////////////
{
m_cursor = cursor;
- return TRUE;
+ return true;
}
// Create a drag image from a bitmap and optional cursor
m_cursor = cursor;
m_bitmap = image;
- return TRUE ;
+ return true ;
}
// Create a drag image from an icon and optional cursor
m_cursor = cursor;
m_icon = image;
- return TRUE ;
+ return true ;
}
// Create a drag image from a string and optional cursor
{
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);
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);
if (rect)
m_boundingRect = * rect;
- m_isDirty = FALSE;
- m_isDirty = FALSE;
+ m_isDirty = false;
+ m_isDirty = false;
if (window)
{
// dragged.
wxSize clientSize;
- wxPoint pt(0, 0);
+ wxPoint pt;
if (!m_fullScreen)
{
clientSize = window->GetClientSize();
}
}
+#ifndef wxHAS_NATIVE_OVERLAY
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);
+#endif // !wxHAS_NATIVE_OVERLAY
if (!m_fullScreen)
{
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
int x = fullScreenRect->GetPosition().x;
int y = fullScreenRect->GetPosition().y;
-
+
wxSize sz = fullScreenRect->GetSize();
if (fullScreenRect->GetParent() && !fullScreenRect->IsKindOf(CLASSINFO(wxFrame)))
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
if (m_windowDC)
{
+#ifdef wxHAS_NATIVE_OVERLAY
+ m_overlay.Reset();
+#else
m_windowDC->DestroyClippingRegion();
+#endif
delete m_windowDC;
m_windowDC = (wxDC*) NULL;
}
+#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
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()") );
-
+
// Show at the current position
if (!m_isShown)
// 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);
//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,
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 eraseOld, bool drawNew)
{
if (!m_windowDC)
- return FALSE;
+ return false;
+#ifdef wxHAS_NATIVE_OVERLAY
+ 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;
+ return false;
wxRect oldRect(GetImageRect(oldPos));
wxRect newRect(GetImageRect(newPos));
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)
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)
projects / wxWidgets.git / blobdiff