Use defs.h (and automatically setup.h and chkconf.h) before first wxUSE_* check ...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32852 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/choice.h b/include/wx/choice.h
index 9f396fdd9caab25a1c64c88c8281df752b45e6b5..ea08445c753215d5aca0bb996c5fbedd2cab96ea 100644 (file)
--- a/include/wx/choice.h
+++ b/include/wx/choice.h
@@ -20,6 +20,8 @@
     #pragma interface "choicebase.h"
 #endif
 
+#include "wx/defs.h"
+
 #if wxUSE_CHOICE
 
 #include "wx/ctrlsub.h"     // the base class

diff --git a/include/wx/config.h b/include/wx/config.h
index e6275cb52ef1e0aa4c14bc9d8f771b7fb9cfff71..2028c217ae935773c21eaa173f42c2d9962558cb 100644 (file)
--- a/include/wx/config.h
+++ b/include/wx/config.h
@@ -1,6 +1,18 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        config.h
+// Purpose:     wxConfig base header
+// Author:      wxWidgets Team
+// Modified by:
+// Created:
+// Copyright:   (c) wxWidgets Team
+// RCS-ID:      $Id$
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
 #ifndef _WX_CONFIG_H_BASE_
 #define _WX_CONFIG_H_BASE_
 
+#include "wx/defs.h"
 #include "wx/confbase.h"
 
 #if defined(__WXMSW__) && wxUSE_CONFIG_NATIVE

diff --git a/include/wx/ctrlsub.h b/include/wx/ctrlsub.h
index c7cddfe66085613aab56a3ba6746b9d8b63dbcc8..d747a60d2b3c0550f9beaad29e6238fe2083faea 100644 (file)
--- a/include/wx/ctrlsub.h
+++ b/include/wx/ctrlsub.h
@@ -16,6 +16,8 @@
     #pragma interface "controlwithitems.h"
 #endif
 
+#include "wx/defs.h"
+
 #if wxUSE_CONTROLS
 
 #include "wx/control.h"      // base class

diff --git a/include/wx/db.h b/include/wx/db.h
index 8c05a2aae39faada84dfbd00adab7d39f6b304f2..63ab1a66c71e62905b5e735c13f383ff52f32ba6 100644 (file)
--- a/include/wx/db.h
+++ b/include/wx/db.h
@@ -31,14 +31,10 @@
 #define OLD_GETCOLUMNS 1
 #define EXPERIMENTAL_WXDB_FUNCTIONS 1
 
-#include "wx/version.h"
-
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "db.h"
 #endif
 
-#include "wx/setup.h"
-
 #include "wx/defs.h"
 #include "wx/string.h"
 

diff --git a/include/wx/dbtable.h b/include/wx/dbtable.h
index 463c1f3caf71872440ecfb88d1be08692adb944a..45970a6a1ba305f8b681f004edc215c9ccaaf564 100644 (file)
--- a/include/wx/dbtable.h
+++ b/include/wx/dbtable.h
@@ -19,7 +19,7 @@
 #ifndef DBTABLE_DOT_H
 #define DBTABLE_DOT_H
 
-#include "wx/version.h"
+#include "wx/defs.h"
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
   #pragma interface "dbtable.h"

diff --git a/include/wx/dynlib.h b/include/wx/dynlib.h
index 4eeaffef9280dc8c14eda26a113d2cac8cf8c108..8bcc8b4d352249b1872ae844a2801f82526ec9d6 100644 (file)
--- a/include/wx/dynlib.h
+++ b/include/wx/dynlib.h
@@ -16,7 +16,7 @@
 #   pragma interface "dynlib.h"
 #endif
 
-#include "wx/setup.h"
+#include "wx/defs.h"
 
 #if wxUSE_DYNLIB_CLASS
 

diff --git a/include/wx/file.h b/include/wx/file.h
index abb427af66df28d34f2089ef8df6a1d8248f1725..35b7aeb5021b3a7254359b2f933084e4eb058fed 100644 (file)
--- a/include/wx/file.h
+++ b/include/wx/file.h
@@ -17,12 +17,14 @@
 #pragma interface "file.h"
 #endif
 
