X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3080bf599a2422855b0a83726413605f842c9545..4837b89e3b9ddc02a752d9937e3e1d9f92328851:/src/generic/dragimgg.cpp?ds=sidebyside

diff --git a/src/generic/dragimgg.cpp b/src/generic/dragimgg.cpp
index 9d6ae54d29..c931955788 100644
--- a/src/generic/dragimgg.cpp
+++ b/src/generic/dragimgg.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
-#pragma implementation "dragimgg.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -44,11 +40,7 @@
 #include "wx/log.h"
 #include "wx/intl.h"
 
-#ifdef __WIN16__
-#define wxUSE_IMAGE_IN_DRAGIMAGE 0
-#else
 #define wxUSE_IMAGE_IN_DRAGIMAGE 1
-#endif
 
 #if wxUSE_IMAGE_IN_DRAGIMAGE
 #include "wx/image.h"
@@ -80,11 +72,11 @@ wxGenericDragImage::~wxGenericDragImage()
 
 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;
     m_pBackingBitmap = (wxBitmap*) NULL;
 }
 
@@ -100,7 +92,7 @@ bool wxGenericDragImage::Create(const wxCursor& cursor)
 {
     m_cursor = cursor;
 
-    return TRUE;
+    return true;
 }
 
 // Create a drag image from a bitmap and optional cursor
@@ -112,7 +104,7 @@ bool wxGenericDragImage::Create(const wxBitmap& image, const wxCursor& cursor)
     m_cursor = cursor;
     m_bitmap = image;
 
-    return TRUE ;
+    return true ;
 }
 
 // Create a drag image from an icon and optional cursor
@@ -124,7 +116,7 @@ bool wxGenericDragImage::Create(const wxIcon& image, const wxCursor& cursor)
     m_cursor = cursor;
     m_icon = image;
 
-    return TRUE ;
+    return true ;
 }
 
 // Create a drag image from a string and optional cursor
@@ -206,8 +198,8 @@ bool wxGenericDragImage::BeginDrag(const wxPoint& hotspot,
     if (rect)
         m_boundingRect = * rect;
 
-    m_isDirty = FALSE;
-    m_isDirty = FALSE;
+    m_isDirty = false;
+    m_isDirty = false;
 
     if (window)
     {
@@ -224,7 +216,7 @@ bool wxGenericDragImage::BeginDrag(const wxPoint& hotspot,
     // dragged.
 
     wxSize clientSize;
-    wxPoint pt(0, 0);
+    wxPoint pt;
     if (!m_fullScreen)
     {
         clientSize = window->GetClientSize();
@@ -270,7 +262,7 @@ bool wxGenericDragImage::BeginDrag(const wxPoint& hotspot,
             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
@@ -282,7 +274,7 @@ bool wxGenericDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, wxW
 
     int x = fullScreenRect->GetPosition().x;
     int y = fullScreenRect->GetPosition().y;
-    
+
     wxSize sz = fullScreenRect->GetSize();
 
     if (fullScreenRect->GetParent() && !fullScreenRect->IsKindOf(CLASSINFO(wxFrame)))
@@ -291,7 +283,7 @@ bool wxGenericDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, wxW
     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
@@ -321,7 +313,7 @@ bool wxGenericDragImage::EndDrag()
 
     m_repairBitmap = wxNullBitmap;
 
-    return TRUE;
+    return true;
 }
 
 // Move the image: call from OnMouseMove. Pt is in window client coordinates if window
@@ -338,22 +330,22 @@ bool wxGenericDragImage::Move(const wxPoint& pt)
     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)
@@ -370,13 +362,13 @@ bool wxGenericDragImage::Show()
         //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,
@@ -394,13 +386,13 @@ bool wxGenericDragImage::Hide()
 
     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
@@ -408,11 +400,11 @@ bool wxGenericDragImage::RedrawImage(const wxPoint& oldPos, const wxPoint& newPo
                                      bool eraseOld, bool drawNew)
 {
     if (!m_windowDC)
-        return FALSE;
+        return false;
 
     wxBitmap* backing = (m_pBackingBitmap ? m_pBackingBitmap : (wxBitmap*) & m_backingBitmap);
     if (!backing->Ok())
-        return FALSE;
+        return false;
 
     wxRect oldRect(GetImageRect(oldPos));
     wxRect newRect(GetImageRect(newPos));
@@ -476,7 +468,7 @@ bool wxGenericDragImage::RedrawImage(const wxPoint& oldPos, const wxPoint& newPo
     memDCTemp.SelectObject(wxNullBitmap);
     memDC.SelectObject(wxNullBitmap);
 
-    return TRUE;
+    return true;
 }
 
 // Override this if you are using a virtual image (drawing your own image)
@@ -485,15 +477,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));
-        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)