build fixes

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

diff --git a/include/wx/msw/dragimag.h b/include/wx/msw/dragimag.h
index 88192d97f2383fc0f1609bad1d4b5e163b466efa..060900101e4a543084751b28454f6cd985627db8 100644 (file)
--- a/include/wx/msw/dragimag.h
+++ b/include/wx/msw/dragimag.h
@@ -13,9 +13,7 @@
 #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
+#if wxUSE_DRAGIMAGE

 
 #include "wx/bitmap.h"
 #include "wx/icon.h"
 
 #include "wx/bitmap.h"
 #include "wx/icon.h"


@@ -32,7 +30,7 @@
   void MyTreeCtrl::OnBeginDrag(wxTreeEvent& event)
   {
 #ifdef __WXMSW__
   void MyTreeCtrl::OnBeginDrag(wxTreeEvent& event)
   {
 #ifdef __WXMSW__

-    ::UpdateWindow((HWND) GetHWND()); // We need to implement this in wxWindows
+    ::UpdateWindow((HWND) GetHWND()); // We need to implement this in wxWidgets

 #endif
 
     CaptureMouse();
 #endif
 
     CaptureMouse();


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

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

 
     // Attributes
     ////////////////////////////////////////////////////////////////////////////
 
     // Attributes
     ////////////////////////////////////////////////////////////////////////////


@@ -216,7 +214,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 = (wxRect*) 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


@@ -271,5 +269,6 @@ private:
     DECLARE_NO_COPY_CLASS(wxDragImage)
 };
 
     DECLARE_NO_COPY_CLASS(wxDragImage)
 };
 

+#endif // wxUSE_DRAGIMAGE

 #endif
     // _WX_DRAGIMAG_H_
 #endif
     // _WX_DRAGIMAG_H_