+#include  "wx/defs.h"
+
+#if wxUSE_FILE
+
 #include  "wx/string.h"
 #include  "wx/filefn.h"
 #include  "wx/strconv.h"
 
-#if wxUSE_FILE
-
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------

diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h
index 52d5aeb6d09769218822cb3d75229ceb5e39d335..60c59e80ef64fbe7a7a4496d26798e66896ed3c5 100644 (file)
--- a/include/wx/filedlg.h
+++ b/include/wx/filedlg.h
@@ -5,13 +5,15 @@
 // Modified by:
 // Created:     8/17/99
 // Copyright:   (c) Robert Roebling
-// RCS-ID:
+// RCS-ID:      $Id$
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FILEDLG_H_BASE_
 #define _WX_FILEDLG_H_BASE_
 
+#include "wx/defs.h"
+
 #if wxUSE_FILEDLG
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

diff --git a/include/wx/filesys.h b/include/wx/filesys.h
index 46f267cf470c6f8978269f5b8d2097b823108a65..a75350f72406d0efa5ccdcdbb9b826ee888b535d 100644 (file)
--- a/include/wx/filesys.h
+++ b/include/wx/filesys.h
@@ -14,7 +14,7 @@
 #pragma interface "filesys.h"
 #endif
 
-#include "wx/setup.h"
+#include "wx/defs.h"
 
 #if !wxUSE_STREAMS
 #error You cannot compile virtual file systems without wxUSE_STREAMS

diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index 968feded8829599274169eb1782dac932d6dc368..aa7d92113d82c0107a3bb4a5e3ba73065498bde2 100644 (file)
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -20,7 +20,7 @@
     #pragma interface "gdicmn.h"
 #endif
 
-#include "wx/setup.h"
+#include "wx/defs.h"
 #include "wx/list.h"
 #include "wx/string.h"
 #include "wx/fontenc.h"

diff --git a/include/wx/gifdecod.h b/include/wx/gifdecod.h
index 3545fc288f68e7d762a1aeabcf65b1d4c277a8c9..f61739ed7ece92b05d7683c0f00289a8a74cbec9 100644 (file)
--- a/include/wx/gifdecod.h
+++ b/include/wx/gifdecod.h
@@ -15,7 +15,7 @@
 #pragma interface "gifdecod.h"
 #endif
 
-#include "wx/setup.h"
+#include "wx/defs.h"
 
 #if wxUSE_STREAMS && wxUSE_GIF
 

diff --git a/include/wx/gsocket.h b/include/wx/gsocket.h
index 9ace677b54605ffe030cdb18c4cf1657d73e6863..009804091ef1ee77579db84c2ee09c9cb0b98fbb 100644 (file)
--- a/include/wx/gsocket.h
+++ b/include/wx/gsocket.h
@@ -12,8 +12,7 @@
 #define __GSOCKET_H
 
 #ifndef __GSOCKET_STANDALONE__
-#include "wx/setup.h"
-#include "wx/platform.h"
+#include "wx/defs.h"
 
 #include "wx/dlimpexp.h" /* for WXDLLIMPEXP_NET */
 

diff --git a/include/wx/help.h b/include/wx/help.h
index 5ea82acabd216a8ea53671e54540a671e9909032..267a4b4d13b534d942ab20f7eb051576fae31f4e 100644 (file)
--- a/include/wx/help.h
+++ b/include/wx/help.h
@@ -1,6 +1,19 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        help.h
+// Purpose:     wxHelpController base header
+// Author:      wxWidgets Team
+// Modified by:
+// Created:
+// Copyright:   (c) wxWidgets Team
+// RCS-ID:      $Id$
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
 #ifndef _WX_HELP_H_BASE_
 #define _WX_HELP_H_BASE_
 
+#include "wx/defs.h"
+
 #if wxUSE_HELP
 
 #include "wx/helpbase.h"

diff --git a/include/wx/image.h b/include/wx/image.h
index 61f54d16cf83fe33ad69e76f061bd5d150894da8..665d89534e0bafb55628c54885eebdb100e797cf 100644 (file)
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -14,7 +14,7 @@
 #pragma interface "image.h"
 #endif
 
