Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

[wxWidgets.git] / interface / wx / dragimag.h

diff --git a/interface/wx/dragimag.h b/interface/wx/dragimag.h
index 9de1317021b53f1d57d2885a5348bba6cc4d3a33..b061b2ba1cbb04c9c3a6bc7d5aa9e7e4f599515c 100644 (file)
--- a/interface/wx/dragimag.h
+++ b/interface/wx/dragimag.h
@@ -3,12 +3,11 @@
 // Purpose:     interface of wxDragImage
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 /**
     @class wxDragImage
-    @wxheader{dragimag.h}
 
     This class is used when you wish to drag an object on the screen, and a
     simple cursor is not enough.
@@ -193,7 +192,7 @@ public:
         applications to draw their own image instead of using an actual bitmap.
         If you override this function, you must also override GetImageRect().
     */
-    virtual bool DoDrawImage(wxDC& dc, const wxPoint& pos);
+    virtual bool DoDrawImage(wxDC& dc, const wxPoint& pos) const;
 
     /**
         Call this when the drag has finished.
@@ -255,8 +254,8 @@ public:
 
         This function is available in wxGenericDragImage only.
     */
-    bool UpdateBackingFromWindow(wxDC& windowDC, wxMemoryDC& destDC,
-                                 const wxRect& sourceRect,
-                                 const wxRect& destRect) const;
+    virtual bool UpdateBackingFromWindow(wxDC& windowDC, wxMemoryDC& destDC,
+                                         const wxRect& sourceRect,
+                                         const wxRect& destRect) const;
 };