correcting last commit

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

diff --git a/src/generic/dragimgg.cpp b/src/generic/dragimgg.cpp
index ac83bc99bdea6bbd79169d330d3af12f846cee67..ddc94cc7c5fe433212ff49f41ba1795a01a595ed 100644 (file)
--- a/src/generic/dragimgg.cpp
+++ b/src/generic/dragimgg.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "dragimgg.h"
 #endif
 
 #pragma implementation "dragimgg.h"
 #endif
 


@@ -44,11 +44,7 @@
 #include "wx/log.h"
 #include "wx/intl.h"
 
 #include "wx/log.h"
 #include "wx/intl.h"
 

-#ifdef __WIN16__
-#define wxUSE_IMAGE_IN_DRAGIMAGE 0
-#else

 #define wxUSE_IMAGE_IN_DRAGIMAGE 1
 #define wxUSE_IMAGE_IN_DRAGIMAGE 1

-#endif

 
 #if wxUSE_IMAGE_IN_DRAGIMAGE
 #include "wx/image.h"
 
 #if wxUSE_IMAGE_IN_DRAGIMAGE
 #include "wx/image.h"


@@ -80,11 +76,11 @@ wxGenericDragImage::~wxGenericDragImage()
 
 void wxGenericDragImage::Init()
 {
 
 void wxGenericDragImage::Init()
 {

-    m_isDirty = FALSE;
-    m_isShown = FALSE;
+    m_isDirty = false;
+    m_isShown = false;

     m_windowDC = (wxDC*) NULL;
     m_window = (wxWindow*) NULL;
     m_windowDC = (wxDC*) NULL;
     m_window = (wxWindow*) NULL;

-    m_fullScreen = FALSE;
+    m_fullScreen = false;

     m_pBackingBitmap = (wxBitmap*) NULL;
 }
 
     m_pBackingBitmap = (wxBitmap*) NULL;
 }
 


@@ -100,7 +96,7 @@ bool wxGenericDragImage::Create(const wxCursor& cursor)
 {
     m_cursor = cursor;
 
 {
     m_cursor = cursor;
 

-    return TRUE;
+    return true;

 }
 
 // Create a drag image from a bitmap and optional cursor
 }
 
 // Create a drag image from a bitmap and optional cursor


@@ -112,7 +108,7 @@ bool wxGenericDragImage::Create(const wxBitmap& image, const wxCursor& cursor)
     m_cursor = cursor;
     m_bitmap = image;
 
     m_cursor = cursor;
     m_bitmap = image;
 

-    return TRUE ;
+    return true ;

 }
 
 // Create a drag image from an icon and optional cursor
 }
 
 // Create a drag image from an icon and optional cursor


@@ -124,13 +120,13 @@ bool wxGenericDragImage::Create(const wxIcon& image, const wxCursor& cursor)
     m_cursor = cursor;
     m_icon = image;
 
     m_cursor = cursor;
     m_icon = image;
 

-    return TRUE ;
+    return true ;

 }
 
 // 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;


@@ -139,12 +135,12 @@ bool wxGenericDragImage::Create(const wxString& str, const wxCursor& cursor)
     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);


@@ -164,27 +160,31 @@ 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);
 }
 

+#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,


