added wxStaticCast, moved wxConstCast from wx/object.h to wx/defs.h for consistency

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

diff --git a/include/wx/dragimag.h b/include/wx/dragimag.h
index 097edaacd30d0b29fe0dcd29ad0cb867ed63d884..6cea95e0340e9204e04f973bb7b1bc97214ac7a5 100644 (file)
--- a/include/wx/dragimag.h
+++ b/include/wx/dragimag.h
@@ -8,10 +8,9 @@ class WXDLLEXPORT wxMemoryDC;
 class WXDLLEXPORT wxDC;
 
 #if defined(__WXMSW__)
-#ifdef __WIN16__
+#if defined(__WIN16__)  || defined(__WXUNIVERSAL__)
 #include "wx/generic/dragimgg.h"
 #define wxDragImage wxGenericDragImage
-#define sm_classwxDragImage sm_classwxGenericDragImage
 
 #else
 #include "wx/msw/dragimag.h"
@@ -19,32 +18,22 @@ class WXDLLEXPORT wxDC;
 #elif defined(__WXMOTIF__)
 #include "wx/generic/dragimgg.h"
 #define wxDragImage wxGenericDragImage
-#define sm_classwxDragImage sm_classwxGenericDragImage
 
 #elif defined(__WXGTK__)
 #include "wx/generic/dragimgg.h"
 #define wxDragImage wxGenericDragImage
-#define sm_classwxDragImage sm_classwxGenericDragImage
 
 #elif defined(__WXX11__)
 #include "wx/generic/dragimgg.h"
 #define wxDragImage wxGenericDragImage
-#define sm_classwxDragImage sm_classwxGenericDragImage
 
 #elif defined(__WXMAC__)
 #include "wx/generic/dragimgg.h"
 #define wxDragImage wxGenericDragImage
-#define sm_classwxDragImage sm_classwxGenericDragImage
 
 #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
 
 #endif