Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Include wx/choicdlg.h, wx/textdlg.h and wx/filedlg.h according to precompiled headers of wx/wx.h (with other minor cleaning).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-06-09 17:50:46 +00:00
parent 84c3e788d6
commit 949c9f74c3
13 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/cocoa/filedlg.mm
View File

@@ -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

2
src/common/docview.cpp
View File

@@ -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"

15
src/common/fldlgcmn.cpp
View File

@@ -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

2
src/common/fontmap.cpp
View File

@@ -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"

2
src/generic/dbgrptg.cpp
View File

@@ -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__

2
src/generic/dirctrlg.cpp
View File

@@ -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"

2
src/generic/filedlgg.cpp
View File

@@ -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

4
src/html/helpfrm.cpp
View File

@@ -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)

4
src/html/helpwnd.cpp
View File

@@ -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

3
src/msw/filedlg.cpp
View File

@@ -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"

3
src/msw/wince/filedlgwce.cpp
View File

@@ -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"

3
src/os2/filedlg.cpp
View File

@@ -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"

4
src/palmos/filedlg.cpp
View File

@@ -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