From 246c5004eb5a1d6bd592cbc0981cf6c3e10895de Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Thu, 25 May 2006 07:07:23 +0000 Subject: [PATCH 1/1] Include wx/msgdlg.h according to precompiled headers of wx/wx.h (with other minor cleaning). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/docview.cpp | 5 +++-- src/common/fontmap.cpp | 7 ++++--- src/generic/dirctrlg.cpp | 2 +- src/generic/filedlgg.cpp | 4 ++-- src/generic/logg.cpp | 2 -- src/gtk/app.cpp | 2 +- src/gtk/filedlg.cpp | 2 +- src/gtk/fontdlg.cpp | 2 +- src/gtk/notebook.cpp | 3 +-- src/gtk/window.cpp | 2 +- src/gtk1/app.cpp | 2 +- src/gtk1/fontdlg.cpp | 2 +- src/gtk1/notebook.cpp | 3 +-- src/gtk1/window.cpp | 2 +- src/html/helpdlg.cpp | 5 +---- src/html/helpfrm.cpp | 5 +---- src/html/helpwnd.cpp | 5 +---- src/mac/carbon/app.cpp | 2 +- src/mac/carbon/dcprint.cpp | 2 +- src/mac/carbon/printdlg.cpp | 5 +++-- src/mac/carbon/textctrl.cpp | 3 +-- src/mac/carbon/window.cpp | 2 +- src/mac/classic/app.cpp | 2 +- src/mac/classic/dcprint.cpp | 2 +- src/mac/classic/printdlg.cpp | 5 +++-- src/mac/classic/textctrl.cpp | 3 +-- src/mac/classic/window.cpp | 2 +- src/msw/msgdlg.cpp | 3 ++- src/os2/msgdlg.cpp | 3 ++- src/palmos/progdlg.cpp | 12 ++++++------ src/x11/utils.cpp | 2 +- src/x11/window.cpp | 2 +- 32 files changed, 48 insertions(+), 57 deletions(-) diff --git a/src/common/docview.cpp b/src/common/docview.cpp index 3e1167c0f0..96b44152ca 100644 --- a/src/common/docview.cpp +++ b/src/common/docview.cpp @@ -26,6 +26,8 @@ #if wxUSE_DOC_VIEW_ARCHITECTURE +#include "wx/docview.h" + #ifndef WX_PRECOMP #include "wx/list.h" #include "wx/string.h" @@ -37,6 +39,7 @@ #include "wx/filedlg.h" #include "wx/intl.h" #include "wx/log.h" + #include "wx/msgdlg.h" #endif #include "wx/ffile.h" @@ -54,9 +57,7 @@ #include "wx/printdlg.h" #endif -#include "wx/msgdlg.h" #include "wx/choicdlg.h" -#include "wx/docview.h" #include "wx/confbase.h" #include "wx/file.h" #include "wx/cmdproc.h" diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp index 622e38279a..b0ba68445b 100644 --- a/src/common/fontmap.cpp +++ b/src/common/fontmap.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: common/fontmap.cpp +// Name: src/common/fontmap.cpp // Purpose: wxFontMapper class // Author: Vadim Zeitlin // Modified by: @@ -26,10 +26,13 @@ #if wxUSE_FONTMAP +#include "wx/fontmap.h" + #ifndef WX_PRECOMP #include "wx/app.h" #include "wx/log.h" #include "wx/intl.h" + #include "wx/msgdlg.h" #endif // PCH #if wxUSE_CONFIG @@ -41,10 +44,8 @@ #include "wx/msw/winundef.h" #endif -#include "wx/fontmap.h" #include "wx/fmappriv.h" #include "wx/fontutil.h" -#include "wx/msgdlg.h" #include "wx/fontdlg.h" #include "wx/choicdlg.h" #include "wx/encinfo.h" diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp index fc98942d44..ca26e8cc80 100644 --- a/src/generic/dirctrlg.cpp +++ b/src/generic/dirctrlg.cpp @@ -28,11 +28,11 @@ #include "wx/button.h" #include "wx/icon.h" #include "wx/settings.h" + #include "wx/msgdlg.h" #endif #include "wx/module.h" #include "wx/layout.h" -#include "wx/msgdlg.h" #include "wx/textctrl.h" #include "wx/textdlg.h" #include "wx/filefn.h" diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp index 31790cceb8..d424aa0812 100644 --- a/src/generic/filedlgg.cpp +++ b/src/generic/filedlgg.cpp @@ -13,7 +13,7 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #if wxUSE_FILEDLG @@ -28,6 +28,7 @@ #include "wx/intl.h" #include "wx/settings.h" #include "wx/log.h" + #include "wx/msgdlg.h" #endif #include "wx/checkbox.h" @@ -36,7 +37,6 @@ #include "wx/checkbox.h" #include "wx/stattext.h" #include "wx/longlong.h" -#include "wx/msgdlg.h" #include "wx/sizer.h" #include "wx/bmpbuttn.h" #include "wx/tokenzr.h" diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp index b776065130..02e9c0275c 100644 --- a/src/generic/logg.cpp +++ b/src/generic/logg.cpp @@ -60,8 +60,6 @@ #include "wx/listctrl.h" #include "wx/imaglist.h" #include "wx/image.h" -#else // !wxUSE_LOG_DIALOG - #include "wx/msgdlg.h" #endif // wxUSE_LOG_DIALOG/!wxUSE_LOG_DIALOG #if defined(__MWERKS__) && wxUSE_UNICODE diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index f235b57a3b..8f26e090f7 100644 --- a/src/gtk/app.cpp +++ b/src/gtk/app.cpp @@ -24,12 +24,12 @@ #include "wx/utils.h" #include "wx/dialog.h" #include "wx/settings.h" + #include "wx/msgdlg.h" #endif #include "wx/gdicmn.h" #include "wx/memory.h" #include "wx/font.h" -#include "wx/msgdlg.h" #include "wx/file.h" #include "wx/filename.h" #include "wx/module.h" diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp index 41e7703303..13c50895d2 100644 --- a/src/gtk/filedlg.cpp +++ b/src/gtk/filedlg.cpp @@ -16,6 +16,7 @@ #ifndef WX_PRECOMP #include "wx/intl.h" + #include "wx/msgdlg.h" #endif #ifdef __WXGTK24__ @@ -28,7 +29,6 @@ #include "wx/filename.h" // wxFilename #include "wx/tokenzr.h" // wxStringTokenizer #include "wx/filefn.h" // ::wxGetCwd -#include "wx/msgdlg.h" // wxMessageDialog //----------------------------------------------------------------------------- // idle system diff --git a/src/gtk/fontdlg.cpp b/src/gtk/fontdlg.cpp index 66b985019f..61a204f1e1 100644 --- a/src/gtk/fontdlg.cpp +++ b/src/gtk/fontdlg.cpp @@ -17,10 +17,10 @@ #ifndef WX_PRECOMP #include "wx/intl.h" #include "wx/utils.h" + #include "wx/msgdlg.h" #endif #include "wx/fontutil.h" -#include "wx/msgdlg.h" #include "wx/gtk/private.h" diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp index 34dd2bf59d..c074dcb480 100644 --- a/src/gtk/notebook.cpp +++ b/src/gtk/notebook.cpp @@ -19,6 +19,7 @@ #include "wx/log.h" #include "wx/utils.h" #include "wx/panel.h" + #include "wx/msgdlg.h" #endif #include "wx/imaglist.h" @@ -36,8 +37,6 @@ #include -#include "wx/msgdlg.h" - // ---------------------------------------------------------------------------- // events // ---------------------------------------------------------------------------- diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index 72ee7a2c02..4079dc8145 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -26,10 +26,10 @@ #include "wx/menu.h" #include "wx/dialog.h" #include "wx/settings.h" + #include "wx/msgdlg.h" #endif #include "wx/layout.h" -#include "wx/msgdlg.h" #include "wx/module.h" #include "wx/combobox.h" diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp index e8ea46b890..9981f60a5a 100644 --- a/src/gtk1/app.cpp +++ b/src/gtk1/app.cpp @@ -24,12 +24,12 @@ #include "wx/utils.h" #include "wx/dialog.h" #include "wx/settings.h" + #include "wx/msgdlg.h" #endif #include "wx/gdicmn.h" #include "wx/memory.h" #include "wx/font.h" -#include "wx/msgdlg.h" #include "wx/file.h" #include "wx/filename.h" #include "wx/module.h" diff --git a/src/gtk1/fontdlg.cpp b/src/gtk1/fontdlg.cpp index 1c39ba5d23..8b5a91689f 100644 --- a/src/gtk1/fontdlg.cpp +++ b/src/gtk1/fontdlg.cpp @@ -17,10 +17,10 @@ #ifndef WX_PRECOMP #include "wx/intl.h" #include "wx/utils.h" + #include "wx/msgdlg.h" #endif #include "wx/fontutil.h" -#include "wx/msgdlg.h" #include "wx/gtk1/private.h" diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp index a1e152cbe3..6d647cc323 100644 --- a/src/gtk1/notebook.cpp +++ b/src/gtk1/notebook.cpp @@ -19,6 +19,7 @@ #include "wx/log.h" #include "wx/utils.h" #include "wx/panel.h" + #include "wx/msgdlg.h" #endif #include "wx/imaglist.h" @@ -30,8 +31,6 @@ #include -#include "wx/msgdlg.h" - // ---------------------------------------------------------------------------- // events // ---------------------------------------------------------------------------- diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index fe8f36be42..f92f405c9f 100644 --- a/src/gtk1/window.cpp +++ b/src/gtk1/window.cpp @@ -26,10 +26,10 @@ #include "wx/menu.h" #include "wx/dialog.h" #include "wx/settings.h" + #include "wx/msgdlg.h" #endif #include "wx/layout.h" -#include "wx/msgdlg.h" #include "wx/module.h" #include "wx/combobox.h" diff --git a/src/html/helpdlg.cpp b/src/html/helpdlg.cpp index 8af3d252e0..ccd65dc032 100644 --- a/src/html/helpdlg.cpp +++ b/src/html/helpdlg.cpp @@ -29,11 +29,8 @@ #include "wx/statbox.h" #include "wx/radiobox.h" #include "wx/menu.h" -#endif // WXPRECOMP - -#ifdef __WXMAC__ #include "wx/msgdlg.h" -#endif +#endif // WXPRECOMP #include "wx/html/htmlwin.h" #include "wx/html/helpdlg.h" diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp index 3d7e6db098..ff2a96c389 100644 --- a/src/html/helpfrm.cpp +++ b/src/html/helpfrm.cpp @@ -35,11 +35,8 @@ #include "wx/radiobox.h" #include "wx/menu.h" #include "wx/settings.h" -#endif // WXPRECOMP - -#ifdef __WXMAC__ #include "wx/msgdlg.h" -#endif +#endif // WXPRECOMP #include "wx/html/helpfrm.h" #include "wx/html/helpctrl.h" diff --git a/src/html/helpwnd.cpp b/src/html/helpwnd.cpp index e1b0b5228b..2c60c696ac 100644 --- a/src/html/helpwnd.cpp +++ b/src/html/helpwnd.cpp @@ -35,11 +35,8 @@ #include "wx/radiobox.h" #include "wx/menu.h" #include "wx/settings.h" -#endif // WXPRECOMP - -#ifdef __WXMAC__ #include "wx/msgdlg.h" -#endif +#endif // WXPRECOMP #include "wx/html/helpfrm.h" #include "wx/html/helpdlg.h" diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp index ba0f28d196..a7aeda3221 100644 --- a/src/mac/carbon/app.cpp +++ b/src/mac/carbon/app.cpp @@ -28,10 +28,10 @@ #include "wx/icon.h" #include "wx/cursor.h" #include "wx/dialog.h" + #include "wx/msgdlg.h" #endif #include "wx/gdicmn.h" -#include "wx/msgdlg.h" #include "wx/module.h" #include "wx/memory.h" #include "wx/tooltip.h" diff --git a/src/mac/carbon/dcprint.cpp b/src/mac/carbon/dcprint.cpp index 27a2734309..490b083065 100644 --- a/src/mac/carbon/dcprint.cpp +++ b/src/mac/carbon/dcprint.cpp @@ -21,9 +21,9 @@ #include "wx/dcprint.h" #ifndef WX_PRECOMP + #include "wx/msgdlg.h" #endif -#include "wx/msgdlg.h" #include "wx/math.h" #include "wx/mac/uma.h" #include "wx/mac/private/print.h" diff --git a/src/mac/carbon/printdlg.cpp b/src/mac/carbon/printdlg.cpp index 1417d0e6f0..598f4e733e 100644 --- a/src/mac/carbon/printdlg.cpp +++ b/src/mac/carbon/printdlg.cpp @@ -13,14 +13,15 @@ #if wxUSE_PRINTING_ARCHITECTURE +#include "wx/printdlg.h" + #ifndef WXPRECOMP #include "wx/object.h" #include "wx/dcprint.h" + #include "wx/msgdlg.h" #endif -#include "wx/printdlg.h" #include "wx/mac/printdlg.h" -#include "wx/msgdlg.h" #include "wx/mac/private/print.h" diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp index 70bbef2d7a..42a7d30c28 100644 --- a/src/mac/carbon/textctrl.cpp +++ b/src/mac/carbon/textctrl.cpp @@ -23,6 +23,7 @@ #include "wx/button.h" #include "wx/menu.h" #include "wx/settings.h" + #include "wx/msgdlg.h" #endif #ifdef __DARWIN__ @@ -32,8 +33,6 @@ #include #endif -#include "wx/msgdlg.h" - #if wxUSE_STD_IOSTREAM #if wxUSE_IOSTREAMH #include diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp index 53905b4949..409bdd8d96 100644 --- a/src/mac/carbon/window.cpp +++ b/src/mac/carbon/window.cpp @@ -25,12 +25,12 @@ #include "wx/menu.h" #include "wx/dialog.h" #include "wx/settings.h" + #include "wx/msgdlg.h" #endif #include "wx/layout.h" #include "wx/scrolbar.h" #include "wx/statbox.h" -#include "wx/msgdlg.h" #include "wx/tooltip.h" #include "wx/statusbr.h" #include "wx/menuitem.h" diff --git a/src/mac/classic/app.cpp b/src/mac/classic/app.cpp index 2093f36cce..6670bde5cc 100644 --- a/src/mac/classic/app.cpp +++ b/src/mac/classic/app.cpp @@ -32,10 +32,10 @@ #include "wx/icon.h" #include "wx/cursor.h" #include "wx/dialog.h" + #include "wx/msgdlg.h" #endif #include "wx/gdicmn.h" -#include "wx/msgdlg.h" #include "wx/module.h" #include "wx/memory.h" #include "wx/tooltip.h" diff --git a/src/mac/classic/dcprint.cpp b/src/mac/classic/dcprint.cpp index 8d21ba124b..fb7d386862 100644 --- a/src/mac/classic/dcprint.cpp +++ b/src/mac/classic/dcprint.cpp @@ -19,9 +19,9 @@ #include "wx/dcprint.h" #ifndef WX_PRECOMP + #include "wx/msgdlg.h" #endif -#include "wx/msgdlg.h" #include "wx/math.h" #include "wx/mac/uma.h" #include "wx/mac/private/print.h" diff --git a/src/mac/classic/printdlg.cpp b/src/mac/classic/printdlg.cpp index 44d00b882c..5928041001 100644 --- a/src/mac/classic/printdlg.cpp +++ b/src/mac/classic/printdlg.cpp @@ -12,13 +12,14 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#include "wx/printdlg.h" + #ifndef WX_PRECOMP #include "wx/object.h" #include "wx/dcprint.h" + #include "wx/msgdlg.h" #endif -#include "wx/printdlg.h" -#include "wx/msgdlg.h" #include "wx/mac/private/print.h" // Use generic page setup dialog: use your own native one if one exists. diff --git a/src/mac/classic/textctrl.cpp b/src/mac/classic/textctrl.cpp index 57fc901cab..aebb686c12 100644 --- a/src/mac/classic/textctrl.cpp +++ b/src/mac/classic/textctrl.cpp @@ -25,6 +25,7 @@ #include "wx/dc.h" #include "wx/button.h" #include "wx/settings.h" + #include "wx/msgdlg.h" #endif #ifdef __DARWIN__ @@ -34,8 +35,6 @@ #include #endif -#include "wx/msgdlg.h" - #if wxUSE_STD_IOSTREAM #if wxUSE_IOSTREAMH #include diff --git a/src/mac/classic/window.cpp b/src/mac/classic/window.cpp index 949b1ee701..96cd1cbbb5 100644 --- a/src/mac/classic/window.cpp +++ b/src/mac/classic/window.cpp @@ -25,13 +25,13 @@ #include "wx/menu.h" #include "wx/dialog.h" #include "wx/settings.h" + #include "wx/msgdlg.h" #endif #include "wx/layout.h" #include "wx/listbox.h" #include "wx/scrolbar.h" #include "wx/statbox.h" -#include "wx/msgdlg.h" #include "wx/notebook.h" #include "wx/tabctrl.h" #include "wx/tooltip.h" diff --git a/src/msw/msgdlg.cpp b/src/msw/msgdlg.cpp index d641c6a3d5..41cb6a49a8 100644 --- a/src/msw/msgdlg.cpp +++ b/src/msw/msgdlg.cpp @@ -16,11 +16,12 @@ #pragma hdrstop #endif +#include "wx/msgdlg.h" + #ifndef WX_PRECOMP #include "wx/app.h" #include "wx/utils.h" #include "wx/dialog.h" - #include "wx/msgdlg.h" #endif #include "wx/msw/private.h" diff --git a/src/os2/msgdlg.cpp b/src/os2/msgdlg.cpp index 7577e564ec..90d433a089 100644 --- a/src/os2/msgdlg.cpp +++ b/src/os2/msgdlg.cpp @@ -12,12 +12,13 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#include "wx/msgdlg.h" + #ifndef WX_PRECOMP #include #include "wx/utils.h" #include "wx/dialog.h" #include "wx/app.h" - #include "wx/msgdlg.h" #include "wx/math.h" #endif diff --git a/src/palmos/progdlg.cpp b/src/palmos/progdlg.cpp index 0b4c467a4d..f2432a5450 100644 --- a/src/palmos/progdlg.cpp +++ b/src/palmos/progdlg.cpp @@ -13,17 +13,17 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif -#ifndef WX_PRECOMP - #include "wx/string.h" -#endif //WX_PRECOMP - #if wxUSE_PROGRESSDLG #include "wx/progdlg.h" -#include "wx/msgdlg.h" + +#ifndef WX_PRECOMP + #include "wx/string.h" + #include "wx/msgdlg.h" +#endif //WX_PRECOMP #include #include diff --git a/src/x11/utils.cpp b/src/x11/utils.cpp index 8982ec4c0e..ae71bbe8fc 100644 --- a/src/x11/utils.cpp +++ b/src/x11/utils.cpp @@ -30,10 +30,10 @@ #include "wx/app.h" #include "wx/window.h" // for wxTopLevelWindows #include "wx/cursor.h" + #include "wx/msgdlg.h" #endif #include "wx/apptrait.h" -#include "wx/msgdlg.h" #include #include diff --git a/src/x11/window.cpp b/src/x11/window.cpp index 6a2b1af217..f2b103189c 100644 --- a/src/x11/window.cpp +++ b/src/x11/window.cpp @@ -40,11 +40,11 @@ #include "wx/dialog.h" #include "wx/timer.h" #include "wx/settings.h" + #include "wx/msgdlg.h" #endif #include "wx/layout.h" #include "wx/listbox.h" -#include "wx/msgdlg.h" #include "wx/scrolwin.h" #include "wx/scrolbar.h" #include "wx/module.h" -- 2.45.2