Use the correct WXDLLEXPORT declaration.

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

diff --git a/include/wx/msw/dragimag.h b/include/wx/msw/dragimag.h
index 49b745c8363fc07472aeb35bb16ed5138e94c76c..5286ab847bc0a3445360a28a145db7ebaee1211b 100644 (file)
--- a/include/wx/msw/dragimag.h
+++ b/include/wx/msw/dragimag.h
@@ -13,7 +13,7 @@
 #ifndef _WX_DRAGIMAG_H_
 #define _WX_DRAGIMAG_H_
 
 #ifndef _WX_DRAGIMAG_H_
 #define _WX_DRAGIMAG_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "dragimag.h"
 #endif
 
 #pragma interface "dragimag.h"
 #endif
 


@@ -32,7 +32,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();


@@ -154,19 +154,23 @@ public:
         Create(str, cursor, cursorHotspot);
     }
 
         Create(str, cursor, cursorHotspot);
     }
 

+#if wxUSE_TREECTRL

     wxDragImage(const wxTreeCtrl& treeCtrl, wxTreeItemId& id)
     {
         Init();
 
         Create(treeCtrl, id);
     }
     wxDragImage(const wxTreeCtrl& treeCtrl, wxTreeItemId& id)
     {
         Init();
 
         Create(treeCtrl, id);
     }

+#endif

 
 

+#if wxUSE_LISTCTRL

     wxDragImage(const wxListCtrl& listCtrl, long id)
     {
         Init();
 
         Create(listCtrl, id);
     }
     wxDragImage(const wxListCtrl& listCtrl, long id)
     {
         Init();
 
         Create(listCtrl, id);
     }

+#endif

 
     ~wxDragImage();
 
 
     ~wxDragImage();
 


@@ -200,15 +204,19 @@ public:
         return Create(str, cursor);
     }
 
         return Create(str, cursor);
     }
 

+#if wxUSE_TREECTRL

     // Create a drag image for the given tree control item
     bool Create(const wxTreeCtrl& treeCtrl, wxTreeItemId& id);
     // Create a drag image for the given tree control item
     bool Create(const wxTreeCtrl& treeCtrl, wxTreeItemId& id);

+#endif

 
 

+#if wxUSE_LISTCTRL

     // Create a drag image for the given list control item
     bool Create(const wxListCtrl& listCtrl, long id);
     // Create a drag image for the given list control item
     bool Create(const wxListCtrl& listCtrl, long id);

+#endif

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