wxRTC: fixed guidelines overwriting adjacent cell borders; corrected capitalisation...

[wxWidgets.git] / include / wx / generic / dragimgg.h

diff --git a/include/wx/generic/dragimgg.h b/include/wx/generic/dragimgg.h
index 6821d22f9f422adc04811e7fd423e002f009c37f..9c90e163f26fb500e0ed3f6762223dd264e3e057 100644 (file)
--- a/include/wx/generic/dragimgg.h
+++ b/include/wx/generic/dragimgg.h
@@ -5,7 +5,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     29/2/2000
 // Author:      Julian Smart
 // Modified by:
 // Created:     29/2/2000

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -19,10 +18,7 @@
 #include "wx/treectrl.h"
 #include "wx/listctrl.h"
 #include "wx/log.h"
 #include "wx/treectrl.h"
 #include "wx/listctrl.h"
 #include "wx/log.h"

-
-#if defined(wxMAC_USE_CORE_GRAPHICS) && wxMAC_USE_CORE_GRAPHICS
-#include "wx/dc.h"
-#endif
+#include "wx/overlay.h"

 
 /*
   To use this class, create a wxDragImage when you start dragging, for example:
 
 /*
   To use this class, create a wxDragImage when you start dragging, for example:


@@ -91,7 +87,7 @@
  * wxGenericDragImage
  */
 
  * wxGenericDragImage
  */
 

-class WXDLLEXPORT wxGenericDragImage: public wxObject
+class WXDLLIMPEXP_CORE wxGenericDragImage: public wxObject

 {
 public:
 
 {
 public:
 


@@ -160,14 +156,14 @@ public:
     // Attributes
     ////////////////////////////////////////////////////////////////////////////
 
     // Attributes
     ////////////////////////////////////////////////////////////////////////////
 

+#ifdef wxHAS_NATIVE_OVERLAY
+    // backing store is not used when native overlays are
+    void SetBackingBitmap(wxBitmap* WXUNUSED(bitmap)) { }
+#else

     // For efficiency, tell wxGenericDragImage to use a bitmap that's already
     // created (e.g. from last drag)
     // For efficiency, tell wxGenericDragImage to use a bitmap that's already
     // created (e.g. from last drag)

-    void SetBackingBitmap(wxBitmap* bitmap) { 
-#if defined(wxMAC_USE_CORE_GRAPHICS) && wxMAC_USE_CORE_GRAPHICS
-#else
-        m_pBackingBitmap = bitmap; 
-#endif
-    }
+    void SetBackingBitmap(wxBitmap* bitmap) { m_pBackingBitmap = bitmap; }
+#endif // wxHAS_NATIVE_OVERLAY/!wxHAS_NATIVE_OVERLAY

 
     // Operations
     ////////////////////////////////////////////////////////////////////////////
 
     // Operations
     ////////////////////////////////////////////////////////////////////////////


@@ -196,7 +192,7 @@ public:
 
     // Begin drag. hotspot is the location of the drag position relative to the upper-left
     // corner of the image.
 
     // Begin drag. hotspot is the location of the drag position relative to the upper-left
     // corner of the image.

-    bool BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullScreen = false, wxRect* rect = (wxRect*) NULL);
+    bool BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullScreen = false, wxRect* rect = NULL);

 
     // Begin drag. hotspot is the location of the drag position relative to the upper-left
     // corner of the image. This is full screen only. fullScreenRect gives the
 
     // Begin drag. hotspot is the location of the drag position relative to the upper-left
     // corner of the image. This is full screen only. fullScreenRect gives the


@@ -251,7 +247,7 @@ protected:
     wxWindow*       m_window;
     wxDC*           m_windowDC;
 
     wxWindow*       m_window;
     wxDC*           m_windowDC;
 

-#if defined(wxMAC_USE_CORE_GRAPHICS) && wxMAC_USE_CORE_GRAPHICS
+#ifdef wxHAS_NATIVE_OVERLAY

     wxOverlay       m_overlay;
     wxDCOverlay*     m_dcOverlay;
 #else
     wxOverlay       m_overlay;
     wxDCOverlay*     m_dcOverlay;
 #else


@@ -261,14 +257,14 @@ protected:
                                       // (pass to wxGenericDragImage as an efficiency measure)
     // A temporary bitmap for repairing/redrawing
     wxBitmap        m_repairBitmap;
                                       // (pass to wxGenericDragImage as an efficiency measure)
     // A temporary bitmap for repairing/redrawing
     wxBitmap        m_repairBitmap;

-#endif
+#endif // !wxHAS_NATIVE_OVERLAY

 
     wxRect          m_boundingRect;
     bool            m_fullScreen;
 
 private:
     DECLARE_DYNAMIC_CLASS(wxGenericDragImage)
 
     wxRect          m_boundingRect;
     bool            m_fullScreen;
 
 private:
     DECLARE_DYNAMIC_CLASS(wxGenericDragImage)

-    DECLARE_NO_COPY_CLASS(wxGenericDragImage)
+    wxDECLARE_NO_COPY_CLASS(wxGenericDragImage);

 };
 
 #endif
 };
 
 #endif