bug fixes for using wxTransientPopupWindow and wxDP_ALLOWNONE support from Andreas...

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

diff --git a/include/wx/dragimag.h b/include/wx/dragimag.h
index f467fc1d199b87f18bfa2e895c94f2944290a526..2563a895fd1be1eacf8731fd480f2efd7f2a923c 100644 (file)
--- a/include/wx/dragimag.h
+++ b/include/wx/dragimag.h
@@ -1,50 +1,43 @@
 #ifndef _WX_DRAGIMAG_H_BASE_
 #define _WX_DRAGIMAG_H_BASE_
 
-#if wxUSE_DRAGIMAG
+#if wxUSE_DRAGIMAGE
+
+class WXDLLEXPORT wxRect;
+class WXDLLEXPORT wxMemoryDC;
+class WXDLLEXPORT wxDC;
 
 #if defined(__WXMSW__)
-#ifdef __WIN16__
-#include "wx/generic/dragimgg.h"
-#define wxDragImage wxGenericDragImage
-#define sm_classwxDragImage sm_classwxGenericDragImage
+#   if defined(__WXUNIVERSAL__)
+#       include "wx/generic/dragimgg.h"
+#       define wxDragImage wxGenericDragImage
+#   else
+#       include "wx/msw/dragimag.h"
+#   endif
 
-#else
-#include "wx/msw/dragimag.h"
-#endif
 #elif defined(__WXMOTIF__)
-#include "wx/generic/dragimgg.h"
-#define wxDragImage wxGenericDragImage
-#define sm_classwxDragImage sm_classwxGenericDragImage
+#   include "wx/generic/dragimgg.h"
+#   define wxDragImage wxGenericDragImage
 
 #elif defined(__WXGTK__)
-#include "wx/generic/dragimgg.h"
-#define wxDragImage wxGenericDragImage
-#define sm_classwxDragImage sm_classwxGenericDragImage
+#   include "wx/generic/dragimgg.h"
+#   define wxDragImage wxGenericDragImage
 
-#elif defined(__WXQT__)
-#include "wx/generic/dragimgg.h"
-#define wxDragImage wxGenericDragImage
-#define sm_classwxDragImage sm_classwxGenericDragImage
+#elif defined(__WXX11__)
+#   include "wx/generic/dragimgg.h"
+#   define wxDragImage wxGenericDragImage
 
 #elif defined(__WXMAC__)
-#include "wx/generic/dragimgg.h"
-#define wxDragImage wxGenericDragImage
-#define sm_classwxDragImage sm_classwxGenericDragImage
+#   include "wx/generic/dragimgg.h"
+#   define wxDragImage wxGenericDragImage
 
 #elif defined(__WXPM__)
-#include "wx/generic/dragimgg.h"
-#define wxDragImage wxGenericDragImage
-#define sm_classwxDragImage sm_classwxGenericDragImage
-
-#elif defined(__WXSTUBS__)
-#include "wx/generic/dragimgg.h"
-#define wxDragImage wxGenericDragImage
-#define sm_classwxDragImage sm_classwxGenericDragImage
+#   include "wx/generic/dragimgg.h"
+#   define wxDragImage wxGenericDragImage
 
 #endif
 
-#endif // wxUSE_DRAGIMAG
+#endif // wxUSE_DRAGIMAGE
 
 #endif
     // _WX_DRAGIMAG_H_BASE_