projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added another sanity check....
[wxWidgets.git]
/
src
/
generic
/
dragimgg.cpp
diff --git
a/src/generic/dragimgg.cpp
b/src/generic/dragimgg.cpp
index 37071c5a036147f30c58c513f0b87c5206f5450f..20e90cf378bd9c9de60a7d1e9c0f456268e8d8a1 100644
(file)
--- a/
src/generic/dragimgg.cpp
+++ b/
src/generic/dragimgg.cpp
@@
-17,7
+17,7
@@
// headers
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "dragimgg.h"
#endif
#pragma implementation "dragimgg.h"
#endif
@@
-28,6
+28,8
@@
#pragma hdrstop
#endif
#pragma hdrstop
#endif
+#if wxUSE_DRAGIMAGE
+
#ifndef WX_PRECOMP
#include <stdio.h>
#include "wx/setup.h"
#ifndef WX_PRECOMP
#include <stdio.h>
#include "wx/setup.h"
@@
-94,44
+96,41
@@
void wxGenericDragImage::Init()
////////////////////////////////////////////////////////////////////////////
// Create a drag image with a virtual image (need to override DoDrawImage, GetImageRect)
////////////////////////////////////////////////////////////////////////////
// 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_cursor = cursor;
- m_hotspot = hotspot;
return TRUE;
}
// Create a drag image from a bitmap and optional 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;
{
// 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
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;
{
// 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
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::Get
System
Font(wxSYS_DEFAULT_GUI_FONT));
+ wxFont font(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
long w, h;
wxScreenDC dc;
long w, h;
wxScreenDC dc;
@@
-140,12
+139,12
@@
bool wxGenericDragImage::Create(const wxString& str, const wxCursor& cursor, con
dc.SetFont(wxNullFont);
wxMemoryDC dc2;
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);
// 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);
dc2.SetBackground(* wxWHITE_BRUSH);
dc2.Clear();
dc2.SetBackgroundMode(wxTRANSPARENT);
@@
-165,27
+164,31
@@
bool wxGenericDragImage::Create(const wxString& str, const wxCursor& cursor, con
#if wxUSE_IMAGE_IN_DRAGIMAGE
// Make the bitmap masked
#if wxUSE_IMAGE_IN_DRAGIMAGE
// Make the bitmap masked
- wxImage image
(bitmap
);
+ wxImage image
= bitmap.ConvertToImage(
);
image.SetMaskColour(255, 255, 255);
image.SetMaskColour(255, 255, 255);
- bitmap =
image.ConvertToBitmap(
);
+ bitmap =
wxBitmap(image
);
#endif
#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);
}
// 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);
}
// 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,
// Begin drag
bool wxGenericDragImage::BeginDrag(const wxPoint& hotspot,
@@
-251,7
+254,9
@@
bool wxGenericDragImage::BeginDrag(const wxPoint& hotspot,
(*backing) = wxBitmap(clientSize.x, clientSize.y);
if (!m_fullScreen)
(*backing) = wxBitmap(clientSize.x, clientSize.y);
if (!m_fullScreen)
+ {
m_windowDC = new wxClientDC(window);
m_windowDC = new wxClientDC(window);
+ }
else
{
m_windowDC = new wxScreenDC;
else
{
m_windowDC = new wxScreenDC;
@@
-294,7
+299,13
@@
bool wxGenericDragImage::EndDrag()
{
if (m_window)
{
{
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);
if (m_cursor.Ok() && m_oldCursor.Ok())
{
m_window->SetCursor(m_oldCursor);
@@
-319,15
+330,19
@@
bool wxGenericDragImage::Move(const wxPoint& pt)
{
wxASSERT_MSG( (m_windowDC != (wxDC*) NULL), wxT("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)
// 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, pt
2
- m_offset, eraseOldImage, TRUE);
- m_position = pt;
+ m_position = pt
2
;
if (m_isShown)
m_isDirty = TRUE;
if (m_isShown)
m_isDirty = TRUE;
@@
-367,7
+382,8
@@
bool wxGenericDragImage::Show()
bool wxGenericDragImage::UpdateBackingFromWindow(wxDC& windowDC, wxMemoryDC& destDC,
const wxRect& sourceRect, const wxRect& destRect) const
{
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()
}
bool wxGenericDragImage::Hide()
@@
-497,3
+513,4
@@
wxRect wxGenericDragImage::GetImageRect(const wxPoint& pos) const
}
}
}
}
+#endif // wxUSE_DRAGIMAGE