Revised #ifndef WX_PRECOMP headers, added missing #include wx/wxcrtvararg.h

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55772 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/propgrid/advprops.cpp b/src/propgrid/advprops.cpp
index 32faa91c4143c29b8f7eb1410241185e400a7b2b..686244e9be966f4c1ab9d51947228ccad4319366 100644 (file)
--- a/src/propgrid/advprops.cpp
+++ b/src/propgrid/advprops.cpp
@@ -42,11 +42,11 @@
     #include "wx/scrolwin.h"
     #include "wx/dirdlg.h"
     #include "wx/combobox.h"
-    #include "wx/layout.h"
     #include "wx/sizer.h"
     #include "wx/textdlg.h"
     #include "wx/filedlg.h"
     #include "wx/intl.h"
+    #include "wx/wxcrtvararg.h"
 #endif
 
 #define __wxPG_SOURCE_FILE__

diff --git a/src/propgrid/editors.cpp b/src/propgrid/editors.cpp
index 0cf23e0faad5341f66b8a13e0fe050fc50a6de04..dc12656da960ab6e33d0a660fcbfe0bda88d66a2 100644 (file)
--- a/src/propgrid/editors.cpp
+++ b/src/propgrid/editors.cpp
@@ -41,7 +41,6 @@
     #include "wx/stattext.h"
     #include "wx/scrolwin.h"
     #include "wx/dirdlg.h"
-    #include "wx/layout.h"
     #include "wx/sizer.h"
     #include "wx/textdlg.h"
     #include "wx/filedlg.h"

diff --git a/src/propgrid/manager.cpp b/src/propgrid/manager.cpp
index d328984250d16cc9abab6c55d230c6d966f71ac4..5253c01369c71d1c1af0e048f7784c2284562aaa 100644 (file)
--- a/src/propgrid/manager.cpp
+++ b/src/propgrid/manager.cpp
@@ -31,17 +31,9 @@
     #include "wx/pen.h"
     #include "wx/brush.h"
     #include "wx/cursor.h"
-    #include "wx/dialog.h"
     #include "wx/settings.h"
-    #include "wx/msgdlg.h"
-    #include "wx/choice.h"
     #include "wx/textctrl.h"
-    #include "wx/dirdlg.h"
-    #include "wx/combobox.h"
-    #include "wx/layout.h"
     #include "wx/sizer.h"
-    #include "wx/textdlg.h"
-    #include "wx/filedlg.h"
     #include "wx/statusbr.h"
     #include "wx/intl.h"
 #endif

diff --git a/src/propgrid/property.cpp b/src/propgrid/property.cpp
index 22d4655eb26996d5bfbb95c8e1d107a450b0efc5..c083039124381245a8f06a4e347a86d67af6343a 100644 (file)
--- a/src/propgrid/property.cpp
+++ b/src/propgrid/property.cpp
@@ -29,24 +29,10 @@
     #include "wx/panel.h"
     #include "wx/dc.h"
     #include "wx/dcmemory.h"
-    #include "wx/button.h"
     #include "wx/pen.h"
     #include "wx/brush.h"
-    #include "wx/cursor.h"
-    #include "wx/dialog.h"
     #include "wx/settings.h"
-    #include "wx/msgdlg.h"
-    #include "wx/choice.h"
-    #include "wx/stattext.h"
-    #include "wx/scrolwin.h"
-    #include "wx/dirdlg.h"
-    #include "wx/layout.h"
-    #include "wx/sizer.h"
-    #include "wx/textdlg.h"
-    #include "wx/filedlg.h"
-    #include "wx/statusbr.h"
     #include "wx/intl.h"
-    #include "wx/frame.h"
 #endif
 
 #include <wx/propgrid/propgrid.h>

diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp
index f7a68ab5dc9e223ddbcb47db50bbdeb7f701d4de..41b0144131f7bf945920d2491817e7ceb7a254ef 100644 (file)
--- a/src/propgrid/propgrid.cpp
+++ b/src/propgrid/propgrid.cpp
@@ -40,7 +40,6 @@
     #include "wx/stattext.h"
     #include "wx/scrolwin.h"
     #include "wx/dirdlg.h"
-    #include "wx/layout.h"
     #include "wx/sizer.h"
     #include "wx/textdlg.h"
     #include "wx/filedlg.h"

diff --git a/src/propgrid/propgridiface.cpp b/src/propgrid/propgridiface.cpp
index 8e20e67d0dca4eda6ede53a8bdf0d6167b5d4a23..75bf8bdd5282719d727afd04422850a0922b177b 100644 (file)
--- a/src/propgrid/propgridiface.cpp
+++ b/src/propgrid/propgridiface.cpp
@@ -32,21 +32,9 @@
     #include "wx/button.h"
     #include "wx/pen.h"
     #include "wx/brush.h"
-    #include "wx/cursor.h"
-    #include "wx/dialog.h"
     #include "wx/settings.h"
-    #include "wx/msgdlg.h"
-    #include "wx/choice.h"
-    #include "wx/stattext.h"
-    #include "wx/scrolwin.h"
-    #include "wx/dirdlg.h"
-    #include "wx/layout.h"
     #include "wx/sizer.h"
-    #include "wx/textdlg.h"
-    #include "wx/filedlg.h"
-    #include "wx/statusbr.h"
     #include "wx/intl.h"
-    #include "wx/frame.h"
 #endif
 
 #include <wx/propgrid/property.h>

diff --git a/src/propgrid/propgridpagestate.cpp b/src/propgrid/propgridpagestate.cpp
index a425b12d6a5c903323478e1b731fc9fb62789e31..6ee8c0f58f4a9dcf51c1971a0d8e4d0fa299a76e 100644 (file)
--- a/src/propgrid/propgridpagestate.cpp
+++ b/src/propgrid/propgridpagestate.cpp
@@ -29,25 +29,9 @@
     #include "wx/panel.h"
     #include "wx/dc.h"
     #include "wx/dcmemory.h"
-    #include "wx/button.h"
     #include "wx/pen.h"
     #include "wx/brush.h"
-    #include "wx/cursor.h"
-    #include "wx/dialog.h"
-    #include "wx/settings.h"
-    #include "wx/msgdlg.h"
-    #include "wx/choice.h"
-    #include "wx/stattext.h"
-    #include "wx/scrolwin.h"
-    #include "wx/dirdlg.h"
-    #include "wx/layout.h"
-    #include "wx/sizer.h"
-    #include "wx/textdlg.h"
-    #include "wx/filedlg.h"
-    #include "wx/statusbr.h"
     #include "wx/intl.h"
-    #include "wx/frame.h"
-    #include "wx/stopwatch.h"
 #endif
 
 // This define is necessary to prevent macro clearing

diff --git a/src/propgrid/props.cpp b/src/propgrid/props.cpp
index daa8ad7345eb786a0cb4db4050e8708603905fd5..54ab86acb6d01646b18dc064ff7d5403e712ab1e 100644 (file)
--- a/src/propgrid/props.cpp
+++ b/src/propgrid/props.cpp
@@ -46,7 +46,6 @@
     #include "wx/sizer.h"
     #include "wx/textdlg.h"
     #include "wx/filedlg.h"
-    #include "wx/statusbr.h"
     #include "wx/intl.h"
 #endif