A few tweaks and cleanups

[wxWidgets.git] / src / generic / dragimgg.cpp

diff --git a/src/generic/dragimgg.cpp b/src/generic/dragimgg.cpp
index 40c71aba6ffec08dd94e77dad1f7096ac65d0c32..d625524ed37e72bf31b04cad9b2fd4c88c8958ee 100644 (file)
--- a/src/generic/dragimgg.cpp
+++ b/src/generic/dragimgg.cpp
@@ -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"


@@ -128,7 +130,7 @@ bool wxGenericDragImage::Create(const wxIcon& image, const wxCursor& cursor)
 // Create a drag image from a string and optional cursor
 bool wxGenericDragImage::Create(const wxString& str, const wxCursor& cursor)
 {
 // Create a drag image from a string and optional cursor
 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;
 
     long w, h;
     wxScreenDC dc;


@@ -162,9 +164,9 @@ bool wxGenericDragImage::Create(const wxString& str, const wxCursor& cursor)
 
 #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
 
     return Create(bitmap, cursor);
 #endif
 
     return Create(bitmap, cursor);


@@ -248,7 +250,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;


@@ -291,7 +295,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);


@@ -368,7 +378,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()


@@ -498,3 +509,4 @@ wxRect wxGenericDragImage::GetImageRect(const wxPoint& pos) const
     }
 }
 
     }
 }
 

+#endif // wxUSE_DRAGIMAGE