From ce5d92e15071d65b430f11efa548076beeb9673c Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Thu, 25 May 2006 21:08:11 +0000 Subject: [PATCH 1/1] Include wx/cmndata.h according to precompiled headers of wx/wx.h (with other minor cleaning). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39337 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/dirctrlg.cpp | 2 +- src/generic/fontdlgg.cpp | 2 +- src/gtk/font.cpp | 2 +- src/gtk/settings.cpp | 5 ++++- src/gtk1/font.cpp | 2 +- src/gtk1/settings.cpp | 5 ++++- src/mac/carbon/dirdlg.cpp | 2 +- src/mac/carbon/fontdlgosx.mm | 2 +- src/mac/classic/dirdlg.cpp | 3 +-- src/mac/classic/fontdlg.cpp | 14 +++++++++----- src/mgl/font.cpp | 2 +- src/msw/colordlg.cpp | 9 +++++---- src/msw/fontdlg.cpp | 5 +++-- src/msw/printdlg.cpp | 2 +- src/os2/dirdlg.cpp | 5 +++-- src/os2/fontdlg.cpp | 13 +++++++------ src/palmos/colordlg.cpp | 10 +++++----- src/palmos/fontdlg.cpp | 3 +-- 18 files changed, 50 insertions(+), 38 deletions(-) diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp index ca26e8cc80..2af122dc8f 100644 --- a/src/generic/dirctrlg.cpp +++ b/src/generic/dirctrlg.cpp @@ -29,6 +29,7 @@ #include "wx/icon.h" #include "wx/settings.h" #include "wx/msgdlg.h" + #include "wx/cmndata.h" #endif #include "wx/module.h" @@ -36,7 +37,6 @@ #include "wx/textctrl.h" #include "wx/textdlg.h" #include "wx/filefn.h" -#include "wx/cmndata.h" #include "wx/gdicmn.h" #include "wx/imaglist.h" #include "wx/sizer.h" diff --git a/src/generic/fontdlgg.cpp b/src/generic/fontdlgg.cpp index 2647cde02b..d61aa8cfc0 100644 --- a/src/generic/fontdlgg.cpp +++ b/src/generic/fontdlgg.cpp @@ -31,12 +31,12 @@ #include "wx/checkbox.h" #include "wx/intl.h" #include "wx/settings.h" + #include "wx/cmndata.h" #endif #include #include -#include "wx/cmndata.h" #include "wx/sizer.h" #include "wx/fontdlg.h" #include "wx/generic/fontdlgg.h" diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp index b88103b671..6c9e102f31 100644 --- a/src/gtk/font.cpp +++ b/src/gtk/font.cpp @@ -24,10 +24,10 @@ #include "wx/log.h" #include "wx/utils.h" #include "wx/settings.h" + #include "wx/cmndata.h" #endif #include "wx/fontutil.h" -#include "wx/cmndata.h" #include "wx/gdicmn.h" #include "wx/tokenzr.h" diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp index b0cb27143e..bc6ee6a3c8 100644 --- a/src/gtk/settings.cpp +++ b/src/gtk/settings.cpp @@ -13,7 +13,10 @@ #include "wx/settings.h" -#include "wx/cmndata.h" +#ifndef WX_PRECOMP + #include "wx/cmndata.h" +#endif + #include "wx/fontutil.h" #include "wx/toplevel.h" diff --git a/src/gtk1/font.cpp b/src/gtk1/font.cpp index 32c0aa0645..a926b22363 100644 --- a/src/gtk1/font.cpp +++ b/src/gtk1/font.cpp @@ -23,10 +23,10 @@ #ifndef WX_PRECOMP #include "wx/log.h" #include "wx/settings.h" + #include "wx/cmndata.h" #endif #include "wx/fontutil.h" -#include "wx/cmndata.h" #include "wx/utils.h" #include "wx/gdicmn.h" #include "wx/tokenzr.h" diff --git a/src/gtk1/settings.cpp b/src/gtk1/settings.cpp index 5943aa5b0a..a5348ebaad 100644 --- a/src/gtk1/settings.cpp +++ b/src/gtk1/settings.cpp @@ -13,7 +13,10 @@ #include "wx/settings.h" -#include "wx/cmndata.h" +#ifndef WX_PRECOMP + #include "wx/cmndata.h" +#endif + #include "wx/fontutil.h" #include "wx/toplevel.h" diff --git a/src/mac/carbon/dirdlg.cpp b/src/mac/carbon/dirdlg.cpp index baa975e0e6..fedf03ccae 100644 --- a/src/mac/carbon/dirdlg.cpp +++ b/src/mac/carbon/dirdlg.cpp @@ -18,9 +18,9 @@ #ifndef WX_PRECOMP #include "wx/utils.h" #include "wx/dialog.h" + #include "wx/cmndata.h" #endif // WX_PRECOMP -#include "wx/cmndata.h" #include "wx/filename.h" #include "wx/mac/private.h" diff --git a/src/mac/carbon/fontdlgosx.mm b/src/mac/carbon/fontdlgosx.mm index fe90214386..d863f75689 100644 --- a/src/mac/carbon/fontdlgosx.mm +++ b/src/mac/carbon/fontdlgosx.mm @@ -24,9 +24,9 @@ #ifndef WX_PRECOMP #include "wx/intl.h" #include "wx/log.h" + #include "wx/cmndata.h" #endif -#include "wx/cmndata.h" #include "wx/fontutil.h" // ============================================================================ diff --git a/src/mac/classic/dirdlg.cpp b/src/mac/classic/dirdlg.cpp index 2eafc1cbf5..ad199358fb 100644 --- a/src/mac/classic/dirdlg.cpp +++ b/src/mac/classic/dirdlg.cpp @@ -20,10 +20,9 @@ #ifndef WX_PRECOMP #include "wx/utils.h" #include "wx/dialog.h" + #include "wx/cmndata.h" #endif // WX_PRECOMP -#include "wx/cmndata.h" - #include "wx/mac/private.h" #ifdef __DARWIN__ diff --git a/src/mac/classic/fontdlg.cpp b/src/mac/classic/fontdlg.cpp index b4dd977da0..ac80e0ed51 100644 --- a/src/mac/classic/fontdlg.cpp +++ b/src/mac/classic/fontdlg.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: fontdlg.cpp +// Name: src/mac/classic/fontdlg.cpp // Purpose: wxFontDialog class. NOTE: you can use the generic class // if you wish, instead of implementing this. // Author: Stefan Csomor @@ -7,11 +7,16 @@ // Created: 1998-01-01 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +#include "wx/wxprec.h" + #include "wx/mac/fontdlg.h" -#include "wx/cmndata.h" + +#ifndef WX_PRECOMP + #include "wx/cmndata.h" +#endif IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog) @@ -37,7 +42,7 @@ bool wxFontDialog::Create(wxWindow *parent, const wxFontData& data) // TODO: you may need to do dialog creation here, unless it's // done in ShowModal. - return TRUE; + return true; } int wxFontDialog::ShowModal() @@ -45,4 +50,3 @@ int wxFontDialog::ShowModal() // TODO: show (maybe create) the dialog return wxID_CANCEL; } - diff --git a/src/mgl/font.cpp b/src/mgl/font.cpp index 1798b69d06..2cce8212f1 100644 --- a/src/mgl/font.cpp +++ b/src/mgl/font.cpp @@ -27,10 +27,10 @@ #include "wx/log.h" #include "wx/utils.h" #include "wx/settings.h" + #include "wx/cmndata.h" #endif #include "wx/fontutil.h" -#include "wx/cmndata.h" #include "wx/gdicmn.h" #include "wx/tokenzr.h" #include "wx/mgl/private.h" diff --git a/src/msw/colordlg.cpp b/src/msw/colordlg.cpp index d425d89bc6..4282b46c2b 100644 --- a/src/msw/colordlg.cpp +++ b/src/msw/colordlg.cpp @@ -24,19 +24,20 @@ #pragma hdrstop #endif +#if wxUSE_COLOURDLG && !(defined(__SMARTPHONE__) && defined(__WXWINCE__)) + +#include "wx/colordlg.h" + #ifndef WX_PRECOMP #include #include "wx/colour.h" #include "wx/gdicmn.h" #include "wx/utils.h" #include "wx/dialog.h" + #include "wx/cmndata.h" #endif -#if wxUSE_COLOURDLG && !(defined(__SMARTPHONE__) && defined(__WXWINCE__)) - #include "wx/msw/private.h" -#include "wx/colordlg.h" -#include "wx/cmndata.h" #include "wx/math.h" #include "wx/msw/wrapcdlg.h" diff --git a/src/msw/fontdlg.cpp b/src/msw/fontdlg.cpp index 7011de08ea..2c5a32114d 100644 --- a/src/msw/fontdlg.cpp +++ b/src/msw/fontdlg.cpp @@ -26,16 +26,17 @@ #if wxUSE_FONTDLG +#include "wx/fontdlg.h" + #ifndef WX_PRECOMP #include "wx/utils.h" #include "wx/dialog.h" #include "wx/log.h" + #include "wx/cmndata.h" #endif -#include "wx/fontdlg.h" #include "wx/msw/wrapcdlg.h" -#include "wx/cmndata.h" #include "wx/math.h" #include diff --git a/src/msw/printdlg.cpp b/src/msw/printdlg.cpp index 6a24fedea3..965fa3042e 100644 --- a/src/msw/printdlg.cpp +++ b/src/msw/printdlg.cpp @@ -31,9 +31,9 @@ #ifndef WX_PRECOMP #include "wx/app.h" #include "wx/dcprint.h" + #include "wx/cmndata.h" #endif -#include "wx/cmndata.h" #include "wx/printdlg.h" #include "wx/msw/printdlg.h" #include "wx/paper.h" diff --git a/src/os2/dirdlg.cpp b/src/os2/dirdlg.cpp index 28af822197..9dacdc82d3 100644 --- a/src/os2/dirdlg.cpp +++ b/src/os2/dirdlg.cpp @@ -12,15 +12,16 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#include "wx/dirdlg.h" + #ifndef WX_PRECOMP #include #include "wx/utils.h" #include "wx/dialog.h" - #include "wx/dirdlg.h" + #include "wx/cmndata.h" #endif #include "wx/os2/private.h" -#include "wx/cmndata.h" #include #include diff --git a/src/os2/fontdlg.cpp b/src/os2/fontdlg.cpp index a4284a5e66..1024e1b98e 100644 --- a/src/os2/fontdlg.cpp +++ b/src/os2/fontdlg.cpp @@ -13,21 +13,22 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#include "wx/fontdlg.h" + #ifndef WX_PRECOMP #include #include "wx/utils.h" #include "wx/dialog.h" #include "wx/math.h" + #include "wx/cmndata.h" #endif -#include "wx/fontdlg.h" #include "wx/fontutil.h" #define INCL_PM #include #include "wx/os2/private.h" -#include "wx/cmndata.h" #include #include @@ -36,10 +37,10 @@ IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog) int wxFontDialog::ShowModal() { - FONTDLG vFontDlg; - char zCurrentFont[FACESIZE]; - HWND hWndFontDlg; - FACENAMEDESC vFn; + FONTDLG vFontDlg; + char zCurrentFont[FACESIZE]; + HWND hWndFontDlg; + FACENAMEDESC vFn; memset(&vFontDlg, '\0', sizeof(FONTDLG)); zCurrentFont[0] = '\0'; diff --git a/src/palmos/colordlg.cpp b/src/palmos/colordlg.cpp index d2edc5154b..5c27e3d23a 100644 --- a/src/palmos/colordlg.cpp +++ b/src/palmos/colordlg.cpp @@ -24,15 +24,15 @@ #pragma hdrstop #endif -#ifndef WX_PRECOMP - #include "wx/intl.h" -#endif - #if wxUSE_COLOURDLG -#include "wx/cmndata.h" #include "wx/colordlg.h" +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/cmndata.h" +#endif + #include #include diff --git a/src/palmos/fontdlg.cpp b/src/palmos/fontdlg.cpp index 2b494dc2e0..b65a2831fa 100644 --- a/src/palmos/fontdlg.cpp +++ b/src/palmos/fontdlg.cpp @@ -33,12 +33,11 @@ #include "wx/dialog.h" #include "wx/math.h" #include "wx/log.h" + #include "wx/cmndata.h" #endif #include "wx/palmos/private.h" -#include "wx/cmndata.h" - #include #include -- 2.45.2