X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ffecfa5aeb540b54914739dbb8603edbbd4c00a0..1f0acb435592470b421b80df854fbbb08cd2853f:/include/wx/palmos/dragimag.h?ds=sidebyside diff --git a/include/wx/palmos/dragimag.h b/include/wx/palmos/dragimag.h index 1a934527f1..bf98c42852 100644 --- 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" @@ -31,10 +27,6 @@ void MyTreeCtrl::OnBeginDrag(wxTreeEvent& event) { -#ifdef __WXMSW__ - ::UpdateWindow((HWND) GetHWND()); // We need to implement this in wxWidgets -#endif - CaptureMouse(); m_dragImage = new wxDragImage(* this, itemId); @@ -62,11 +54,6 @@ // Do some updating of the window, such as highlighting the drop target ... -#ifdef __WXMSW__ - if (updateWindow) - ::UpdateWindow((HWND) GetHWND()); -#endif - // Move and show the image again m_dragImage->Move(event.GetPosition(), this); m_dragImage->Show(this); @@ -101,7 +88,7 @@ * wxDragImage */ -class WXDLLEXPORT wxDragImage: public wxObject +class WXDLLIMPEXP_CORE wxDragImage: public wxObject { public: @@ -172,7 +159,7 @@ public: } #endif - ~wxDragImage(); + virtual ~wxDragImage(); // Attributes //////////////////////////////////////////////////////////////////////////// @@ -216,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 @@ -268,7 +255,7 @@ protected: private: DECLARE_DYNAMIC_CLASS(wxDragImage) - DECLARE_NO_COPY_CLASS(wxDragImage) + wxDECLARE_NO_COPY_CLASS(wxDragImage); }; #endif