Some wxComboCtrlBase member functions were enclosed within incorrect compatibility...

[wxWidgets.git] / include / wx / palmos / dragimag.h

diff --git a/include/wx/palmos/dragimag.h b/include/wx/palmos/dragimag.h
index a522400c258bef45a96788c8d9c6473251e4f10c..bf98c42852221bb538a0b630d888b3199671a69f 100644 (file)
--- a/include/wx/palmos/dragimag.h
+++ b/include/wx/palmos/dragimag.h
@@ -2,10 +2,10 @@
 // Name:        wx/palmos/dragimag.h
 // Purpose:     wxDragImage class: a kind of a cursor, that can cope
 //              with more sophisticated images
-// Author:      William Osborne
+// Author:      William Osborne - minimal working wxPalmOS port
 // Modified by:
 // Created:     10/13/04
-// RCS-ID:      $Id:
+// RCS-ID:      $Id$
 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -13,10 +13,6 @@
 #ifndef _WX_DRAGIMAG_H_
 #define _WX_DRAGIMAG_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "dragimag.h"
-#endif
-
 #include "wx/bitmap.h"
 #include "wx/icon.h"
 #include "wx/cursor.h"
@@ -92,7 +88,7 @@
  * wxDragImage
  */
 
-class WXDLLEXPORT wxDragImage: public wxObject
+class WXDLLIMPEXP_CORE wxDragImage: public wxObject
 {
 public:
 
@@ -163,7 +159,7 @@ public:
     }
 #endif
 
-    ~wxDragImage();
+    virtual ~wxDragImage();
 
     // Attributes
     ////////////////////////////////////////////////////////////////////////////
@@ -207,7 +203,7 @@ public:
 
     // 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
@@ -259,7 +255,7 @@ protected:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxDragImage)
-    DECLARE_NO_COPY_CLASS(wxDragImage)
+    wxDECLARE_NO_COPY_CLASS(wxDragImage);
 };
 
 #endif