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 42433e2398bb8fe062b7d7c3d378da5b913be510..784718164bebc44700e0b5f139aae850c50ee7d6 100644 (file)
--- 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 9e50750b779e1142437198711849b604e85a5ce4..c87b753f6d39be2084253ccac0f01d2aaabb87ae 100644 (file)
--- 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 4d3755953d63eaf4baea49bfbcfa82cf86ca519d..c254ed04ed9fcc27b5fe3a6f2a856cae319df8f1 100644 (file)
--- 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 <stdio.h>
 

diff --git a/include/wx/filename.h b/include/wx/filename.h
index 547d080fc7e696f7f13b7ea484b9e242572b1342..cba406de3531b754c1e9a66f6c425c666e62cb33 100644 (file)
--- 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 bf7fb02b07fc6e06bf363b227399d0ed41b0ea77..c2873221341e5075caca4df39c2ca398bb62d05a 100644 (file)
--- 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 0d73cd15d5e95fc5ed43a217bcaf934b25cdfada..80156c82392f1c2f6b964e1f7f53571dd5c62984 100644 (file)
--- 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 bfa1c4e03819302caf3b7981a3f4b06d6624724f..0fa66dc46a3c804427f3947494824bf3e6256e2d 100644 (file)
--- 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 c17d68de85e1269b4b606ddab9688cad2e75ce6c..a8bf2ae8a10a0e6ed7f1df5ac48cb853154d8cf5 100644 (file)
--- 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 f045c1bb8a700f3146888d9b551b378c7040c8d4..bba347c7dbc85e33d3dd38281e3b8bbf5142d527 100644 (file)
--- 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 82d086b09f3ed0354127f50e4a9860ba2d6e2a69..80189e3561981eb5dda09f88cfceb7ca4fab71ee 100644 (file)
--- 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 <wx/wx.h>
-#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 82d086b09f3ed0354127f50e4a9860ba2d6e2a69..80189e3561981eb5dda09f88cfceb7ca4fab71ee 100644 (file)
--- 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 <wx/wx.h>
-#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 c096924fec3c1de243eba730bdc09911237988ee..5b6369235a6dfa59b875668842d9974f92eac226 100644 (file)
--- 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 7bf4ecf440ac4d11f01819155672ba5b3308d09a..694283053b16609c99d728b661541df13391a1e7 100644 (file)
--- 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 826e51b03e60b66cc64f1688d0e18e4fb431e6db..f7874715e44d57741deea685426a96ca49dbee1c 100644 (file)
--- 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 0ae7194df2c4b0c469225382cbd6997345e29080..c5fbe836a067fca7375205345332f963130730f4 100644 (file)
--- 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 1a1bc252adf859dc7bcf29f45325123129ac058f..5a85523492773c61dc3de09d0d5ddb1ef436699e 100644 (file)
--- 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 90eebf11fdc59c12b34a7bdb26f49587d59d60d7..b09971e0fdb940c5f6b0ebd2e8750e169c8d9adb 100644 (file)
--- 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 e9f2eb1b486f7294b5b704b354505aa19697bac0..3df3d53f10f46a64ebfcb78c30cb26f3f8948209 100644 (file)
--- 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 04baaec5f74273e0c4465861e432fdb14541b8a1..6133e2863d0256c063c44b86902a6be5ffa6ad78 100644 (file)
--- 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 e1f69a50e923efd269806dec014a77b2f48fcfaf..80b1bf6c110448a93a967852594c9c197482ab34 100644 (file)
--- 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 8024c825b9b6b3e277404c8840ae62ff1c273883..2dc137a9b97e67226382ac6894945ef3c8214ea9 100644 (file)
--- 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 9203e8b22715291bad35c85b709261b24eb2fe93..7e4e8bdd05cdc803babfa2768b2955e3bd2c745d 100644 (file)
--- 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 4b61820ffab2b1d0ed949790237c1541634d387f..cc92fb9137296de4b710cb2b3158fbf70f2b82a2 100644 (file)
--- 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 ff86288a88cc899a082ff3484ee21a0c65fc29e8..c9c378e560aef20b881188e3dd9c1df7a637c4c0 100644 (file)
--- 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 <libgnomeprint/gnome-print.h>
 #include <libgnomeprint/gnome-print-pango.h>

diff --git a/src/gtk1/gnome/gprint.cpp b/src/gtk1/gnome/gprint.cpp
index ff86288a88cc899a082ff3484ee21a0c65fc29e8..c9c378e560aef20b881188e3dd9c1df7a637c4c0 100644 (file)
--- 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 <libgnomeprint/gnome-print.h>
 #include <libgnomeprint/gnome-print-pango.h>