Include wx/pen.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39228 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		@@ -20,10 +20,10 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#ifndef WX_PRECOMP
 | 
					#ifndef WX_PRECOMP
 | 
				
			||||||
    #include "wx/dcmemory.h"
 | 
					    #include "wx/dcmemory.h"
 | 
				
			||||||
 | 
					    #include "wx/pen.h"
 | 
				
			||||||
#endif //WX_PRECOMP
 | 
					#endif //WX_PRECOMP
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "wx/gdicmn.h"
 | 
					#include "wx/gdicmn.h"
 | 
				
			||||||
#include "wx/pen.h"
 | 
					 | 
				
			||||||
#include "wx/settings.h"
 | 
					#include "wx/settings.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -28,10 +28,10 @@
 | 
				
			|||||||
    #include "wx/app.h"
 | 
					    #include "wx/app.h"
 | 
				
			||||||
    #include "wx/utils.h"
 | 
					    #include "wx/utils.h"
 | 
				
			||||||
    #include "wx/dc.h"
 | 
					    #include "wx/dc.h"
 | 
				
			||||||
 | 
					    #include "wx/pen.h"
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "wx/brush.h"
 | 
					#include "wx/brush.h"
 | 
				
			||||||
#include "wx/pen.h"
 | 
					 | 
				
			||||||
#include "wx/bitmap.h"
 | 
					#include "wx/bitmap.h"
 | 
				
			||||||
#include "wx/icon.h"
 | 
					#include "wx/icon.h"
 | 
				
			||||||
#include "wx/cursor.h"
 | 
					#include "wx/cursor.h"
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -22,10 +22,10 @@
 | 
				
			|||||||
    #include "wx/dc.h"
 | 
					    #include "wx/dc.h"
 | 
				
			||||||
    #include "wx/button.h"
 | 
					    #include "wx/button.h"
 | 
				
			||||||
    #include "wx/menu.h"
 | 
					    #include "wx/menu.h"
 | 
				
			||||||
 | 
					    #include "wx/pen.h"
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "wx/gdicmn.h"
 | 
					#include "wx/gdicmn.h"
 | 
				
			||||||
#include "wx/pen.h"
 | 
					 | 
				
			||||||
#include "wx/brush.h"
 | 
					#include "wx/brush.h"
 | 
				
			||||||
#include "wx/cursor.h"
 | 
					#include "wx/cursor.h"
 | 
				
			||||||
#include "wx/icon.h"
 | 
					#include "wx/icon.h"
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -26,10 +26,10 @@
 | 
				
			|||||||
    #include "wx/dc.h"
 | 
					    #include "wx/dc.h"
 | 
				
			||||||
    #include "wx/button.h"
 | 
					    #include "wx/button.h"
 | 
				
			||||||
    #include "wx/menu.h"
 | 
					    #include "wx/menu.h"
 | 
				
			||||||
 | 
					    #include "wx/pen.h"
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "wx/gdicmn.h"
 | 
					#include "wx/gdicmn.h"
 | 
				
			||||||
#include "wx/pen.h"
 | 
					 | 
				
			||||||
#include "wx/brush.h"
 | 
					#include "wx/brush.h"
 | 
				
			||||||
#include "wx/cursor.h"
 | 
					#include "wx/cursor.h"
 | 
				
			||||||
#include "wx/icon.h"
 | 
					#include "wx/icon.h"
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -16,12 +16,13 @@
 | 
				
			|||||||
    #pragma hdrstop
 | 
					    #pragma hdrstop
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include "wx/pen.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#ifndef WX_PRECOMP
 | 
					#ifndef WX_PRECOMP
 | 
				
			||||||
    #include <stdio.h>
 | 
					    #include <stdio.h>
 | 
				
			||||||
    #include "wx/list.h"
 | 
					    #include "wx/list.h"
 | 
				
			||||||
    #include "wx/utils.h"
 | 
					    #include "wx/utils.h"
 | 
				
			||||||
    #include "wx/app.h"
 | 
					    #include "wx/app.h"
 | 
				
			||||||
    #include "wx/pen.h"
 | 
					 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "wx/msw/private.h"
 | 
					#include "wx/msw/private.h"
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -12,12 +12,13 @@
 | 
				
			|||||||
// For compilers that support precompilation, includes "wx.h".
 | 
					// For compilers that support precompilation, includes "wx.h".
 | 
				
			||||||
#include "wx/wxprec.h"
 | 
					#include "wx/wxprec.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include "wx/pen.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#ifndef WX_PRECOMP
 | 
					#ifndef WX_PRECOMP
 | 
				
			||||||
    #include <stdio.h>
 | 
					    #include <stdio.h>
 | 
				
			||||||
    #include "wx/list.h"
 | 
					    #include "wx/list.h"
 | 
				
			||||||
    #include "wx/utils.h"
 | 
					    #include "wx/utils.h"
 | 
				
			||||||
    #include "wx/app.h"
 | 
					    #include "wx/app.h"
 | 
				
			||||||
    #include "wx/pen.h"
 | 
					 | 
				
			||||||
    #include "wx/log.h"
 | 
					    #include "wx/log.h"
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -13,15 +13,16 @@
 | 
				
			|||||||
#include "wx/wxprec.h"
 | 
					#include "wx/wxprec.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#ifdef __BORLANDC__
 | 
					#ifdef __BORLANDC__
 | 
				
			||||||
#pragma hdrstop
 | 
					    #pragma hdrstop
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include "wx/pen.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#ifndef WX_PRECOMP
 | 
					#ifndef WX_PRECOMP
 | 
				
			||||||
    #include <stdio.h>
 | 
					    #include <stdio.h>
 | 
				
			||||||
    #include "wx/list.h"
 | 
					    #include "wx/list.h"
 | 
				
			||||||
    #include "wx/utils.h"
 | 
					    #include "wx/utils.h"
 | 
				
			||||||
    #include "wx/app.h"
 | 
					    #include "wx/app.h"
 | 
				
			||||||
    #include "wx/pen.h"
 | 
					 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static int wx2msPenStyle(int wx_style);
 | 
					static int wx2msPenStyle(int wx_style);
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user