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 6cea95e0340e9204e04f973bb7b1bc97214ac7a5..2563a895fd1be1eacf8731fd480f2efd7f2a923c 100644 (file)
--- a/include/wx/dragimag.h
+++ b/include/wx/dragimag.h
@@ -8,32 +8,32 @@ class WXDLLEXPORT wxMemoryDC;
 class WXDLLEXPORT wxDC;
 
 #if defined(__WXMSW__)
 class WXDLLEXPORT wxDC;
 
 #if defined(__WXMSW__)

-#if defined(__WIN16__)  || defined(__WXUNIVERSAL__)
-#include "wx/generic/dragimgg.h"
-#define wxDragImage wxGenericDragImage
+#   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__)
 #elif defined(__WXMOTIF__)

-#include "wx/generic/dragimgg.h"
-#define wxDragImage wxGenericDragImage
+#   include "wx/generic/dragimgg.h"
+#   define wxDragImage wxGenericDragImage

 
 #elif defined(__WXGTK__)
 
 #elif defined(__WXGTK__)

-#include "wx/generic/dragimgg.h"
-#define wxDragImage wxGenericDragImage
+#   include "wx/generic/dragimgg.h"
+#   define wxDragImage wxGenericDragImage

 
 #elif defined(__WXX11__)
 
 #elif defined(__WXX11__)

-#include "wx/generic/dragimgg.h"
-#define wxDragImage wxGenericDragImage
+#   include "wx/generic/dragimgg.h"
+#   define wxDragImage wxGenericDragImage

 
 #elif defined(__WXMAC__)
 
 #elif defined(__WXMAC__)

-#include "wx/generic/dragimgg.h"
-#define wxDragImage wxGenericDragImage
+#   include "wx/generic/dragimgg.h"
+#   define wxDragImage wxGenericDragImage

 
 #elif defined(__WXPM__)
 
 #elif defined(__WXPM__)

-#include "wx/generic/dragimgg.h"
-#define wxDragImage wxGenericDragImage
+#   include "wx/generic/dragimgg.h"
+#   define wxDragImage wxGenericDragImage

 
 #endif
 
 
 #endif