Remove SetPageTitle and GetPageTitle and make GetCurrentTitle actually return the...

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

diff --git a/include/wx/palmos/dragimag.h b/include/wx/palmos/dragimag.h
index 1a934527f1635c31704dc8141c09c290e249da15..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
 // 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
 // Modified by:
 // Created:     10/13/04

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$

 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -13,10 +13,6 @@
 #ifndef _WX_DRAGIMAG_H_
 #define _WX_DRAGIMAG_H_
 
 #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"
 #include "wx/bitmap.h"
 #include "wx/icon.h"
 #include "wx/cursor.h"


@@ -31,10 +27,6 @@
 
   void MyTreeCtrl::OnBeginDrag(wxTreeEvent& event)
   {
 
   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);
     CaptureMouse();
 
     m_dragImage = new wxDragImage(* this, itemId);


@@ -62,11 +54,6 @@
     // Do some updating of the window, such as highlighting the drop target
     ...
 
     // 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);
     // Move and show the image again
     m_dragImage->Move(event.GetPosition(), this);
     m_dragImage->Show(this);


@@ -101,7 +88,7 @@
  * wxDragImage
  */
 
  * wxDragImage
  */
 

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

 {
 public:
 
 {
 public:
 


@@ -172,7 +159,7 @@ public:
     }
 #endif
 
     }
 #endif
 

-    ~wxDragImage();
+    virtual ~wxDragImage();

 
     // Attributes
     ////////////////////////////////////////////////////////////////////////////
 
     // 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.
 
     // 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


@@ -268,7 +255,7 @@ protected:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxDragImage)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxDragImage)

-    DECLARE_NO_COPY_CLASS(wxDragImage)
+    wxDECLARE_NO_COPY_CLASS(wxDragImage);

 };
 
 #endif
 };
 
 #endif