-#include "wx/setup.h"
+#include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/gdicmn.h"
@@ -182,9 +182,9 @@ public:
 
     // Paste the image or part of this image into an image of the given size at the pos
     //  any newly exposed areas will be filled with the rgb colour
-    //  by default if r = g = b = -1 then fill with this image's mask colour or find and 
+    //  by default if r = g = b = -1 then fill with this image's mask colour or find and
     //  set a suitable mask colour
-    wxImage Size( const wxSize& size, const wxPoint& pos, 
+    wxImage Size( const wxSize& size, const wxPoint& pos,
                   int r = -1, int g = -1, int b = -1 ) const;
 
     // pastes image into this instance and takes care of
@@ -200,7 +200,7 @@ public:
     wxImage& Rescale( int width, int height ) { return *this = Scale(width, height); }
 
     // resizes the image in place
-    wxImage& Resize( const wxSize& size, const wxPoint& pos, 
+    wxImage& Resize( const wxSize& size, const wxPoint& pos,
                      int r = -1, int g = -1, int b = -1 ) { return *this = Size(size, pos, r, g, b); }
 
     // Rotates the image about the given point, 'angle' radians.

diff --git a/include/wx/imagjpeg.h b/include/wx/imagjpeg.h
index e51491e8f7559e6f13b28c0bb1597eee48b15ae7..465947e67a0a3feabbbbf7586a208a29b14db04e 100644 (file)
--- a/include/wx/imagjpeg.h
+++ b/include/wx/imagjpeg.h
@@ -14,14 +14,16 @@
 #pragma interface "imagjpeg.h"
 #endif
 
-#include "wx/image.h"
-
+#include "wx/defs.h"
 
 //-----------------------------------------------------------------------------
 // wxJPEGHandler
 //-----------------------------------------------------------------------------
 
 #if wxUSE_LIBJPEG
+
+#include "wx/image.h"
+
 class WXDLLEXPORT wxJPEGHandler: public wxImageHandler
 {
 public:
@@ -42,7 +44,8 @@ public:
 private:
     DECLARE_DYNAMIC_CLASS(wxJPEGHandler)
 };
-#endif
+
+#endif // wxUSE_LIBJPEG
 
 #endif // _WX_IMAGJPEG_H_
 

diff --git a/include/wx/imagpng.h b/include/wx/imagpng.h
index 1f16de20020ee49cf4fa3c913f034c5a830942a5..73c465a90d6eb0a3096cbc66db2e592e636643f3 100644 (file)
--- a/include/wx/imagpng.h
+++ b/include/wx/imagpng.h
@@ -14,7 +14,7 @@
 #pragma interface "imagpng.h"
 #endif
 
-#include "wx/image.h"
+#include "wx/defs.h"
 
 //-----------------------------------------------------------------------------
 // wxPNGHandler
@@ -22,6 +22,8 @@
 
 #if wxUSE_LIBPNG
 
+#include "wx/image.h"
+
 #define wxIMAGE_OPTION_PNG_FORMAT    wxT("PngFormat")
 #define wxIMAGE_OPTION_PNG_BITDEPTH  wxT("PngBitDepth")
 
@@ -52,8 +54,9 @@ public:
 private:
     DECLARE_DYNAMIC_CLASS(wxPNGHandler)
 };
-#endif
 
+#endif
+  // wxUSE_LIBPNG
 
 #endif
   // _WX_IMAGPNG_H_

diff --git a/include/wx/imagtiff.h b/include/wx/imagtiff.h
index 44e8c6fa6426e85036d7739db89eccadf96449d3..4c1a68cd43b7712776711de6b061deeffe738604 100644 (file)
--- a/include/wx/imagtiff.h
+++ b/include/wx/imagtiff.h
@@ -14,6 +14,14 @@
 #pragma interface "imagtiff.h"
 #endif
 
+#include "wx/defs.h"
+
+//-----------------------------------------------------------------------------
+// wxTIFFHandler
+//-----------------------------------------------------------------------------
+
+#if wxUSE_LIBTIFF
+
 #include "wx/image.h"
 
 // defines for wxImage::SetOption
@@ -22,11 +30,6 @@
 #define wxIMAGE_OPTION_COMPRESSION                 wxString(_T("Compression"))
 #define wxIMAGE_OPTION_IMAGEDESCRIPTOR             wxString(_T("ImageDescriptor"))
 
-//-----------------------------------------------------------------------------
-// wxTIFFHandler
-//-----------------------------------------------------------------------------
-
-#if wxUSE_LIBTIFF
 class WXDLLEXPORT wxTIFFHandler: public wxImageHandler
 {
 public:
@@ -42,9 +45,8 @@ public:
 private:
     DECLARE_DYNAMIC_CLASS(wxTIFFHandler)
 };
-#endif
 
+#endif // wxUSE_LIBTIFF
 
-#endif
-  // _WX_IMAGTIFF_H_
+#endif // _WX_IMAGTIFF_H_
 

diff --git a/include/wx/joystick.h b/include/wx/joystick.h
index 1e07320f910e4db477fd10479789527907d3b5bb..1fe2e6d55e80c9d050c4b55f9338b3fb75884925 100644 (file)
--- a/include/wx/joystick.h
+++ b/include/wx/joystick.h
@@ -1,6 +1,19 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        joystick.h
+// Purpose:     wxJoystick base header
+// Author:      wxWidgets Team
+// Modified by:
+// Created:
+// Copyright:   (c) wxWidgets Team
+// RCS-ID:      $Id$
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
 #ifndef _WX_JOYSTICK_H_BASE_
 #define _WX_JOYSTICK_H_BASE_
 
+#include "wx/defs.h"
+
 #if wxUSE_JOYSTICK
 
 #if defined(__WXMSW__)

diff --git a/include/wx/listbase.h b/include/wx/listbase.h
index 97a3555fae745ef34a79c0348774490de9b44bb3..3d4cd4da72b383d07dce82f0bf4f50204b0fe661 100644 (file)
--- a/include/wx/listbase.h
+++ b/include/wx/listbase.h
@@ -16,6 +16,8 @@
 //    #pragma interface "listctrlbase.h"
 #endif
 
+#include "wx/defs.h"
+
 #if wxUSE_LISTCTRL
 
 #include "wx/colour.h"

diff --git a/include/wx/mdi.h b/include/wx/mdi.h
index 02f079f87b0c7c4a41318434c558dcdad77e8fab..6c393bcb5a2fca7731243fdcf698488cf88cdc95 100644 (file)
--- a/include/wx/mdi.h
+++ b/include/wx/mdi.h
@@ -1,7 +1,18 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        mdi.h
+// Purpose:     wxMDI base header
+// Author:      wxWidgets Team
+// Modified by:
+// Created:
+// Copyright:   (c) wxWidgets Team
+// RCS-ID:      $Id$
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
 #ifndef _WX_MDI_H_BASE_
 #define _WX_MDI_H_BASE_
 
-#include "wx/setup.h"
+#include "wx/defs.h"
 
 #if wxUSE_MDI
 

diff --git a/include/wx/mediactrl.h b/include/wx/mediactrl.h
index 4caa45cc70ec98e63b7be7a1cadfabf2bc065864..ce635aa3833669ec53df339f0643a841b4e9ed06 100644 (file)
--- a/include/wx/mediactrl.h
+++ b/include/wx/mediactrl.h
@@ -26,9 +26,12 @@
 #pragma interface "mediactrl.h"
 #endif
 
+#include "wx/defs.h"
+
 // ----------------------------------------------------------------------------
 // Compilation guard
 // ----------------------------------------------------------------------------
+
 #if wxUSE_MEDIACTRL
 
 // ----------------------------------------------------------------------------
@@ -179,10 +182,10 @@ public:
     wxFileOffset Length(); //FIXME: This should be const
 
     //
-    // Unofficial parts of API 
+    // Unofficial parts of API
     //
     //DirectShow/GStreamer only.  Quicktime too, but somewhat buggy...
-    bool Load(const wxURI& location);  
+    bool Load(const wxURI& location);
 
     double GetPlaybackRate();           //All but MCI & GStreamer
     bool SetPlaybackRate(double dRate); //All but MCI & GStreamer

diff --git a/include/wx/menuitem.h b/include/wx/menuitem.h
index bdf8f5428fa9323aa9c3e12234180ec63f5582e0..c2607a04def68fa4b9120991e87d5c1fe7574faf 100644 (file)
--- a/include/wx/menuitem.h
+++ b/include/wx/menuitem.h
@@ -12,6 +12,8 @@
 #ifndef _WX_MENUITEM_H_BASE_
 #define _WX_MENUITEM_H_BASE_
 
+#include "wx/defs.h"
+
 #if wxUSE_MENUS
 
 // ----------------------------------------------------------------------------

diff --git a/include/wx/msgdlg.h b/include/wx/msgdlg.h
index b16aa2569d57bfe25df9848cc6fd59a6a2528bc0..2176ed6efb5855dce4cbc9467898605eab0ebe8b 100644 (file)
--- a/include/wx/msgdlg.h
+++ b/include/wx/msgdlg.h
@@ -12,7 +12,7 @@
 #ifndef _WX_MSGDLG_H_BASE_
 #define _WX_MSGDLG_H_BASE_
 
-#include "wx/setup.h"
+#include "wx/defs.h"
 
 #if wxUSE_MSGDLG
 

diff --git a/include/wx/mstream.h b/include/wx/mstream.h
index 2719d90474caf2bcb137c16b6bd3824e76046e59..a679e6bb8fd81dc372c255ca706aae8ea5db8384 100644 (file)
--- a/include/wx/mstream.h
+++ b/include/wx/mstream.h
@@ -12,10 +12,12 @@
 #ifndef _WX_WXMMSTREAM_H__
 #define _WX_WXMMSTREAM_H__
 
-#include "wx/stream.h"
+#include "wx/defs.h"
 
 #if wxUSE_STREAMS
 
+#include "wx/stream.h"
+
 class WXDLLIMPEXP_BASE wxMemoryInputStream : public wxInputStream
 {
 public:

diff --git a/include/wx/ownerdrw.h b/include/wx/ownerdrw.h
index 7d388880bb87b229ca85029470e5a775a1d2b02b..46ddedab28407e0cf29ee79fa113bbb2ee9239a4 100644 (file)
--- a/include/wx/ownerdrw.h
+++ b/include/wx/ownerdrw.h
@@ -12,6 +12,8 @@
 #ifndef   _OWNERDRW_H
 #define   _OWNERDRW_H
 
+#include "wx/defs.h"
+
 #if wxUSE_OWNER_DRAWN
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h
index e0e5eefca978a5850c69e950347863d4f2c2ca6b..9cd390d2fad91fe03c4f5647550c56dbb5392e3c 100644 (file)
--- a/include/wx/popupwin.h
+++ b/include/wx/popupwin.h
@@ -16,9 +16,12 @@
     #pragma interface "popupwinbase.h"
 #endif
 
-#include "wx/window.h"
+#include "wx/defs.h"
 
 #if wxUSE_POPUPWIN
+
+#include "wx/window.h"
+
 // ----------------------------------------------------------------------------
 // wxPopupWindow: a special kind of top level window used for popup menus,
 // combobox popups and such.
@@ -106,7 +109,7 @@ public:
 
     // Overridden to grab the input on some plaforms
     virtual bool Show( bool show = true );
-    
+
 protected:
     // common part of all ctors
     void Init();

diff --git a/include/wx/radiobut.h b/include/wx/radiobut.h
index 4485b1cc3fb0cf5b31df2d18ae6060017da2524f..a2daea534180c5b28367e86a373e307e7e3150c3 100644 (file)
--- a/include/wx/radiobut.h
+++ b/include/wx/radiobut.h
@@ -12,6 +12,8 @@
 #ifndef _WX_RADIOBUT_H_BASE_
 #define _WX_RADIOBUT_H_BASE_
 
+#include "wx/defs.h"
+
 #if wxUSE_RADIOBTN
 
 /*

diff --git a/include/wx/scrolbar.h b/include/wx/scrolbar.h
index c9272e99dd0e7cb3634405b8c7d9baadb10da37b..0c2011c197d4aafb4350971fca196ae485418449 100644 (file)
--- a/include/wx/scrolbar.h
+++ b/include/wx/scrolbar.h
@@ -1,6 +1,19 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        scrolbar.h
+// Purpose:     wxScrollBar base header
+// Author:      wxWidgets Team
+// Modified by:
+// Created:
+// Copyright:   (c) wxWidgets Team
+// RCS-ID:      $Id$
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
 #ifndef _WX_SCROLBAR_H_BASE_
 #define _WX_SCROLBAR_H_BASE_
 
+#include "wx/defs.h"
+
 #if wxUSE_SCROLLBAR
 
 #include "wx/control.h"

diff --git a/include/wx/spinctrl.h b/include/wx/spinctrl.h
index ced37995060f9d1680e5fa89e006f2d277a34f68..7490dc47663748b83c49f996bb4353ab84caa939 100644 (file)
--- a/include/wx/spinctrl.h
+++ b/include/wx/spinctrl.h
@@ -12,6 +12,10 @@
 #ifndef _WX_SPINCTRL_H_
 #define _WX_SPINCTRL_H_
 
+#include "wx/defs.h"
+
+#if wxUSE_SPINCTRL
+
 #include "wx/spinbutt.h"        // should make wxSpinEvent visible to the app
 
 // ----------------------------------------------------------------------------
@@ -72,5 +76,6 @@ protected:
 #define EVT_SPINCTRL(id, fn) \
     wx__DECLARE_EVT1(wxEVT_COMMAND_SPINCTRL_UPDATED, id, wxSpinEventHandler(fn))
 
-#endif // _WX_SPINCTRL_H_
+#endif // wxUSE_SPINCTRL
 
+#endif // _WX_SPINCTRL_H_

diff --git a/include/wx/statbox.h b/include/wx/statbox.h
index 41d29b05b90a97b9db1be5996085dfe40f822e87..362aeb7b1776e8437ff5f019c406374bb7571623 100644 (file)
--- a/include/wx/statbox.h
+++ b/include/wx/statbox.h
@@ -1,6 +1,19 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        statbox.h
+// Purpose:     wxStaticBox base header
+// Author:      wxWidgets Team
+// Modified by:
+// Created:
+// Copyright:   (c) wxWidgets Team
+// RCS-ID:      $Id$
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
 #ifndef _WX_STATBOX_H_BASE_
 #define _WX_STATBOX_H_BASE_
 
+#include "wx/defs.h"
+
 #if wxUSE_STATBOX
 
 #include "wx/control.h"

diff --git a/include/wx/stattext.h b/include/wx/stattext.h
index ae85c17dadce343d47f004c094e145d3c5e5e217..cf49abca926933f0f564d7b45e333ad6cc2b539d 100644 (file)
--- a/include/wx/stattext.h
+++ b/include/wx/stattext.h
@@ -1,6 +1,19 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        stattext.h
+// Purpose:     wxStaticText base header
+// Author:      wxWidgets Team
+// Modified by:
+// Created:
+// Copyright:   (c) wxWidgets Team
+// RCS-ID:      $Id$
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
 #ifndef _WX_STATTEXT_H_BASE_
 #define _WX_STATTEXT_H_BASE_
 
+#include "wx/defs.h"
+
 #if wxUSE_STATTEXT
 
 #include "wx/control.h"

diff --git a/include/wx/stopwatch.h b/include/wx/stopwatch.h
index 08c8421ccc8ada9b64cb27569c5c6629a9d360a1..d7abae28beb9b9f2e9b41a85ce15439b03ca28b2 100644 (file)
--- a/include/wx/stopwatch.h
+++ b/include/wx/stopwatch.h
@@ -11,6 +11,7 @@
 #ifndef _WX_STOPWATCH_H_
 #define _WX_STOPWATCH_H_
 
+#include "wx/defs.h"
 #include "wx/longlong.h"
 
 // ----------------------------------------------------------------------------

diff --git a/include/wx/timer.h b/include/wx/timer.h
index 2ee202c10662660e815a9c33cdac5e79a284089e..f17a83a091bb3dd8dbb23ba068d7c464485bc76f 100644 (file)
--- a/include/wx/timer.h
+++ b/include/wx/timer.h
@@ -17,15 +17,15 @@
     #pragma interface "timerbase.h"
 #endif
 
-#include "wx/setup.h"
+#include "wx/defs.h"
+
+#if wxUSE_GUI && wxUSE_TIMER
+
 #include "wx/object.h"
 #include "wx/longlong.h"
 #include "wx/event.h"
-
 #include "wx/stopwatch.h" // for backwards compatibility
 
-#if wxUSE_GUI && wxUSE_TIMER
-
 // ----------------------------------------------------------------------------
 // wxTimer
 // ----------------------------------------------------------------------------

diff --git a/include/wx/tooltip.h b/include/wx/tooltip.h
index c20fc7b6d92bd58cca1bad3619f97637d680b45d..83a4eb92493d52c9bb51830a52478eb88bbb6065 100644 (file)
--- a/include/wx/tooltip.h
+++ b/include/wx/tooltip.h
@@ -1,7 +1,18 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        tooltip.h
+// Purpose:     wxToolTip base header
+// Author:      wxWidgets Team
+// Modified by:
+// Created:
+// Copyright:   (c) wxWidgets Team
+// RCS-ID:      $Id$
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
 #ifndef _WX_TOOLTIP_H_BASE_
 #define _WX_TOOLTIP_H_BASE_
 
-#include "wx/setup.h"
+#include "wx/defs.h"
 
 #if wxUSE_TOOLTIPS
 

diff --git a/include/wx/treebase.h b/include/wx/treebase.h
index 51c4249027979916bc2bd6a5ab18ceda3b42064b..c7c9aef476c9f7fbafd9a2e101399f38956e49ea 100644 (file)
--- a/include/wx/treebase.h
+++ b/include/wx/treebase.h
@@ -20,6 +20,8 @@
 // headers
 // ----------------------------------------------------------------------------
 
+#include "wx/defs.h"
+
 #if wxUSE_TREECTRL
 
 #include "wx/window.h"  // for wxClientData

diff --git a/include/wx/wave.h b/include/wx/wave.h
index 97f330077477a14b38eeeeea2b934e1e6136c7b2..2372a6d9b86da5b0186eed639a4077e44b3ed8df 100644 (file)
--- a/include/wx/wave.h
+++ b/include/wx/wave.h
@@ -12,7 +12,7 @@
 #ifndef _WX_WAVE_H_BASE_
 #define _WX_WAVE_H_BASE_
 
-#include "wx/setup.h"
+#include "wx/defs.h"
 
 #if wxUSE_SOUND
 

diff --git a/include/wx/wizard.h b/include/wx/wizard.h
index 712ea4f7a1599d7c1cc95b2b70bb53ab38958ddb..a7d0250f1bde174c42e592beb83187bc43459a74 100644 (file)
--- a/include/wx/wizard.h
+++ b/include/wx/wizard.h
@@ -17,6 +17,8 @@
 #ifndef _WX_WIZARD_H_
 #define _WX_WIZARD_H_
 
+#include "wx/defs.h"
+
 #if wxUSE_WIZARDDLG
 
 // ----------------------------------------------------------------------------

diff --git a/include/wx/xpmdecod.h b/include/wx/xpmdecod.h
index f35b7f47eaf7f98c4ef0c46fa119f7cfcad2b4d3..e4663a5b8ff983a0b52f84027c1c6233dee25bd3 100644 (file)
--- a/include/wx/xpmdecod.h
+++ b/include/wx/xpmdecod.h
@@ -14,7 +14,7 @@
 #pragma interface "xpmdecod.h"
 #endif
 
-#include "wx/setup.h"
+#include "wx/defs.h"
 
 
 class WXDLLIMPEXP_CORE wxImage;

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index 4d98262d3015f5d04cb0403656c8c9b1699c05b5..f4f42cc31f4ba7c0d14869dbb401c1d40ed21588 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -40,6 +40,7 @@
 
 #include "wx/sckaddr.h"
 #include "wx/socket.h"
+#include "wx/stopwatch.h"
 
 // DLL options compatibility check:
 #include "wx/build.h"