From: Michael Wetherell Date: Sun, 25 Sep 2005 20:49:40 +0000 (+0000) Subject: Fixes for include guards, patch 1256967 Paul Cornett X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/20ceebaa878e9fb54e678c6498aeaeeaae9f0590?ds=inline Fixes for include guards, patch 1256967 Paul Cornett git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35698 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/cocoa/tooltip.h b/include/wx/cocoa/tooltip.h index 42433e2398..784718164b 100644 --- a/include/wx/cocoa/tooltip.h +++ b/include/wx/cocoa/tooltip.h @@ -9,6 +9,9 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// +#ifndef _WX_COCOA_TOOLTIP_H_ +#define _WX_COCOA_TOOLTIP_H_ + #include "wx/object.h" class wxWindow; @@ -43,4 +46,6 @@ private: wxWindow *m_window; // window we're associated with DECLARE_ABSTRACT_CLASS(wxToolTip) -}; \ No newline at end of file +}; + +#endif // _WX_COCOA_TOOLTIP_H_ diff --git a/include/wx/dir.h b/include/wx/dir.h index 9e50750b77..c87b753f6d 100644 --- a/include/wx/dir.h +++ b/include/wx/dir.h @@ -12,9 +12,7 @@ #ifndef _WX_DIR_H_ #define _WX_DIR_H_ -#ifndef WX_PRECOMP - #include "wx/string.h" -#endif +#include "wx/string.h" class WXDLLIMPEXP_BASE wxArrayString; diff --git a/include/wx/ffile.h b/include/wx/ffile.h index 4d3755953d..c254ed04ed 100644 --- a/include/wx/ffile.h +++ b/include/wx/ffile.h @@ -16,10 +16,8 @@ #if wxUSE_FFILE -#ifndef WX_PRECOMP - #include "wx/string.h" - #include "wx/filefn.h" -#endif +#include "wx/string.h" +#include "wx/filefn.h" #include diff --git a/include/wx/filename.h b/include/wx/filename.h index 547d080fc7..cba406de35 100644 --- a/include/wx/filename.h +++ b/include/wx/filename.h @@ -12,11 +12,6 @@ #ifndef _WX_FILENAME_H_ #define _WX_FILENAME_H_ -#ifndef WX_PRECOMP - #include "wx/string.h" - #include "wx/arrstr.h" -#endif - /* TODO: @@ -31,6 +26,7 @@ 3. SameFileAs() function to compare inodes under Unix */ +#include "wx/arrstr.h" #include "wx/filefn.h" #include "wx/datetime.h" diff --git a/include/wx/generic/fdrepdlg.h b/include/wx/generic/fdrepdlg.h index bf7fb02b07..c287322134 100644 --- a/include/wx/generic/fdrepdlg.h +++ b/include/wx/generic/fdrepdlg.h @@ -9,6 +9,9 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +#ifndef _WX_GENERIC_FDREPDLG_H_ +#define _WX_GENERIC_FDREPDLG_H_ + class WXDLLEXPORT wxCheckBox; class WXDLLEXPORT wxRadioBox; class WXDLLEXPORT wxTextCtrl; @@ -65,3 +68,4 @@ private: DECLARE_EVENT_TABLE() }; +#endif // _WX_GENERIC_FDREPDLG_H_ diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h index 0d73cd15d5..80156c8239 100644 --- a/include/wx/generic/grid.h +++ b/include/wx/generic/grid.h @@ -9,8 +9,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#include "wx/defs.h" - #ifndef __WXGRID_H__ #define __WXGRID_H__ diff --git a/include/wx/generic/gridsel.h b/include/wx/generic/gridsel.h index bfa1c4e038..0fa66dc46a 100644 --- a/include/wx/generic/gridsel.h +++ b/include/wx/generic/gridsel.h @@ -9,13 +9,13 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +#ifndef __WXGRIDSEL_H__ +#define __WXGRIDSEL_H__ + #include "wx/defs.h" #if wxUSE_GRID -#ifndef __WXGRIDSEL_H__ -#define __WXGRIDSEL_H__ - #include "wx/grid.h" class WXDLLIMPEXP_ADV wxGridSelection{ @@ -83,6 +83,6 @@ private: DECLARE_NO_COPY_CLASS(wxGridSelection) }; -#endif // #ifdef __WXGRIDSEL_H__ #endif // #ifndef wxUSE_GRID +#endif // #ifdef __WXGRIDSEL_H__ diff --git a/include/wx/generic/splash.h b/include/wx/generic/splash.h index c17d68de85..a8bf2ae8a1 100644 --- a/include/wx/generic/splash.h +++ b/include/wx/generic/splash.h @@ -12,11 +12,8 @@ #ifndef _WX_SPLASH_H_ #define _WX_SPLASH_H_ -#ifndef WX_PRECOMP #include "wx/bitmap.h" #include "wx/timer.h" -#endif - #include "wx/frame.h" diff --git a/include/wx/generic/wizard.h b/include/wx/generic/wizard.h index f045c1bb8a..bba347c7db 100644 --- a/include/wx/generic/wizard.h +++ b/include/wx/generic/wizard.h @@ -9,6 +9,9 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// +#ifndef _WX_GENERIC_WIZARD_H_ +#define _WX_GENERIC_WIZARD_H_ + // ---------------------------------------------------------------------------- // wxWizard // ---------------------------------------------------------------------------- @@ -123,3 +126,4 @@ private: DECLARE_NO_COPY_CLASS(wxWizard) }; +#endif // _WX_GENERIC_WIZARD_H_ diff --git a/include/wx/gtk/gnome/gprint.h b/include/wx/gtk/gnome/gprint.h index 82d086b09f..80189e3561 100644 --- a/include/wx/gtk/gnome/gprint.h +++ b/include/wx/gtk/gnome/gprint.h @@ -13,15 +13,13 @@ // Include wxWindows' headers -#ifndef WX_PRECOMP - #include -#endif +#include "wx/defs.h" #if wxUSE_LIBGNOMEPRINT #include "wx/print.h" -#include "wx/prntbase.h" #include "wx/printdlg.h" +#include "wx/dc.h" typedef struct _GnomePrintJob GnomePrintJob; typedef struct _GnomePrintContext GnomePrintContext; diff --git a/include/wx/gtk1/gnome/gprint.h b/include/wx/gtk1/gnome/gprint.h index 82d086b09f..80189e3561 100644 --- a/include/wx/gtk1/gnome/gprint.h +++ b/include/wx/gtk1/gnome/gprint.h @@ -13,15 +13,13 @@ // Include wxWindows' headers -#ifndef WX_PRECOMP - #include -#endif +#include "wx/defs.h" #if wxUSE_LIBGNOMEPRINT #include "wx/print.h" -#include "wx/prntbase.h" #include "wx/printdlg.h" +#include "wx/dc.h" typedef struct _GnomePrintJob GnomePrintJob; typedef struct _GnomePrintContext GnomePrintContext; diff --git a/include/wx/ipc.h b/include/wx/ipc.h index c096924fec..5b6369235a 100644 --- a/include/wx/ipc.h +++ b/include/wx/ipc.h @@ -9,6 +9,9 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// +#ifndef _WX_IPC_H_ +#define _WX_IPC_H_ + // Set wxUSE_DDE_FOR_IPC to 1 to use DDE for IPC under Windows. If it is set to // 0, or if the platform is not Windows, use TCP/IP for IPC implementation @@ -39,3 +42,4 @@ #include "wx/sckipc.h" #endif // wxUSE_DDE_FOR_IPC/!wxUSE_DDE_FOR_IPC +#endif // _WX_IPC_H_ diff --git a/include/wx/mac/carbon/tooltip.h b/include/wx/mac/carbon/tooltip.h index 7bf4ecf440..694283053b 100644 --- a/include/wx/mac/carbon/tooltip.h +++ b/include/wx/mac/carbon/tooltip.h @@ -9,6 +9,8 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// +#ifndef _WX_MAC_TOOLTIP_H_ +#define _WX_MAC_TOOLTIP_H_ class wxToolTip : public wxObject { @@ -46,3 +48,4 @@ private: DECLARE_ABSTRACT_CLASS(wxToolTip) }; +#endif // _WX_MAC_TOOLTIP_H_ diff --git a/include/wx/msw/fdrepdlg.h b/include/wx/msw/fdrepdlg.h index 826e51b03e..f7874715e4 100644 --- a/include/wx/msw/fdrepdlg.h +++ b/include/wx/msw/fdrepdlg.h @@ -9,6 +9,9 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +#ifndef _WX_MSW_FDREPDLG_H_ +#define _WX_MSW_FDREPDLG_H_ + // ---------------------------------------------------------------------------- // wxFindReplaceDialog: dialog for searching / replacing text // ---------------------------------------------------------------------------- @@ -56,4 +59,4 @@ protected: DECLARE_NO_COPY_CLASS(wxFindReplaceDialog) }; - +#endif // _WX_MSW_FDREPDLG_H_ diff --git a/include/wx/msw/tooltip.h b/include/wx/msw/tooltip.h index 0ae7194df2..c5fbe836a0 100644 --- a/include/wx/msw/tooltip.h +++ b/include/wx/msw/tooltip.h @@ -9,6 +9,9 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// +#ifndef _WX_MSW_TOOLTIP_H_ +#define _WX_MSW_TOOLTIP_H_ + class WXDLLEXPORT wxToolTip : public wxObject { public: @@ -58,3 +61,4 @@ private: DECLARE_NO_COPY_CLASS(wxToolTip) }; +#endif // _WX_MSW_TOOLTIP_H_ diff --git a/include/wx/os2/tooltip.h b/include/wx/os2/tooltip.h index 1a1bc252ad..5a85523492 100644 --- a/include/wx/os2/tooltip.h +++ b/include/wx/os2/tooltip.h @@ -9,6 +9,9 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// +#ifndef _WX_OS2_TOOLTIP_H_ +#define _WX_OS2_TOOLTIP_H_ + class wxToolTip : public wxObject { public: @@ -44,3 +47,5 @@ private: wxString m_sText; // tooltip text wxWindow* m_pWindow; // window we're associated with }; // end of CLASS wxToolTip + +#endif // _WX_OS2_TOOLTIP_H_ diff --git a/include/wx/palmos/fdrepdlg.h b/include/wx/palmos/fdrepdlg.h index 90eebf11fd..b09971e0fd 100644 --- a/include/wx/palmos/fdrepdlg.h +++ b/include/wx/palmos/fdrepdlg.h @@ -9,6 +9,9 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +#ifndef _WX_PALMOS_FDREPDLG_H_ +#define _WX_PALMOS_FDREPDLG_H_ + // ---------------------------------------------------------------------------- // wxFindReplaceDialog: dialog for searching / replacing text // ---------------------------------------------------------------------------- @@ -56,4 +59,4 @@ protected: DECLARE_NO_COPY_CLASS(wxFindReplaceDialog) }; - +#endif // _WX_PALMOS_FDREPDLG_H_ diff --git a/include/wx/palmos/tooltip.h b/include/wx/palmos/tooltip.h index e9f2eb1b48..3df3d53f10 100644 --- a/include/wx/palmos/tooltip.h +++ b/include/wx/palmos/tooltip.h @@ -9,6 +9,9 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// +#ifndef _WX_PALMOS_TOOLTIP_H_ +#define _WX_PALMOS_TOOLTIP_H_ + class WXDLLEXPORT wxToolTip : public wxObject { public: @@ -58,3 +61,4 @@ private: DECLARE_NO_COPY_CLASS(wxToolTip) }; +#endif // _WX_PALMOS_TOOLTIP_H_ diff --git a/include/wx/quantize.h b/include/wx/quantize.h index 04baaec5f7..6133e2863d 100644 --- a/include/wx/quantize.h +++ b/include/wx/quantize.h @@ -9,6 +9,9 @@ // Licence: ///////////////////////////////////////////////////////////////////////////// +#ifndef _WX_QUANTIZE_H_ +#define _WX_QUANTIZE_H_ + /* * From jquant2.c * @@ -17,9 +20,6 @@ * For conditions of distribution and use, see the accompanying README file. */ -#ifndef _WX_QUANTIZE_H_ -#define _WX_QUANTIZE_H_ - class WXDLLEXPORT wxImage; /* diff --git a/include/wx/univ/gauge.h b/include/wx/univ/gauge.h index e1f69a50e9..80b1bf6c11 100644 --- a/include/wx/univ/gauge.h +++ b/include/wx/univ/gauge.h @@ -9,6 +9,9 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// +#ifndef _WX_UNIV_GAUGE_H_ +#define _WX_UNIV_GAUGE_H_ + // ---------------------------------------------------------------------------- // wxGauge: a progress bar // ---------------------------------------------------------------------------- @@ -68,3 +71,5 @@ protected: DECLARE_DYNAMIC_CLASS(wxGauge) }; + +#endif // _WX_UNIV_GAUGE_H_ diff --git a/include/wx/univ/renderer.h b/include/wx/univ/renderer.h index 8024c825b9..2dc137a9b9 100644 --- a/include/wx/univ/renderer.h +++ b/include/wx/univ/renderer.h @@ -9,6 +9,9 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// +#ifndef _WX_UNIV_RENDERER_H_ +#define _WX_UNIV_RENDERER_H_ + /* wxRenderer class is used to draw all wxWidgets controls. This is an ABC and the look of the application is determined by the concrete derivation of @@ -25,9 +28,6 @@ implementation of the latter or reimplement itself). */ -#ifndef _WX_UNIV_RENDERER_H_ -#define _WX_UNIV_RENDERER_H_ - #include "wx/renderer.h" class WXDLLEXPORT wxDC; diff --git a/include/wx/univ/scrtimer.h b/include/wx/univ/scrtimer.h index 9203e8b227..7e4e8bdd05 100644 --- a/include/wx/univ/scrtimer.h +++ b/include/wx/univ/scrtimer.h @@ -9,6 +9,9 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// +#ifndef _WX_UNIV_SCRTIMER_H +#define _WX_UNIV_SCRTIMER_H + // NB: this class is implemented in scrolbar.cpp #include "wx/timer.h" @@ -39,3 +42,4 @@ protected: bool m_skipNext; }; +#endif // _WX_UNIV_SCRTIMER_H diff --git a/include/wx/wizard.h b/include/wx/wizard.h index 4b61820ffa..cc92fb9137 100644 --- a/include/wx/wizard.h +++ b/include/wx/wizard.h @@ -25,13 +25,9 @@ // headers and other simple declarations // ---------------------------------------------------------------------------- -#ifndef WX_PRECOMP - #include "wx/dialog.h" // the base class - #include "wx/panel.h" // ditto - - #include "wx/event.h" // wxEVT_XXX constants -#endif // WX_PRECOMP - +#include "wx/dialog.h" // the base class +#include "wx/panel.h" // ditto +#include "wx/event.h" // wxEVT_XXX constants #include "wx/bitmap.h" // Extended style to specify a help button diff --git a/src/gtk/gnome/gprint.cpp b/src/gtk/gnome/gprint.cpp index ff86288a88..c9c378e560 100644 --- a/src/gtk/gnome/gprint.cpp +++ b/src/gtk/gnome/gprint.cpp @@ -21,11 +21,12 @@ #include "wx/math.h" #include "wx/fontutil.h" -#include "wx/printdlg.h" #include "wx/gtk/private.h" #include "wx/module.h" -#include "wx/generic/prntdlgg.h" #include "wx/dynlib.h" +#include "wx/dcmemory.h" +#include "wx/log.h" +#include "wx/icon.h" #include #include diff --git a/src/gtk1/gnome/gprint.cpp b/src/gtk1/gnome/gprint.cpp index ff86288a88..c9c378e560 100644 --- a/src/gtk1/gnome/gprint.cpp +++ b/src/gtk1/gnome/gprint.cpp @@ -21,11 +21,12 @@ #include "wx/math.h" #include "wx/fontutil.h" -#include "wx/printdlg.h" #include "wx/gtk/private.h" #include "wx/module.h" -#include "wx/generic/prntdlgg.h" #include "wx/dynlib.h" +#include "wx/dcmemory.h" +#include "wx/log.h" +#include "wx/icon.h" #include #include