@@ -202,8 +202,8 @@ bool wxGenericDragImage::BeginDrag(const wxPoint& hotspot,
     if (rect)
         m_boundingRect = * rect;
 
     if (rect)
         m_boundingRect = * rect;
 

-    m_isDirty = FALSE;
-    m_isDirty = FALSE;
+    m_isDirty = false;
+    m_isDirty = false;

 
     if (window)
     {
 
     if (window)
     {


@@ -220,7 +220,7 @@ bool wxGenericDragImage::BeginDrag(const wxPoint& hotspot,
     // dragged.
 
     wxSize clientSize;
     // dragged.
 
     wxSize clientSize;

-    wxPoint pt(0, 0);
+    wxPoint pt;

     if (!m_fullScreen)
     {
         clientSize = window->GetClientSize();
     if (!m_fullScreen)
     {
         clientSize = window->GetClientSize();


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


@@ -264,7 +266,7 @@ bool wxGenericDragImage::BeginDrag(const wxPoint& hotspot,
             m_boundingRect.width, m_boundingRect.height);
     }
 
             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
 }
 
 // Begin drag. hotspot is the location of the drag position relative to the upper-left


@@ -276,7 +278,7 @@ bool wxGenericDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, wxW
 
     int x = fullScreenRect->GetPosition().x;
     int y = fullScreenRect->GetPosition().y;
 
     int x = fullScreenRect->GetPosition().x;
     int y = fullScreenRect->GetPosition().y;

-    
+

     wxSize sz = fullScreenRect->GetSize();
 
     if (fullScreenRect->GetParent() && !fullScreenRect->IsKindOf(CLASSINFO(wxFrame)))
     wxSize sz = fullScreenRect->GetSize();
 
     if (fullScreenRect->GetParent() && !fullScreenRect->IsKindOf(CLASSINFO(wxFrame)))


@@ -285,7 +287,7 @@ bool wxGenericDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, wxW
     rect.x = x; rect.y = y;
     rect.width = sz.x; rect.height = sz.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
 }
 
 // End drag


@@ -293,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);


@@ -309,7 +317,7 @@ bool wxGenericDragImage::EndDrag()
 
     m_repairBitmap = wxNullBitmap;
 
 
     m_repairBitmap = wxNullBitmap;
 

-    return TRUE;
+    return true;

 }
 
 // Move the image: call from OnMouseMove. Pt is in window client coordinates if window
 }
 
 // Move the image: call from OnMouseMove. Pt is in window client coordinates if window


@@ -326,22 +334,22 @@ bool wxGenericDragImage::Move(const wxPoint& pt)
     wxPoint oldPos = m_position;
 
     bool eraseOldImage = (m_isDirty && m_isShown);
     wxPoint oldPos = m_position;
 
     bool eraseOldImage = (m_isDirty && m_isShown);

-    
+

     if (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_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()") );
 }
 
 bool wxGenericDragImage::Show()
 {
     wxASSERT_MSG( (m_windowDC != (wxDC*) NULL), wxT("No window DC in wxGenericDragImage::Show()") );

-    
+

     // Show at the current position
 
     if (!m_isShown)
     // Show at the current position
 
     if (!m_isShown)


@@ -358,19 +366,20 @@ bool wxGenericDragImage::Show()
         //memDC.Blit(0, 0, m_boundingRect.width, m_boundingRect.height, m_windowDC, m_boundingRect.x, m_boundingRect.y);
         memDC.SelectObject(wxNullBitmap);
 
         //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_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,
     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()


@@ -381,13 +390,13 @@ bool wxGenericDragImage::Hide()
 
     if (m_isShown && m_isDirty)
     {
 
     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
 }
 
 // More efficient: erase and redraw simultaneously if possible


@@ -395,11 +404,11 @@ bool wxGenericDragImage::RedrawImage(const wxPoint& oldPos, const wxPoint& newPo
                                      bool eraseOld, bool drawNew)
 {
     if (!m_windowDC)
                                      bool eraseOld, bool drawNew)
 {
     if (!m_windowDC)

-        return FALSE;
+        return false;

 
     wxBitmap* backing = (m_pBackingBitmap ? m_pBackingBitmap : (wxBitmap*) & m_backingBitmap);
     if (!backing->Ok())
 
     wxBitmap* backing = (m_pBackingBitmap ? m_pBackingBitmap : (wxBitmap*) & m_backingBitmap);
     if (!backing->Ok())

-        return FALSE;
+        return false;

 
     wxRect oldRect(GetImageRect(oldPos));
     wxRect newRect(GetImageRect(newPos));
 
     wxRect oldRect(GetImageRect(oldPos));
     wxRect newRect(GetImageRect(newPos));


@@ -463,7 +472,7 @@ bool wxGenericDragImage::RedrawImage(const wxPoint& oldPos, const wxPoint& newPo
     memDCTemp.SelectObject(wxNullBitmap);
     memDC.SelectObject(wxNullBitmap);
 
     memDCTemp.SelectObject(wxNullBitmap);
     memDC.SelectObject(wxNullBitmap);
 

-    return TRUE;
+    return true;

 }
 
 // Override this if you are using a virtual image (drawing your own image)
 }
 
 // Override this if you are using a virtual image (drawing your own image)


@@ -472,15 +481,15 @@ 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));
     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);
     }
     else if (m_icon.Ok())
     {
         dc.DrawIcon(m_icon, pos.x, pos.y);

-        return TRUE;
+        return true;

     }
     else
     }
     else

-        return FALSE;
+        return false;

 }
 
 // Override this if you are using a virtual image (drawing your own image)
 }
 
 // Override this if you are using a virtual image (drawing your own image)