merged 2.4 branch into the trunk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		@@ -8,7 +8,7 @@ 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
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user