Include wx/choicdlg.h, wx/textdlg.h and wx/filedlg.h according to precompiled headers...

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

diff --git a/src/cocoa/filedlg.mm b/src/cocoa/filedlg.mm
index 42e88594d6f189282c7a8472b50bfb494cae229e..0070821f25602d7ae8fbd74c0aaa90e9fa450c73 100644 (file)
--- a/src/cocoa/filedlg.mm
+++ b/src/cocoa/filedlg.mm
@@ -22,9 +22,10 @@
 
 #if wxUSE_FILEDLG
 
+#include "wx/filedlg.h"
+
 #ifndef WX_PRECOMP
     #include "wx/msgdlg.h"
-    #include "wx/filedlg.h"
     #include "wx/app.h"
 #endif
 

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index e33a33c3393d537cab9115e71c5f63addf702705..bddd86999158533326627bb2607611aa15667d8d 100644 (file)
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -41,6 +41,7 @@
     #include "wx/log.h"
     #include "wx/msgdlg.h"
     #include "wx/mdi.h"
+    #include "wx/choicdlg.h"
 #endif
 
 #include "wx/ffile.h"
@@ -54,7 +55,6 @@
     #include "wx/printdlg.h"
 #endif
 
-#include "wx/choicdlg.h"
 #include "wx/confbase.h"
 #include "wx/file.h"
 #include "wx/cmdproc.h"

diff --git a/src/common/fldlgcmn.cpp b/src/common/fldlgcmn.cpp
index 1365b0fde43555f69317b2a55a4f46e31db5ed27..adb37ede67ecc84cfc3775040d1f3c1c97c77ea3 100644 (file)
--- a/src/common/fldlgcmn.cpp
+++ b/src/common/fldlgcmn.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        common/fldlgcmn.cpp
+// Name:        src/common/fldlgcmn.cpp
 // Purpose:     wxFileDialog common functions
 // Author:      John Labenski
 // Modified by:
@@ -16,16 +16,16 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#if wxUSE_FILEDLG
+
+#include "wx/filedlg.h"
+
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/intl.h"
     #include "wx/window.h"
 #endif // WX_PRECOMP
 
-#include "wx/filedlg.h"
-
-#if wxUSE_FILEDLG
-
 //----------------------------------------------------------------------------
 // wxFileDialogBase
 //----------------------------------------------------------------------------
