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

diff --git a/src/common/effects.cpp b/src/common/effects.cpp
index ed11c6934d426faeb2c374e7560db88e4318a811..c735d825dbb0e095b11be63c28482cd85047437a 100644 (file)
--- a/src/common/effects.cpp
+++ b/src/common/effects.cpp
@@ -20,10 +20,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/dcmemory.h"
 
 #ifndef WX_PRECOMP
     #include "wx/dcmemory.h"

+    #include "wx/pen.h"

 #endif //WX_PRECOMP
 
 #include "wx/gdicmn.h"
 #endif //WX_PRECOMP
 
 #include "wx/gdicmn.h"

-#include "wx/pen.h"

 #include "wx/settings.h"
 
 /*
 #include "wx/settings.h"
 
 /*

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index 61f65250351869420df858cfed099641e37ba594..b323e03a1b844668729b1c60e230a016fe45f261 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -28,10 +28,10 @@
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/dc.h"
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/dc.h"

+    #include "wx/pen.h"

 #endif
 
 #include "wx/brush.h"
 #endif
 
 #include "wx/brush.h"

-#include "wx/pen.h"

 #include "wx/bitmap.h"
 #include "wx/icon.h"
 #include "wx/cursor.h"
 #include "wx/bitmap.h"
 #include "wx/icon.h"
 #include "wx/cursor.h"

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index 82d28bc4c813adfe73c2026ec3264afc1d5d46ef..cf9ec7f9dc658c0ff4b3a5ad8c7d683c3f8ba91a 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -22,10 +22,10 @@
     #include "wx/dc.h"
     #include "wx/button.h"
     #include "wx/menu.h"
     #include "wx/dc.h"
     #include "wx/button.h"
     #include "wx/menu.h"

+    #include "wx/pen.h"

 #endif
 
 #include "wx/gdicmn.h"
 #endif
 
 #include "wx/gdicmn.h"

-#include "wx/pen.h"

 #include "wx/brush.h"
 #include "wx/cursor.h"
 #include "wx/icon.h"
 #include "wx/brush.h"
 #include "wx/cursor.h"
 #include "wx/icon.h"

diff --git a/src/mac/classic/app.cpp b/src/mac/classic/app.cpp
index e0c3cebdd93eb09e2004afd07a159e505cbf3a06..e1d1cbee1f57324de5e4e6ef4df5c0c46b36ae84 100644 (file)
--- a/src/mac/classic/app.cpp
+++ b/src/mac/classic/app.cpp
@@ -26,10 +26,10 @@
     #include "wx/dc.h"
     #include "wx/button.h"
     #include "wx/menu.h"
     #include "wx/dc.h"
     #include "wx/button.h"
     #include "wx/menu.h"

+    #include "wx/pen.h"

 #endif
 
 #include "wx/gdicmn.h"
 #endif
 
 #include "wx/gdicmn.h"

-#include "wx/pen.h"

 #include "wx/brush.h"
 #include "wx/cursor.h"
 #include "wx/icon.h"
 #include "wx/brush.h"
 #include "wx/cursor.h"
 #include "wx/icon.h"

diff --git a/src/msw/pen.cpp b/src/msw/pen.cpp
index d460b6a9b4a32d338df01a93506b2872020f69d8..745caf55b009686208cff1466a22f0289d7f1d35 100644 (file)
--- a/src/msw/pen.cpp
+++ b/src/msw/pen.cpp
@@ -16,12 +16,13 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/pen.h"
+

 #ifndef WX_PRECOMP
     #include <stdio.h>
     #include "wx/list.h"
     #include "wx/utils.h"
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include <stdio.h>
     #include "wx/list.h"
     #include "wx/utils.h"
     #include "wx/app.h"

-    #include "wx/pen.h"

 #endif
 
 #include "wx/msw/private.h"
 #endif
 
 #include "wx/msw/private.h"

diff --git a/src/os2/pen.cpp b/src/os2/pen.cpp
index b0523de11182b60e563c00b65ab15af765f4043e..b5699b6ae49ae3c1802d990b0897dec3b859d1a6 100644 (file)
--- a/src/os2/pen.cpp
+++ b/src/os2/pen.cpp
@@ -12,12 +12,13 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#include "wx/pen.h"
+

 #ifndef WX_PRECOMP
     #include <stdio.h>
     #include "wx/list.h"
     #include "wx/utils.h"
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include <stdio.h>
     #include "wx/list.h"
     #include "wx/utils.h"
     #include "wx/app.h"

-    #include "wx/pen.h"

     #include "wx/log.h"
 #endif
 
     #include "wx/log.h"
 #endif
 

diff --git a/src/palmos/pen.cpp b/src/palmos/pen.cpp
index 1290ab10aea677726b84ef592961d23cbaf78d90..af9311f7c26d23ee6dbeaee3b455521129ce0974 100644 (file)
--- a/src/palmos/pen.cpp
+++ b/src/palmos/pen.cpp
@@ -13,15 +13,16 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#include "wx/pen.h"
+

 #ifndef WX_PRECOMP
     #include <stdio.h>
     #include "wx/list.h"
     #include "wx/utils.h"
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include <stdio.h>
     #include "wx/list.h"
     #include "wx/utils.h"
     #include "wx/app.h"

-    #include "wx/pen.h"

 #endif
 
 static int wx2msPenStyle(int wx_style);
 #endif
 
 static int wx2msPenStyle(int wx_style);