@@ -121,7 +121,7 @@ wxString wxFileDialogBase::AppendExtension(const wxString &filePath,
 
     // if fileName is of form "foo.bar" it's ok, return it
     int idx_dot = fileName.Find(wxT('.'), true);
-    if ((idx_dot != wxNOT_FOUND) && (idx_dot < (int)fileName.Len() - 1))
+    if ((idx_dot != wxNOT_FOUND) && (idx_dot < (int)fileName.length() - 1))
         return filePath;
 
     // get the first extension from extensionList, or all of it
@@ -129,7 +129,7 @@ wxString wxFileDialogBase::AppendExtension(const wxString &filePath,
 
     // if ext == "foo" or "foo." there's no extension
     int idx_ext_dot = ext.Find(wxT('.'), true);
-    if ((idx_ext_dot == wxNOT_FOUND) || (idx_ext_dot == (int)ext.Len() - 1))
+    if ((idx_ext_dot == wxNOT_FOUND) || (idx_ext_dot == (int)ext.length() - 1))
         return filePath;
     else
         ext = ext.AfterLast(wxT('.'));
@@ -314,4 +314,3 @@ WXDLLEXPORT wxString wxSaveFileSelector(const wxChar *what,
 }
 
 #endif // wxUSE_FILEDLG
-

diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp
index cedea6789d65533757bbc51bc4ab2972c25513bb..449fe5cd2643f4992e253419a5056b57a5dcd5bb 100644 (file)
--- a/src/common/fontmap.cpp
+++ b/src/common/fontmap.cpp
@@ -33,6 +33,7 @@
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/msgdlg.h"
+    #include "wx/choicdlg.h"
 #endif // PCH
 
 #if wxUSE_CONFIG
@@ -47,7 +48,6 @@
 #include "wx/fmappriv.h"
 #include "wx/fontutil.h"
 #include "wx/fontdlg.h"
-#include "wx/choicdlg.h"
 #include "wx/encinfo.h"
 
 #include "wx/encconv.h"

diff --git a/src/generic/dbgrptg.cpp b/src/generic/dbgrptg.cpp
index 10b34cc7e0cc05b9cd890c1c7ba98e31a7663b40..3097c75ee33c400f6172e57228f1e3a43a18a604 100644 (file)
--- a/src/generic/dbgrptg.cpp
+++ b/src/generic/dbgrptg.cpp
@@ -33,6 +33,7 @@
     #include "wx/textctrl.h"
     #include "wx/intl.h"
     #include "wx/stattext.h"
+    #include "wx/filedlg.h"
 #endif // WX_PRECOMP
 
 #include "wx/filename.h"
@@ -40,7 +41,6 @@
 #include "wx/mimetype.h"
 
 #include "wx/statline.h"
-#include "wx/filedlg.h"
 #include "wx/valtext.h"
 
 #ifdef __WXMSW__

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index 16093c563c974afc6a077d44d8d38a623899e59a..ef89bce74c58953d95fbedc8107bab64c0a999d3 100644 (file)
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -34,10 +34,10 @@
     #include "wx/textctrl.h"
     #include "wx/layout.h"
     #include "wx/sizer.h"
+    #include "wx/textdlg.h"
 #endif
 
 #include "wx/module.h"
-#include "wx/textdlg.h"
 #include "wx/filefn.h"
 #include "wx/gdicmn.h"
 #include "wx/imaglist.h"

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index 9717439d4ac7b4f678ffba64ebce0524585918a9..072c6072c66da604cb6c2fe6b013d66fa78be434 100644 (file)
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -35,6 +35,7 @@
     #include "wx/stattext.h"
     #include "wx/textctrl.h"
     #include "wx/sizer.h"
+    #include "wx/filedlg.h"     // wxFD_OPEN, wxFD_SAVE...
 #endif
 
 #include "wx/longlong.h"
@@ -45,7 +46,6 @@
 #include "wx/artprov.h"
 #include "wx/filefn.h"
 #include "wx/file.h"        // for wxS_IXXX constants only
-#include "wx/filedlg.h"     // wxFD_OPEN, wxFD_SAVE...
 #include "wx/generic/filedlgg.h"
 #include "wx/generic/dirctrlg.h" // for wxFileIconsTable
 

diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp
index 35c4a4626000a17f1ca760b6616f07332f9c565b..511c1dc044f9c0fba409fecd3037285bc4475a29 100644 (file)
--- a/src/html/helpfrm.cpp
+++ b/src/html/helpfrm.cpp
@@ -38,6 +38,8 @@
     #include "wx/msgdlg.h"
     #include "wx/textctrl.h"
     #include "wx/toolbar.h"
+    #include "wx/choicdlg.h"
+    #include "wx/filedlg.h"
 #endif // WXPRECOMP
 
 #include "wx/html/helpfrm.h"
@@ -51,10 +53,8 @@
 #include "wx/busyinfo.h"
 #include "wx/progdlg.h"
 #include "wx/fontenum.h"
-#include "wx/filedlg.h"
 #include "wx/artprov.h"
 #include "wx/spinctrl.h"
-#include "wx/choicdlg.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpFrame, wxFrame)
 

diff --git a/src/html/helpwnd.cpp b/src/html/helpwnd.cpp
index 7c39fd3d63e9a7f7bccbf7b729905edfed0862b1..c5d94e07e18692288819f7c071c2988b40ea300d 100644 (file)
--- a/src/html/helpwnd.cpp
+++ b/src/html/helpwnd.cpp
@@ -38,6 +38,8 @@
     #include "wx/msgdlg.h"
     #include "wx/textctrl.h"
     #include "wx/toolbar.h"
+    #include "wx/choicdlg.h"
+    #include "wx/filedlg.h"
 #endif // WXPRECOMP
 
 #include "wx/html/helpfrm.h"
@@ -52,10 +54,8 @@
 #include "wx/busyinfo.h"
 #include "wx/progdlg.h"
 #include "wx/fontenum.h"
-#include "wx/filedlg.h"
 #include "wx/artprov.h"
 #include "wx/spinctrl.h"
-#include "wx/choicdlg.h"
 
 // what is considered "small index"?
 #define INDEX_IS_SMALL 100

diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp
index 3c09287d94802dac3ea891bff28fc51691069063..87c21c141deadaa916f5614fe38630aaa9300d8c 100644 (file)
--- a/src/msw/filedlg.cpp
+++ b/src/msw/filedlg.cpp
@@ -26,10 +26,11 @@
 
 #if wxUSE_FILEDLG && !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
 
+#include "wx/filedlg.h"
+
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/msgdlg.h"
-    #include "wx/filedlg.h"
     #include "wx/filefn.h"
     #include "wx/intl.h"
     #include "wx/log.h"

diff --git a/src/msw/wince/filedlgwce.cpp b/src/msw/wince/filedlgwce.cpp
index 494686b3149c34a1cd518313f0bccc0eafd0a922..20dbe03368cd40ac72cf8829a038c77bf3f4fd92 100644 (file)
--- a/src/msw/wince/filedlgwce.cpp
+++ b/src/msw/wince/filedlgwce.cpp
@@ -29,11 +29,12 @@
 
 #if wxUSE_FILEDLG && defined(__SMARTPHONE__) && defined(__WXWINCE__)
 
+#include "wx/filedlg.h"
+
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/msgdlg.h"
     #include "wx/dialog.h"
-    #include "wx/filedlg.h"
     #include "wx/filefn.h"
     #include "wx/intl.h"
     #include "wx/log.h"

diff --git a/src/os2/filedlg.cpp b/src/os2/filedlg.cpp
index 4a968e951a5ac087a4921ddb20e95b13db59e56f..e8c7b524fa6eb5043164d3844bdf207ae0ef841e 100644 (file)
--- a/src/os2/filedlg.cpp
+++ b/src/os2/filedlg.cpp
@@ -18,10 +18,11 @@
 
 #if wxUSE_FILEDLG
 
+#include "wx/filedlg.h"
+
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/msgdlg.h"
-    #include "wx/filedlg.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/app.h"

diff --git a/src/palmos/filedlg.cpp b/src/palmos/filedlg.cpp
index 1770673d4078c95385d9ee87a9c798a6b6580fb5..412f8fe98aca5008b7e49a72451458254854bc3e 100644 (file)
--- a/src/palmos/filedlg.cpp
+++ b/src/palmos/filedlg.cpp
@@ -26,10 +26,11 @@
 
 #if wxUSE_FILEDLG && !defined(__SMARTPHONE__)
 
+#include "wx/filedlg.h"
+
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/msgdlg.h"
-    #include "wx/filedlg.h"
     #include "wx/filefn.h"
     #include "wx/intl.h"
     #include "wx/log.h"
@@ -101,4 +102,3 @@ int wxFileDialog::ShowModal()
 }
 
 #endif // wxUSE_FILEDLG
-