fixes for compilation with wxUSE_XXX==0 and some other minor fixes (patch 1569904)

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

diff --git a/include/wx/xrc/xh_bmp.h b/include/wx/xrc/xh_bmp.h
index 70b22eee29faac31607c5777b8a54ca2f96c1344..da40ac9426a744977df325e461c930d4bc0aa5d9 100644 (file)
--- a/include/wx/xrc/xh_bmp.h
+++ b/include/wx/xrc/xh_bmp.h
@@ -13,10 +13,12 @@
 
 #include "wx/xrc/xmlres.h"
 
+#if wxUSE_XRC
 
 class WXDLLIMPEXP_XRC wxBitmapXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxBitmapXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxBitmapXmlHandler)
+
 public:
     wxBitmapXmlHandler();
     virtual wxObject *DoCreateResource();
@@ -25,12 +27,14 @@ public:
 
 class WXDLLIMPEXP_XRC wxIconXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxIconXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxIconXmlHandler)
+
 public:
     wxIconXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 };
 
+#endif // wxUSE_XRC
 
 #endif // _WX_XH_BMP_H_

diff --git a/include/wx/xrc/xh_bmpbt.h b/include/wx/xrc/xh_bmpbt.h
index c44c9ea571d1e718c21712c9fcefd117f1150c63..ec72f2670abc9596fa6aad5a14c1a7b5cf0cf84f 100644 (file)
--- a/include/wx/xrc/xh_bmpbt.h
+++ b/include/wx/xrc/xh_bmpbt.h
@@ -11,22 +11,20 @@
 #ifndef _WX_XH_BMPBT_H_
 #define _WX_XH_BMPBT_H_
 
-#include "wx/defs.h"
-
-#if wxUSE_XRC
-
 #include "wx/xrc/xmlres.h"
 
+#if wxUSE_XRC && wxUSE_BMPBUTTON
+
 class WXDLLIMPEXP_XRC wxBitmapButtonXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxBitmapButtonXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxBitmapButtonXmlHandler)
+
 public:
     wxBitmapButtonXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 };
 
-#endif // wxUSE_XRC
-
+#endif // wxUSE_XRC && wxUSE_BMPBUTTON
 
 #endif // _WX_XH_BMPBT_H_

diff --git a/include/wx/xrc/xh_bmpcbox.h b/include/wx/xrc/xh_bmpcbox.h
index 4772ac5937ed2d7fb535d520a11a19fb2a54d592..5b5e0624ef404b73c637d8f9cf27ebb4f51e5476 100644 (file)
--- a/include/wx/xrc/xh_bmpcbox.h
+++ b/include/wx/xrc/xh_bmpcbox.h
@@ -13,22 +13,24 @@
 
 #include "wx/xrc/xmlres.h"
 
-#if wxUSE_BITMAPCOMBOBOX
+#if wxUSE_XRC && wxUSE_BITMAPCOMBOBOX
 
 class WXDLLIMPEXP_ADV wxBitmapComboBox;
 
 class WXDLLIMPEXP_XRC wxBitmapComboBoxXmlHandler : public wxXmlResourceHandler
 {
     DECLARE_DYNAMIC_CLASS(wxBitmapComboBoxXmlHandler)
+
 public:
     wxBitmapComboBoxXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
+
 private:
     wxBitmapComboBox*    m_combobox;
     bool                m_isInside;
 };
 
-#endif
+#endif // wxUSE_XRC && wxUSE_BITMAPCOMBOBOX
 
 #endif // _WX_XH_BMPCBOX_H_

diff --git a/include/wx/xrc/xh_bttn.h b/include/wx/xrc/xh_bttn.h
index 93eb21258a957601d389017a2c596a97351c0075..88018268b6703d88e723ea273ca75cfadcd8180b 100644 (file)
--- a/include/wx/xrc/xh_bttn.h
+++ b/include/wx/xrc/xh_bttn.h
@@ -13,14 +13,18 @@
 
 #include "wx/xrc/xmlres.h"
 
+#if wxUSE_XRC && wxUSE_BUTTON
+
 class WXDLLIMPEXP_XRC wxButtonXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxButtonXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxButtonXmlHandler)
+
 public:
     wxButtonXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 };
 
+#endif // wxUSE_XRC && wxUSE_BUTTON
 
 #endif // _WX_XH_BTTN_H_

diff --git a/include/wx/xrc/xh_cald.h b/include/wx/xrc/xh_cald.h
index d508d0bc422e42580efd6948363730e5b44f7ede..c8a1fea17535ffd9822d58a1da7e2410d1b46542 100644 (file)
--- a/include/wx/xrc/xh_cald.h
+++ b/include/wx/xrc/xh_cald.h
@@ -11,15 +11,14 @@
 #ifndef _WX_XH_CALD_H_
 #define _WX_XH_CALD_H_
 
-#include "wx/defs.h"
+#include "wx/xrc/xmlres.h"
 
 #if wxUSE_XRC && wxUSE_CALENDARCTRL
 
-#include "wx/xrc/xmlres.h"
-
 class WXDLLIMPEXP_XRC wxCalendarCtrlXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxCalendarCtrlXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxCalendarCtrlXmlHandler)
+
 public:
     wxCalendarCtrlXmlHandler();
     virtual wxObject *DoCreateResource();

diff --git a/include/wx/xrc/xh_chckb.h b/include/wx/xrc/xh_chckb.h
index 03b4e7f954df99a718f69a75b2e36e25603def7e..b58f5920b5d2a7a91922f3bffae5856424789468 100644 (file)
--- a/include/wx/xrc/xh_chckb.h
+++ b/include/wx/xrc/xh_chckb.h
@@ -11,15 +11,14 @@
 #ifndef _WX_XH_CHCKB_H_
 #define _WX_XH_CHCKB_H_
 
-#include "wx/defs.h"
+#include "wx/xrc/xmlres.h"
 
 #if wxUSE_XRC && wxUSE_CHECKBOX
 
-#include "wx/xrc/xmlres.h"
-
 class WXDLLIMPEXP_XRC wxCheckBoxXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxCheckBoxXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxCheckBoxXmlHandler)
+
 public:
     wxCheckBoxXmlHandler();
     virtual wxObject *DoCreateResource();

diff --git a/include/wx/xrc/xh_chckl.h b/include/wx/xrc/xh_chckl.h
index 20747587f38b4c47071596c42aa80402a79aa26b..a76f6a7587623637eac6a3a0529b09e3f2f78135 100644 (file)
--- a/include/wx/xrc/xh_chckl.h
+++ b/include/wx/xrc/xh_chckl.h
@@ -11,19 +11,19 @@
 #ifndef _WX_XH_CHCKL_H_
 #define _WX_XH_CHCKL_H_
 
-#include "wx/defs.h"
+#include "wx/xrc/xmlres.h"
 
 #if wxUSE_XRC && wxUSE_CHECKLISTBOX
 
-#include "wx/xrc/xmlres.h"
-
 class WXDLLIMPEXP_XRC wxCheckListBoxXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxCheckListBoxXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxCheckListBoxXmlHandler)
+
 public:
     wxCheckListBoxXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
+
 private:
     bool m_insideBox;
     wxArrayString strList;

diff --git a/include/wx/xrc/xh_choic.h b/include/wx/xrc/xh_choic.h
index 1fb1fddc1a968f9ad2a2c5bc5dc92c95ab52e85f..da44862fd6a407c99ca763c3c351e1dd38fa194b 100644 (file)
--- a/include/wx/xrc/xh_choic.h
+++ b/include/wx/xrc/xh_choic.h
@@ -11,19 +11,19 @@
 #ifndef _WX_XH_CHOIC_H_
 #define _WX_XH_CHOIC_H_
 
-#include "wx/defs.h"
+#include "wx/xrc/xmlres.h"
 
 #if wxUSE_XRC && wxUSE_CHOICE
 
-#include "wx/xrc/xmlres.h"
-
 class WXDLLIMPEXP_XRC wxChoiceXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxChoiceXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxChoiceXmlHandler)
+
 public:
     wxChoiceXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
+
 private:
     bool m_insideBox;
     wxArrayString strList;

diff --git a/include/wx/xrc/xh_choicbk.h b/include/wx/xrc/xh_choicbk.h
index fd6bfb03c527ae90f5f168749ebef33b0fbd64d5..bc9be5b9057a4728fab558bb961cf8918e5b4ff2 100644 (file)
--- a/include/wx/xrc/xh_choicbk.h
+++ b/include/wx/xrc/xh_choicbk.h
@@ -9,17 +9,16 @@
 #ifndef _WX_XH_CHOICEBK_H_
 #define _WX_XH_CHOICEBK_H_
 
-#include "wx/defs.h"
+#include "wx/xrc/xmlres.h"
 
 #if wxUSE_XRC && wxUSE_CHOICEBOOK
 
-#include "wx/xrc/xmlres.h"
-
 class WXDLLEXPORT wxChoicebook;
 
 class WXDLLIMPEXP_XRC wxChoicebookXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxChoicebookXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxChoicebookXmlHandler)
+
 public:
     wxChoicebookXmlHandler();
     virtual wxObject *DoCreateResource();

diff --git a/include/wx/xrc/xh_clrpicker.h b/include/wx/xrc/xh_clrpicker.h
index fb364c41a8b98439dd44de5cb52c3e9905db9829..dfaa356b400b22ffa164c160cf94ef802b2db813 100644 (file)
--- a/include/wx/xrc/xh_clrpicker.h
+++ b/include/wx/xrc/xh_clrpicker.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_clrpicker.cpp
+// Name:        wx/xrc/xh_clrpicker.h
 // Purpose:     XML resource handler for wxColourPickerCtrl
 // Author:      Francesco Montorsi
 // Created:     2006-04-17
@@ -13,17 +13,18 @@
 
 #include "wx/xrc/xmlres.h"
 
-#if wxUSE_COLOURPICKERCTRL
+#if wxUSE_XRC && wxUSE_COLOURPICKERCTRL
 
 class WXDLLIMPEXP_XRC wxColourPickerCtrlXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxColourPickerCtrlXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxColourPickerCtrlXmlHandler)
+
 public:
     wxColourPickerCtrlXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 };
 
-#endif // wxUSE_COLOURPICKERCTRL
+#endif // wxUSE_XRC && wxUSE_COLOURPICKERCTRL
 
 #endif // _WX_XH_CLRPICKERCTRL_H_

diff --git a/include/wx/xrc/xh_combo.h b/include/wx/xrc/xh_combo.h
index bd47f22d34293ef4414b4a05c8de9482359d1df1..7f190fffe89c20907e1552a0a49c399a0ef8a193 100644 (file)
--- a/include/wx/xrc/xh_combo.h
+++ b/include/wx/xrc/xh_combo.h
@@ -13,20 +13,22 @@
 
 #include "wx/xrc/xmlres.h"
 
-#if wxUSE_COMBOBOX
+#if wxUSE_XRC && wxUSE_COMBOBOX
 
 class WXDLLIMPEXP_XRC wxComboBoxXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxComboBoxXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxComboBoxXmlHandler)
+
 public:
     wxComboBoxXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
+
 private:
     bool m_insideBox;
     wxArrayString strList;
 };
 
-#endif
+#endif // wxUSE_XRC && wxUSE_COMBOBOX
 
 #endif // _WX_XH_COMBO_H_

diff --git a/include/wx/xrc/xh_datectrl.h b/include/wx/xrc/xh_datectrl.h
index 336f3ec93ec8bf1e35adf3d115f158a61e9e8c32..57d554477b763dc1b87c62b047818bbfd674dc7c 100644 (file)
--- a/include/wx/xrc/xh_datectrl.h
+++ b/include/wx/xrc/xh_datectrl.h
@@ -13,17 +13,18 @@
 
 #include "wx/xrc/xmlres.h"
 
-#if wxUSE_DATEPICKCTRL
+#if wxUSE_XRC && wxUSE_DATEPICKCTRL
 
 class WXDLLIMPEXP_XRC wxDateCtrlXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxDateCtrlXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxDateCtrlXmlHandler)
+
 public:
     wxDateCtrlXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 };
 
-#endif // wxUSE_DATEPICKCTRL
+#endif // wxUSE_XRC && wxUSE_DATEPICKCTRL
 
 #endif // _WX_XH_DATECTRL_H_

diff --git a/include/wx/xrc/xh_dirpicker.h b/include/wx/xrc/xh_dirpicker.h
index dd8a49bcf37255ef0cec19a41ae440f370bbb70c..fe97a269ebebd7fdffa258dadaa650a36980d9a3 100644 (file)
--- a/include/wx/xrc/xh_dirpicker.h
+++ b/include/wx/xrc/xh_dirpicker.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_clrpicker.cpp
-// Purpose:     XML resource handler for wxColourPickerCtrl
+// Name:        wx/xrc/xh_dirpicker.h
+// Purpose:     XML resource handler for wxDirPickerCtrl
 // Author:      Francesco Montorsi
 // Created:     2006-04-17
 // RCS-ID:      $Id$
@@ -13,17 +13,18 @@
 
 #include "wx/xrc/xmlres.h"
 
-#if wxUSE_DIRPICKERCTRL
+#if wxUSE_XRC && wxUSE_DIRPICKERCTRL
 
 class WXDLLIMPEXP_XRC wxDirPickerCtrlXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxDirPickerCtrlXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxDirPickerCtrlXmlHandler)
+
 public:
     wxDirPickerCtrlXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 };
 
-#endif // wxUSE_DIRPICKERCTRL
+#endif // wxUSE_XRC && wxUSE_DIRPICKERCTRL
 
 #endif // _WX_XH_DIRPICKERCTRL_H_

diff --git a/include/wx/xrc/xh_dlg.h b/include/wx/xrc/xh_dlg.h
index 014db51a8dd84fcc900ca0135c786f6719350fe8..42d6d4aeabb81e6fa98d5aeb66676103d6492ae5 100644 (file)
--- a/include/wx/xrc/xh_dlg.h
+++ b/include/wx/xrc/xh_dlg.h
@@ -13,14 +13,18 @@
 
 #include "wx/xrc/xmlres.h"
 
+#if wxUSE_XRC
+
 class WXDLLIMPEXP_XRC wxDialogXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxDialogXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxDialogXmlHandler)
+
 public:
     wxDialogXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 };
 
+#endif // wxUSE_XRC
 
 #endif // _WX_XH_DLG_H_

diff --git a/include/wx/xrc/xh_filepicker.h b/include/wx/xrc/xh_filepicker.h
index 47673b07347a078eed42e7f3ac63b2fef477f016..22c39270e0d99a72a91049fbe310c6f6cc4ff31d 100644 (file)
--- a/include/wx/xrc/xh_filepicker.h
+++ b/include/wx/xrc/xh_filepicker.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_clrpicker.cpp
-// Purpose:     XML resource handler for wxColourPickerCtrl
+// Name:        wx/xrc/xh_filepicker.h
+// Purpose:     XML resource handler for wxFilePickerCtrl
 // Author:      Francesco Montorsi
 // Created:     2006-04-17
 // RCS-ID:      $Id$
@@ -13,17 +13,18 @@
 
 #include "wx/xrc/xmlres.h"
 
-#if wxUSE_FILEPICKERCTRL
+#if wxUSE_XRC && wxUSE_FILEPICKERCTRL
 
 class WXDLLIMPEXP_XRC wxFilePickerCtrlXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxFilePickerCtrlXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxFilePickerCtrlXmlHandler)
+
 public:
     wxFilePickerCtrlXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 };
 
-#endif // wxUSE_FILEPICKERCTRL
+#endif // wxUSE_XRC && wxUSE_FILEPICKERCTRL
 
 #endif // _WX_XH_FILEPICKERCTRL_H_

diff --git a/include/wx/xrc/xh_fontpicker.h b/include/wx/xrc/xh_fontpicker.h
index 7ea0c9bb4b7d105d3a336b9f331c9c9f8b03d084..d0dc8e915f88b71832bc287903d8147d4160ef12 100644 (file)
--- a/include/wx/xrc/xh_fontpicker.h
+++ b/include/wx/xrc/xh_fontpicker.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_clrpicker.cpp
-// Purpose:     XML resource handler for wxColourPickerCtrl
+// Name:        wx/xrc/xh_fontpicker.h
+// Purpose:     XML resource handler for wxFontPickerCtrl
 // Author:      Francesco Montorsi
 // Created:     2006-04-17
 // RCS-ID:      $Id$
@@ -13,17 +13,18 @@
 
 #include "wx/xrc/xmlres.h"
 
-#if wxUSE_FONTPICKERCTRL
+#if wxUSE_XRC && wxUSE_FONTPICKERCTRL
 
 class WXDLLIMPEXP_XRC wxFontPickerCtrlXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxFontPickerCtrlXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxFontPickerCtrlXmlHandler)
+
 public:
     wxFontPickerCtrlXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 };
 
-#endif // wxUSE_FONTPICKERCTRL
+#endif // wxUSE_XRC && wxUSE_FONTPICKERCTRL
 
 #endif // _WX_XH_FONTPICKERCTRL_H_

diff --git a/include/wx/xrc/xh_frame.h b/include/wx/xrc/xh_frame.h
index bd04eb92f4ef291d019b6825746d746b09cf9c86..ab17fe4635f194d3adeed5e4ebab7ee5767cd0a0 100644 (file)
--- a/include/wx/xrc/xh_frame.h
+++ b/include/wx/xrc/xh_frame.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/xrc/xh_frame.h
-// Purpose:     XML resource handler for dialogs
+// Purpose:     XML resource handler for wxFrame
 // Author:      Vaclav Slavik & Aleks.
 // Created:     2000/03/05
 // RCS-ID:      $Id$
@@ -13,14 +13,18 @@
 
 #include "wx/xrc/xmlres.h"
 
+#if wxUSE_XRC
+
 class WXDLLIMPEXP_XRC wxFrameXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxFrameXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxFrameXmlHandler)
+
 public:
     wxFrameXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 };
 
+#endif // wxUSE_XRC
 
 #endif // _WX_XH_FRAME_H_

diff --git a/include/wx/xrc/xh_gauge.h b/include/wx/xrc/xh_gauge.h
index d3df783ac1a01c7002ad79f6772e9d78a72b1b50..9aa45d921a2e34365ebf41d22fa250d55f58027c 100644 (file)
--- a/include/wx/xrc/xh_gauge.h
+++ b/include/wx/xrc/xh_gauge.h
@@ -11,12 +11,9 @@
 #ifndef _WX_XH_GAUGE_H_
 #define _WX_XH_GAUGE_H_
 
-#include "wx/defs.h"
-
-#if wxUSE_GAUGE
-
 #include "wx/xrc/xmlres.h"
 
+#if wxUSE_XRC && wxUSE_GAUGE
 
 class WXDLLIMPEXP_XRC wxGaugeXmlHandler : public wxXmlResourceHandler
 {
@@ -32,6 +29,6 @@ public:
     virtual bool CanHandle(wxXmlNode *node);
 };
 
-#endif
+#endif // wxUSE_XRC && wxUSE_GAUGE
 
 #endif // _WX_XH_GAUGE_H_

diff --git a/include/wx/xrc/xh_gdctl.h b/include/wx/xrc/xh_gdctl.h
index 9fae7b3dca69442946ce1bc2ef2efe4bf6487f4c..a62e13858b8c78aab1050876a7fc7770480f6cea 100644 (file)
--- a/include/wx/xrc/xh_gdctl.h
+++ b/include/wx/xrc/xh_gdctl.h
@@ -13,17 +13,18 @@
 
 #include "wx/xrc/xmlres.h"
 
-#if wxUSE_DIRDLG
+#if wxUSE_XRC && wxUSE_DIRDLG
 
 class WXDLLIMPEXP_XRC wxGenericDirCtrlXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxGenericDirCtrlXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxGenericDirCtrlXmlHandler)
+
 public:
     wxGenericDirCtrlXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 };
 
-#endif
+#endif // wxUSE_XRC && wxUSE_DIRDLG
 
 #endif // _WX_XH_GDCTL_H_

diff --git a/include/wx/xrc/xh_grid.h b/include/wx/xrc/xh_grid.h
index ca4d4e14c791c09acb27342a88f93efdd21755a5..f4e07e14ddf9b9dceddf2ea21b1a3c38a43905cc 100644 (file)
--- a/include/wx/xrc/xh_grid.h
+++ b/include/wx/xrc/xh_grid.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/xrc/xh_grid.h
-// Purpose:     XML resource handler for the grid control
+// Purpose:     XML resource handler for wxGrid
 // Author:      Agron Selimaj
 // Created:     2005/08/11
 // RCS-ID:      $Id$
@@ -17,14 +17,13 @@
 
 class WXDLLIMPEXP_XRC wxGridXmlHandler : public wxXmlResourceHandler
 {
+    DECLARE_DYNAMIC_CLASS(wxGridXmlHandler)
+
 public:
     wxGridXmlHandler();
 
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxGridXmlHandler)
 };
 
 #endif // wxUSE_XRC && wxUSE_GRID

diff --git a/include/wx/xrc/xh_html.h b/include/wx/xrc/xh_html.h
index 5879d3c76c1dd871e49691386ed6de9134da7e21..1f94fcf8c3baaaf924c72daa9ae2fd798e0e8b06 100644 (file)
--- a/include/wx/xrc/xh_html.h
+++ b/include/wx/xrc/xh_html.h
@@ -13,19 +13,18 @@
 
 #include "wx/xrc/xmlres.h"
 
-#include "wx/defs.h"
-
-#if wxUSE_HTML
+#if wxUSE_XRC && wxUSE_HTML
 
 class WXDLLIMPEXP_XRC wxHtmlWindowXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxHtmlWindowXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxHtmlWindowXmlHandler)
+
 public:
     wxHtmlWindowXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 };
 
-#endif
+#endif // wxUSE_XRC && wxUSE_HTML
 
-#endif // _WX_XH_SLIDER_H_
+#endif // _WX_XH_HTML_H_

diff --git a/include/wx/xrc/xh_hyperlink.h b/include/wx/xrc/xh_hyperlink.h
index 407f5da223ca70cab6af8b81609dd2d64377be98..d4e6a49957dd93fe1360fefcc7325dff691c4528 100644 (file)
--- a/include/wx/xrc/xh_hyperlink.h
+++ b/include/wx/xrc/xh_hyperlink.h
@@ -12,15 +12,15 @@
 #ifndef _WX_XH_HYPERLINKH__
 #define _WX_XH_HYPERLINKH__
 
-#include "wx/defs.h"
-
-#if wxUSE_HYPERLINKCTRL
-
-#include "wx/hyperlink.h"
 #include "wx/xrc/xmlres.h"
 
+#if wxUSE_XRC && wxUSE_HYPERLINKCTRL
+
 class WXDLLIMPEXP_XRC wxHyperlinkCtrlXmlHandler : public wxXmlResourceHandler
 {
+    // Register with wxWindows' dynamic class subsystem.
+    DECLARE_DYNAMIC_CLASS(wxHyperlinkCtrlXmlHandler)
+
 public:
     // Constructor.
     wxHyperlinkCtrlXmlHandler();
@@ -30,10 +30,8 @@ public:
 
     // Returns true if we know how to create a control for the given node.
     virtual bool CanHandle(wxXmlNode *node);
-
-    // Register with wxWindows' dynamic class subsystem.
-    DECLARE_DYNAMIC_CLASS(wxHyperlinkCtrlXmlHandler)
 };
 
-#endif // wxUSE_HYPERLINKCTRL
+#endif // wxUSE_XRC && wxUSE_HYPERLINKCTRL
+
 #endif // _WX_XH_HYPERLINKH__

diff --git a/include/wx/xrc/xh_listb.h b/include/wx/xrc/xh_listb.h
index 3b366967ddce773e268cd7fafbf3e3e9d13fa51c..43cfcb54ce14ca28b9a6a5fd6e1a8ae1e4632eaa 100644 (file)
--- a/include/wx/xrc/xh_listb.h
+++ b/include/wx/xrc/xh_listb.h
@@ -13,20 +13,22 @@
 
 #include "wx/xrc/xmlres.h"
 
-#if wxUSE_LISTBOX
+#if wxUSE_XRC && wxUSE_LISTBOX
 
 class WXDLLIMPEXP_XRC wxListBoxXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxListBoxXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxListBoxXmlHandler)
+
 public:
     wxListBoxXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
+
 private:
     bool m_insideBox;
     wxArrayString strList;
 };
 
-#endif
+#endif // wxUSE_XRC && wxUSE_LISTBOX
 
 #endif // _WX_XH_LISTB_H_

diff --git a/include/wx/xrc/xh_listbk.h b/include/wx/xrc/xh_listbk.h
index c9207ed45817b269a9a0f96837701e4302a44b0c..7a4675c0284a7f252ca75e99610c8cb7e3b87db2 100644 (file)
--- a/include/wx/xrc/xh_listbk.h
+++ b/include/wx/xrc/xh_listbk.h
@@ -11,13 +11,14 @@
 
 #include "wx/xrc/xmlres.h"
 
-#if wxUSE_LISTBOOK
+#if wxUSE_XRC && wxUSE_LISTBOOK
 
 class WXDLLEXPORT wxListbook;
 
 class WXDLLIMPEXP_XRC wxListbookXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxListbookXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxListbookXmlHandler)
+
 public:
     wxListbookXmlHandler();
     virtual wxObject *DoCreateResource();
@@ -28,6 +29,6 @@ private:
     wxListbook *m_listbook;
 };
 
-#endif
+#endif // wxUSE_XRC && wxUSE_LISTBOOK
 
 #endif // _WX_XH_LISTBK_H_

diff --git a/include/wx/xrc/xh_listc.h b/include/wx/xrc/xh_listc.h
index a4028ec72396c71f849b583fbeb93e2d7dc5a2dd..25847467f1c1d75dab6fc299864f342eb7dbf747 100644 (file)
--- a/include/wx/xrc/xh_listc.h
+++ b/include/wx/xrc/xh_listc.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/xrc/xh_listc.h
-// Purpose:     XML resource handler for wxCalendarCtrl
+// Purpose:     XML resource handler for wxListCtrl
 // Author:      Brian Gavin
 // Created:     2000/09/09
 // RCS-ID:      $Id$
@@ -13,14 +13,18 @@
 
 #include "wx/xrc/xmlres.h"
 
+#if wxUSE_XRC && wxUSE_LISTCTRL
+
 class WXDLLIMPEXP_XRC wxListCtrlXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxListCtrlXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxListCtrlXmlHandler)
+
 public:
     wxListCtrlXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 };
 
+#endif // wxUSE_XRC && wxUSE_LISTCTRL
 
 #endif // _WX_XH_LISTC_H_

diff --git a/include/wx/xrc/xh_mdi.h b/include/wx/xrc/xh_mdi.h
index 3ee7fbe973f6dcce70c98e6985ae97626801e028..06eeffc34082389d504d13c2d4d7b3da8669ea7c 100644 (file)
--- a/include/wx/xrc/xh_mdi.h
+++ b/include/wx/xrc/xh_mdi.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/xrc/xh_mdi.h
-// Purpose:     XML resource handler for dialogs
+// Purpose:     XML resource handler for wxMDI
 // Author:      David M. Falkinder & Vaclav Slavik
 // Created:     14/02/2005
 // RCS-ID:      $Id$
@@ -13,12 +13,14 @@
 
 #include "wx/xrc/xmlres.h"
 
-#if wxUSE_MDI
+#if wxUSE_XRC && wxUSE_MDI
 
 class WXDLLIMPEXP_CORE wxWindow;
 
 class WXDLLIMPEXP_XRC wxMdiXmlHandler : public wxXmlResourceHandler
 {
+    DECLARE_DYNAMIC_CLASS(wxMdiXmlHandler)
+
 public:
     wxMdiXmlHandler();
     virtual wxObject *DoCreateResource();
@@ -26,10 +28,8 @@ public:
 
 private:
     wxWindow *CreateFrame();
-
-    DECLARE_DYNAMIC_CLASS(wxMdiXmlHandler)
 };
 
-#endif // wxUSE_MDI
+#endif // wxUSE_XRC && wxUSE_MDI
 
 #endif // _WX_XH_MDI_H_

diff --git a/include/wx/xrc/xh_menu.h b/include/wx/xrc/xh_menu.h
index 6766a2c29a2fcf96796f362154f9b03af7b5f35d..ee7c1ab7d8af68d1ed7388088de06d4b3a3fc386 100644 (file)
--- a/include/wx/xrc/xh_menu.h
+++ b/include/wx/xrc/xh_menu.h
@@ -13,9 +13,12 @@
 
 #include "wx/xrc/xmlres.h"
 
+#if wxUSE_XRC && wxUSE_MENUS
+
 class WXDLLIMPEXP_XRC wxMenuXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxMenuXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxMenuXmlHandler)
+
 public:
     wxMenuXmlHandler();
     virtual wxObject *DoCreateResource();
@@ -28,11 +31,13 @@ private:
 class WXDLLIMPEXP_XRC wxMenuBarXmlHandler : public wxXmlResourceHandler
 {
     DECLARE_DYNAMIC_CLASS(wxMenuBarXmlHandler)
-    public:
-        wxMenuBarXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+
+public:
+    wxMenuBarXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
 };
 
+#endif // wxUSE_XRC && wxUSE_MENUS
 
 #endif // _WX_XH_MENU_H_

diff --git a/include/wx/xrc/xh_notbk.h b/include/wx/xrc/xh_notbk.h
index 2f547b07f4606617eeab46b9020cdb5014447969..1cbb9e5dd0c47f97bbf7903fbff5b5e04af0970a 100644 (file)
--- a/include/wx/xrc/xh_notbk.h
+++ b/include/wx/xrc/xh_notbk.h
@@ -12,13 +12,14 @@
 
 #include "wx/xrc/xmlres.h"
 
-#if wxUSE_NOTEBOOK
+#if wxUSE_XRC && wxUSE_NOTEBOOK
 
 class WXDLLEXPORT wxNotebook;
 
 class WXDLLIMPEXP_XRC wxNotebookXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxNotebookXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxNotebookXmlHandler)
+
 public:
     wxNotebookXmlHandler();
     virtual wxObject *DoCreateResource();
@@ -29,6 +30,6 @@ private:
     wxNotebook *m_notebook;
 };
 
-#endif
+#endif // wxUSE_XRC && wxUSE_NOTEBOOK
 
 #endif // _WX_XH_NOTBK_H_

diff --git a/include/wx/xrc/xh_odcombo.h b/include/wx/xrc/xh_odcombo.h
index 7febc5590c7aa710a36136c3ed6a9f2f5974cdde..9d7b4fa377d9a83243d0a0d756cee2ed716370bc 100644 (file)
--- a/include/wx/xrc/xh_odcombo.h
+++ b/include/wx/xrc/xh_odcombo.h
@@ -13,20 +13,23 @@
 
 #include "wx/xrc/xmlres.h"
 
-#if wxUSE_ODCOMBOBOX
+#if wxUSE_XRC && wxUSE_ODCOMBOBOX
 
 class WXDLLIMPEXP_XRC wxOwnerDrawnComboBoxXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxOwnerDrawnComboBoxXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxOwnerDrawnComboBoxXmlHandler)
+
 public:
     wxOwnerDrawnComboBoxXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
+
 private:
     bool m_insideBox;
     wxArrayString strList;
 };
 
-#endif
+#endif // wxUSE_XRC && wxUSE_ODCOMBOBOX
 
 #endif // _WX_XH_ODCOMBO_H_
+

diff --git a/include/wx/xrc/xh_panel.h b/include/wx/xrc/xh_panel.h
index da7f213206c6862648e2a61ebf51c44fb832b701..9c1bfc0378b221a4debf5253014db760b748c805 100644 (file)
--- a/include/wx/xrc/xh_panel.h
+++ b/include/wx/xrc/xh_panel.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/xrc/xh_panel.h
-// Purpose:     XML resource handler for panels
+// Purpose:     XML resource handler for wxPanel
 // Author:      Vaclav Slavik
 // Created:     2000/03/05
 // RCS-ID:      $Id$
@@ -13,14 +13,18 @@
 
 #include "wx/xrc/xmlres.h"
 
+#if wxUSE_XRC
+
 class WXDLLIMPEXP_XRC wxPanelXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxPanelXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxPanelXmlHandler)
+
 public:
     wxPanelXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 };
 
+#endif // wxUSE_XRC
 
 #endif // _WX_XH_PANEL_H_

diff --git a/include/wx/xrc/xh_radbt.h b/include/wx/xrc/xh_radbt.h
index 59a9c9239e4393c4f7d02d502e8f8f45e78c9b64..889a4bde145b953fb9dd3ac29cdc50e198d6c153 100644 (file)
--- a/include/wx/xrc/xh_radbt.h
+++ b/include/wx/xrc/xh_radbt.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/xrc/xh_radbt.h
-// Purpose:     XML resource handler for radio buttons
+// Purpose:     XML resource handler for wxRadioButton
 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
@@ -12,19 +12,19 @@
 #define _WX_XH_RADBT_H_
 
 #include "wx/xrc/xmlres.h"
-#include "wx/defs.h"
 
-#if wxUSE_RADIOBOX
+#if wxUSE_XRC && wxUSE_RADIOBTN
 
 class WXDLLIMPEXP_XRC wxRadioButtonXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxRadioButtonXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxRadioButtonXmlHandler)
+
 public:
     wxRadioButtonXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 };
 
-#endif
+#endif // wxUSE_XRC && wxUSE_RADIOBOX
 
-#endif // _WX_XH_RADIOBUTTON_H_
+#endif // _WX_XH_RADBT_H_

diff --git a/include/wx/xrc/xh_radbx.h b/include/wx/xrc/xh_radbx.h
index 508883350d1e515897dfaf3c6185a3926bd58d93..94ee62498df6568a76dd0ef7e96fdbe8ae52456e 100644 (file)
--- a/include/wx/xrc/xh_radbx.h
+++ b/include/wx/xrc/xh_radbx.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/xrc/xh_radbx.h
-// Purpose:     XML resource handler for radio box
+// Purpose:     XML resource handler for wxRadioBox
 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
@@ -13,15 +13,17 @@
 
 #include "wx/xrc/xmlres.h"
 
-#if wxUSE_RADIOBOX
+#if wxUSE_XRC && wxUSE_RADIOBOX
 
 class WXDLLIMPEXP_XRC wxRadioBoxXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxRadioBoxXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxRadioBoxXmlHandler)
+
 public:
     wxRadioBoxXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
+
 private:
     bool m_insideBox;
 
@@ -36,6 +38,6 @@ private:
     wxArrayInt    helptextSpecified;
 };
 
-#endif // wxUSE_RADIOBOX
+#endif // wxUSE_XRC && wxUSE_RADIOBOX
 
 #endif // _WX_XH_RADBX_H_

diff --git a/include/wx/xrc/xh_scrol.h b/include/wx/xrc/xh_scrol.h
index bc3f8a1c8f8c61308a14bccb1a68e7a8ea318bd9..3f2899045e6cb9b5a385243f97589fcf0fefd160 100644 (file)
--- a/include/wx/xrc/xh_scrol.h
+++ b/include/wx/xrc/xh_scrol.h
@@ -12,9 +12,8 @@
 #define _WX_XH_SCROL_H_
 
 #include "wx/xrc/xmlres.h"
-#include "wx/defs.h"
-
 
+#if wxUSE_XRC && wxUSE_SCROLLBAR
 
 class WXDLLIMPEXP_XRC wxScrollBarXmlHandler : public wxXmlResourceHandler
 {
@@ -32,5 +31,6 @@ public:
     virtual bool CanHandle(wxXmlNode *node);
 };
 
+#endif // wxUSE_XRC && wxUSE_SCROLLBAR
 
 #endif // _WX_XH_SCROL_H_

diff --git a/include/wx/xrc/xh_scwin.h b/include/wx/xrc/xh_scwin.h
index c30c082166196cd86670b386453eacc061ecd80c..64723dc446a1fbcada503e864f331faa96caa1fc 100644 (file)
--- a/include/wx/xrc/xh_scwin.h
+++ b/include/wx/xrc/xh_scwin.h
@@ -12,18 +12,19 @@
 #define _WX_XH_SCWIN_H_
 
 #include "wx/xrc/xmlres.h"
-#include "wx/defs.h"
-
 
+#if wxUSE_XRC
 
 class WXDLLIMPEXP_XRC wxScrolledWindowXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxScrolledWindowXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxScrolledWindowXmlHandler)
+
 public:
     wxScrolledWindowXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 };
 
+#endif // wxUSE_XRC
 
 #endif // _WX_XH_SCWIN_H_

diff --git a/include/wx/xrc/xh_sizer.h b/include/wx/xrc/xh_sizer.h
index c960d36383cd22eca45a697931b661a84e0bada3..04fb8e6f857be034ed95c17cfd559d1e03a0a6a1 100644 (file)
--- a/include/wx/xrc/xh_sizer.h
+++ b/include/wx/xrc/xh_sizer.h
@@ -12,15 +12,18 @@
 #define _WX_XH_SIZER_H_
 
 #include "wx/xrc/xmlres.h"
+
+#if wxUSE_XRC
+
 #include "wx/sizer.h"
 #include "wx/gbsizer.h"
 
-
 class WXDLLEXPORT wxSizer;
 
 class WXDLLIMPEXP_XRC wxSizerXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxSizerXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxSizerXmlHandler)
+
 public:
     wxSizerXmlHandler();
     virtual wxObject *DoCreateResource();
@@ -51,10 +54,13 @@ private:
     void AddSizerItem(wxSizerItem* sitem);
 };
 
+#if wxUSE_BUTTON
 
 class WXDLLIMPEXP_XRC wxStdDialogButtonSizerXmlHandler
     : public wxXmlResourceHandler
 {
+    DECLARE_DYNAMIC_CLASS(wxStdDialogButtonSizerXmlHandler)
+
 public:
     wxStdDialogButtonSizerXmlHandler();
     virtual wxObject *DoCreateResource();
@@ -63,9 +69,10 @@ public:
 private:
     bool m_isInside;
     wxStdDialogButtonSizer *m_parentSizer;
-
-    DECLARE_DYNAMIC_CLASS(wxStdDialogButtonSizerXmlHandler)
 };
 
+#endif // wxUSE_BUTTON
+
+#endif // wxUSE_XRC
 
 #endif // _WX_XH_SIZER_H_

diff --git a/include/wx/xrc/xh_slidr.h b/include/wx/xrc/xh_slidr.h
index fef7cb8066aaf6bf1f53c501ab1cb8716de3e9ae..345c03b6a5b23ce3f4710f721e3778eed4c6cca8 100644 (file)
--- a/include/wx/xrc/xh_slidr.h
+++ b/include/wx/xrc/xh_slidr.h
@@ -12,9 +12,8 @@
 #define _WX_XH_SLIDR_H_
 
 #include "wx/xrc/xmlres.h"
-#include "wx/defs.h"
 
-#if wxUSE_SLIDER
+#if wxUSE_XRC && wxUSE_SLIDER
 
 class WXDLLIMPEXP_XRC wxSliderXmlHandler : public wxXmlResourceHandler
 {
@@ -32,6 +31,6 @@ public:
     virtual bool CanHandle(wxXmlNode *node);
 };
 
-#endif
+#endif // wxUSE_XRC && wxUSE_SLIDER
 
-#endif // _WX_XH_SLIDER_H_
+#endif // _WX_XH_SLIDR_H_

diff --git a/include/wx/xrc/xh_spin.h b/include/wx/xrc/xh_spin.h
index f48065f039521174c24f1f187e54f2755fa55165..c2b23b1b502d007646ae792e60ebfa43d0ddb517 100644 (file)
--- a/include/wx/xrc/xh_spin.h
+++ b/include/wx/xrc/xh_spin.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/xrc/xh_spin.h
-// Purpose:     XML resource handler for wxSpinButton
+// Purpose:     XML resource handler for wxSpinButton and wxSpinCtrl
 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
@@ -12,9 +12,11 @@
 #define _WX_XH_SPIN_H_
 
 #include "wx/xrc/xmlres.h"
-#include "wx/defs.h"
+
+#if wxUSE_XRC 
 
 #if wxUSE_SPINBTN
+
 class WXDLLIMPEXP_XRC wxSpinButtonXmlHandler : public wxXmlResourceHandler
 {
     DECLARE_DYNAMIC_CLASS(wxSpinButtonXmlHandler)
@@ -30,9 +32,12 @@ public:
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 };
-#endif
+
+#endif // wxUSE_SPINBTN
+
 
 #if wxUSE_SPINCTRL
+
 class WXDLLIMPEXP_XRC wxSpinCtrlXmlHandler : public wxXmlResourceHandler
 {
     DECLARE_DYNAMIC_CLASS(wxSpinCtrlXmlHandler)
@@ -48,6 +53,9 @@ public:
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 };
-#endif
+
+#endif // wxUSE_SPINCTRL
+
+#endif // wxUSE_XRC
 
 #endif // _WX_XH_SPIN_H_

diff --git a/include/wx/xrc/xh_split.h b/include/wx/xrc/xh_split.h
index 8068151380ccae6e164671bf9af65622a41fbd33..0ad4a2778828f88deac20cd77434824739ca1acb 100644 (file)
--- a/include/wx/xrc/xh_split.h
+++ b/include/wx/xrc/xh_split.h
@@ -13,13 +13,18 @@
 
 #include "wx/xrc/xmlres.h"
 
+#if wxUSE_XRC && wxUSE_SPLITTER
+
 class WXDLLIMPEXP_XRC wxSplitterWindowXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxSplitterWindowXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxSplitterWindowXmlHandler)
+
 public:
     wxSplitterWindowXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 };
 
+#endif // wxUSE_XRC && wxUSE_SPLITTER
+
 #endif // _WX_XH_SPLIT_H_

diff --git a/include/wx/xrc/xh_statbar.h b/include/wx/xrc/xh_statbar.h
index 9bd2c7d27842e70eb283b192e283d8f3f7f1445c..1a2787b125cdfa9e380a3c3be833ee33a19e655a 100644 (file)
--- a/include/wx/xrc/xh_statbar.h
+++ b/include/wx/xrc/xh_statbar.h
@@ -13,13 +13,18 @@
 
 #include "wx/xrc/xmlres.h"
 
+#if wxUSE_XRC && wxUSE_STATUSBAR
+
 class WXDLLIMPEXP_XRC wxStatusBarXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxStatusBarXmlHandler)
-    public:
-        wxStatusBarXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+    DECLARE_DYNAMIC_CLASS(wxStatusBarXmlHandler)
+
+public:
+    wxStatusBarXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
 };
 
+#endif // wxUSE_XRC && wxUSE_STATUSBAR
+
 #endif // _WX_XH_STATBAR_H_

diff --git a/include/wx/xrc/xh_stbmp.h b/include/wx/xrc/xh_stbmp.h
index a7184540eb666376c7048925a58d13bbb3ee3361..5b222c1d34077a2b390ba384240e7572eb4432bc 100644 (file)
--- a/include/wx/xrc/xh_stbmp.h
+++ b/include/wx/xrc/xh_stbmp.h
@@ -13,15 +13,18 @@
 
 #include "wx/xrc/xmlres.h"
 
+#if wxUSE_XRC && wxUSE_STATBMP
 
 class WXDLLIMPEXP_XRC wxStaticBitmapXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxStaticBitmapXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxStaticBitmapXmlHandler)
+
 public:
     wxStaticBitmapXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 };
 
+#endif // wxUSE_XRC && wxUSE_STATBMP
 
 #endif // _WX_XH_STBMP_H_

diff --git a/include/wx/xrc/xh_stbox.h b/include/wx/xrc/xh_stbox.h
index 229f67a56889380d15f83bd24c715009001ddb89..fb7b4845219849becd1d3cce7a148397f22365ee 100644 (file)
--- a/include/wx/xrc/xh_stbox.h
+++ b/include/wx/xrc/xh_stbox.h
@@ -13,15 +13,18 @@
 
 #include "wx/xrc/xmlres.h"
 
+#if wxUSE_XRC && wxUSE_STATBOX
 
 class WXDLLIMPEXP_XRC wxStaticBoxXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxStaticBoxXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxStaticBoxXmlHandler)
+
 public:
     wxStaticBoxXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 };
 
+#endif // wxUSE_XRC && wxUSE_STATBOX
 
 #endif // _WX_XH_STBOX_H_

diff --git a/include/wx/xrc/xh_stlin.h b/include/wx/xrc/xh_stlin.h
index f6b38196fffb8a4986b1d1d2805b6fb311e6ba7b..d995001dfefc70d3b2595916664fbfacb2c7ecb6 100644 (file)
--- a/include/wx/xrc/xh_stlin.h
+++ b/include/wx/xrc/xh_stlin.h
@@ -13,17 +13,18 @@
 
 #include "wx/xrc/xmlres.h"
 
-#if wxUSE_STATLINE
+#if wxUSE_XRC && wxUSE_STATLINE
 
 class WXDLLIMPEXP_XRC wxStaticLineXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxStaticLineXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxStaticLineXmlHandler)
+
 public:
     wxStaticLineXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 };
 
-#endif
+#endif // wxUSE_XRC && wxUSE_STATLINE
 
 #endif // _WX_XH_STLIN_H_

diff --git a/include/wx/xrc/xh_sttxt.h b/include/wx/xrc/xh_sttxt.h
index 672706df220e104fb3a1952a90440885857a4472..87d0d49a417319a9484593c5f934ca44d38c0f3a 100644 (file)
--- a/include/wx/xrc/xh_sttxt.h
+++ b/include/wx/xrc/xh_sttxt.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/xrc/xh_sttxt.h
-// Purpose:     XML resource handler for wxStaticBitmap
+// Purpose:     XML resource handler for wxStaticText
 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
@@ -13,15 +13,18 @@
 
 #include "wx/xrc/xmlres.h"
 
+#if wxUSE_XRC && wxUSE_STATTEXT
 
 class WXDLLIMPEXP_XRC wxStaticTextXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxStaticTextXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxStaticTextXmlHandler)
+
 public:
     wxStaticTextXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 };
 
+#endif // wxUSE_XRC && wxUSE_STATTEXT
 
-#endif // _WX_XH_STBMP_H_
+#endif // _WX_XH_STTXT_H_

diff --git a/include/wx/xrc/xh_text.h b/include/wx/xrc/xh_text.h
index f755b2ea5f1806e2346de58b8daec842a58404c2..63c3769c6603c94da4271d9a3ff7ae3cb709c111 100644 (file)
--- a/include/wx/xrc/xh_text.h
+++ b/include/wx/xrc/xh_text.h
@@ -13,15 +13,18 @@
 
 #include "wx/xrc/xmlres.h"
 
+#if wxUSE_XRC && wxUSE_TEXTCTRL
 
 class WXDLLIMPEXP_XRC wxTextCtrlXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxTextCtrlXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxTextCtrlXmlHandler)
+
 public:
     wxTextCtrlXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 };
 
+#endif // wxUSE_XRC && wxUSE_TEXTCTRL
 
 #endif // _WX_XH_TEXT_H_

diff --git a/include/wx/xrc/xh_tglbtn.h b/include/wx/xrc/xh_tglbtn.h
index af4e2668dcd30fd687eb57b92bd7f14cb87c111b..a37287e69b1bdc70e6b7ba1c28634fd440b69130 100644 (file)
--- a/include/wx/xrc/xh_tglbtn.h
+++ b/include/wx/xrc/xh_tglbtn.h
@@ -12,20 +12,19 @@
 #define _WX_XH_TGLBTN_H_
 
 #include "wx/xrc/xmlres.h"
-#include "wx/defs.h"
 
-#if wxUSE_TOGGLEBTN
+#if wxUSE_XRC && wxUSE_TOGGLEBTN
 
 class WXDLLIMPEXP_XRC wxToggleButtonXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxToggleButtonXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxToggleButtonXmlHandler)
+
 public:
     wxToggleButtonXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 };
 
-#endif
-
+#endif // wxUSE_XRC && wxUSE_TOGGLEBTN
 
 #endif // _WX_XH_TGLBTN_H_

diff --git a/include/wx/xrc/xh_toolb.h b/include/wx/xrc/xh_toolb.h
index 4afaef27a8628d61517690ea52c8476484236031..c836af30cb60e9b3ecf8162ed78c694cf8592d31 100644 (file)
--- a/include/wx/xrc/xh_toolb.h
+++ b/include/wx/xrc/xh_toolb.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/xrc/xh_toolb.h
-// Purpose:     XML resource handler for wxBoxSizer
+// Purpose:     XML resource handler for wxToolBar
 // Author:      Vaclav Slavik
 // Created:     2000/08/11
 // RCS-ID:      $Id$
@@ -13,13 +13,14 @@
 
 #include "wx/xrc/xmlres.h"
 
-#if wxUSE_TOOLBAR
+#if wxUSE_XRC && wxUSE_TOOLBAR
 
 class WXDLLEXPORT wxToolBar;
 
 class WXDLLIMPEXP_XRC wxToolBarXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxToolBarXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxToolBarXmlHandler)
+
 public:
     wxToolBarXmlHandler();
     virtual wxObject *DoCreateResource();
@@ -30,6 +31,6 @@ private:
     wxToolBar *m_toolbar;
 };
 
-#endif
+#endif // wxUSE_XRC && wxUSE_TOOLBAR
 
-#endif // _WX_XH_TOOLBAR_H_
+#endif // _WX_XH_TOOLB_H_

diff --git a/include/wx/xrc/xh_tree.h b/include/wx/xrc/xh_tree.h
index 03c98df832964ae945d5dda94a421b5594763aea..6fa595fa68c7f987ec46c6f553f872738af0c749 100644 (file)
--- a/include/wx/xrc/xh_tree.h
+++ b/include/wx/xrc/xh_tree.h
@@ -13,14 +13,18 @@
 
 #include "wx/xrc/xmlres.h"
 
+#if wxUSE_XRC && wxUSE_TREECTRL
+
 class WXDLLIMPEXP_XRC wxTreeCtrlXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxTreeCtrlXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxTreeCtrlXmlHandler)
+
 public:
     wxTreeCtrlXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 };
 
+#endif // wxUSE_XRC && wxUSE_TREECTRL
 
 #endif // _WX_XH_TREE_H_

diff --git a/include/wx/xrc/xh_treebk.h b/include/wx/xrc/xh_treebk.h
index 9082c5eb4956bf9336d973ac4496786eb583bb88..903dad1e375b194e74619179134f49b29636c14b 100644 (file)
--- a/include/wx/xrc/xh_treebk.h
+++ b/include/wx/xrc/xh_treebk.h
@@ -12,9 +12,9 @@
 
 #include "wx/xrc/xmlres.h"
 
-#if wxUSE_TREEBOOK
+#if wxUSE_XRC && wxUSE_TREEBOOK
 
-#include "wx/treebook.h"
+class  WXDLLEXPORT wxTreebook;
 #include "wx/dynarray.h"
 
 WX_DEFINE_USER_EXPORTED_ARRAY_SIZE_T(size_t, wxArrayTbkPageIndexes,
@@ -30,6 +30,8 @@ WX_DEFINE_USER_EXPORTED_ARRAY_SIZE_T(size_t, wxArrayTbkPageIndexes,
 // it cannot be greater than the previous page depth plus one
 class WXDLLIMPEXP_XRC wxTreebookXmlHandler : public wxXmlResourceHandler
 {
+    DECLARE_DYNAMIC_CLASS(wxTreebookXmlHandler)
+
 public:
     wxTreebookXmlHandler();
     virtual wxObject *DoCreateResource();
@@ -39,8 +41,6 @@ private:
     wxTreebook *m_tbk;
     wxArrayTbkPageIndexes m_treeContext;
     bool m_isInside;
-
-    DECLARE_DYNAMIC_CLASS(wxTreebookXmlHandler)
 };
 
 
@@ -78,6 +78,6 @@ private:
 //  ...
 //</resource>
 
-#endif // wxUSE_TREEBOOK
+#endif // wxUSE_XRC && wxUSE_TREEBOOK
 
 #endif // _WX_XH_TREEBK_H_

diff --git a/include/wx/xrc/xh_unkwn.h b/include/wx/xrc/xh_unkwn.h
index 7573119386bc7bc6d7a3db7ebeaccea89cd7f347..c0e4ea3504fb03d3b5d29d64c81d8e55c95dd1ca 100644 (file)
--- a/include/wx/xrc/xh_unkwn.h
+++ b/include/wx/xrc/xh_unkwn.h
@@ -13,15 +13,18 @@
 
 #include "wx/xrc/xmlres.h"
 
+#if wxUSE_XRC
 
 class WXDLLIMPEXP_XRC wxUnknownWidgetXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxUnknownWidgetXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxUnknownWidgetXmlHandler)
+
 public:
     wxUnknownWidgetXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 };
 
+#endif // wxUSE_XRC
 
 #endif // _WX_XH_UNKWN_H_

diff --git a/include/wx/xrc/xh_wizrd.h b/include/wx/xrc/xh_wizrd.h
index b16053f2e6f81043301ac5bee8043f27c9a47423..5342ee665bc8bffd8e47fa316331d93adb875de5 100644 (file)
--- a/include/wx/xrc/xh_wizrd.h
+++ b/include/wx/xrc/xh_wizrd.h
@@ -9,17 +9,19 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_XH_WIZRD_H_
-#define _WX_XH_WIZRDL_H_
+#define _WX_XH_WIZRD_H_
 
 #include "wx/xrc/xmlres.h"
 
-#if wxUSE_WIZARDDLG
+#if wxUSE_XRC && wxUSE_WIZARDDLG
 
-#include "wx/wizard.h"
+class WXDLLEXPORT wxWizard;
+class WXDLLEXPORT wxWizardPageSimple;
 
 class WXDLLIMPEXP_XRC wxWizardXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxWizardXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxWizardXmlHandler)
+
 public:
     wxWizardXmlHandler();
     virtual wxObject *DoCreateResource();
@@ -30,6 +32,6 @@ private:
     wxWizardPageSimple *m_lastSimplePage;
 };
 
-#endif
+#endif // wxUSE_XRC && wxUSE_WIZARDDLG
 
-#endif // _WX_XH_PANEL_H_
+#endif // _WX_XH_WIZRD_H_

diff --git a/src/xrc/xh_bttn.cpp b/src/xrc/xh_bttn.cpp
index 397c6dbe472903c446312d4b3fed148e12e16896..d103e1ada3aab2872b7c645433359bb950a14935 100644 (file)
--- a/src/xrc/xh_bttn.cpp
+++ b/src/xrc/xh_bttn.cpp
@@ -15,7 +15,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC
+#if wxUSE_XRC && wxUSE_BUTTON
 
 #include "wx/xrc/xh_bttn.h"
 
@@ -60,4 +60,4 @@ bool wxButtonXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxButton"));
 }
 
-#endif // wxUSE_XRC
+#endif // wxUSE_XRC && wxUSE_BUTTON

diff --git a/src/xrc/xh_chckl.cpp b/src/xrc/xh_chckl.cpp
index 04fb3b78da154e87db5f5002d51cf743af28edec..f4e354ec5e3868aaa4723a69832c03a452d08db3 100644 (file)
--- a/src/xrc/xh_chckl.cpp
+++ b/src/xrc/xh_chckl.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/xrc/xh_chckl.cpp
-// Purpose:     XRC resource for wxCheckList
+// Purpose:     XRC resource for wxCheckListBox
 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$

diff --git a/src/xrc/xh_hyperlink.cpp b/src/xrc/xh_hyperlink.cpp
index a5a0cd3eb8ba8b361a2108bf9d50bb365fd0a98f..b19f47e8bebc1809c27df92881a054d11a0291b5 100644 (file)
--- a/src/xrc/xh_hyperlink.cpp
+++ b/src/xrc/xh_hyperlink.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        src/xrc/hyperlink.cpp
+// Name:        src/xrc/xh_hyperlink.cpp
 // Purpose:     Hyperlink control
 // Author:      David Norris <danorris@gmail.com>
 // Modified by: Ryan Norton, Francesco Montorsi

diff --git a/src/xrc/xh_mdi.cpp b/src/xrc/xh_mdi.cpp
index be0882245f8273b22d8f3de42ebe1bbe8eae2c75..d98e5409f7202946e8ab9a85871d543180e8e1db 100644 (file)
--- a/src/xrc/xh_mdi.cpp
+++ b/src/xrc/xh_mdi.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/xrc/xh_mdi.cpp
-// Purpose:     XRC resource for dialogs
+// Purpose:     XRC resource for wxMDI
 // Author:      David M. Falkinder & Vaclav Slavik
 // Created:     14/02/2005
 // RCS-ID:      $Id$

diff --git a/src/xrc/xh_menu.cpp b/src/xrc/xh_menu.cpp
index ee8530d61525cc5572fcd97c63d07569d70e1c08..217b155c024c82097429ab871de3c5c17d1f0614 100644 (file)
--- a/src/xrc/xh_menu.cpp
+++ b/src/xrc/xh_menu.cpp
@@ -15,7 +15,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC
+#if wxUSE_XRC && wxUSE_MENUS
 
 #include "wx/xrc/xh_menu.h"
 
@@ -149,4 +149,4 @@ bool wxMenuBarXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxMenuBar"));
 }
 
-#endif // wxUSE_XRC
+#endif // wxUSE_XRC && wxUSE_MENUS

diff --git a/src/xrc/xh_sizer.cpp b/src/xrc/xh_sizer.cpp
index d3cccfcf944b1cb1f80436b2d516d979bbf3e843..d8652b6113cd67ee56000fbb83c7440d6e0cba0b 100644 (file)
--- a/src/xrc/xh_sizer.cpp
+++ b/src/xrc/xh_sizer.cpp
@@ -377,6 +377,7 @@ void wxSizerXmlHandler::AddSizerItem(wxSizerItem* sitem)
 //-----------------------------------------------------------------------------
 // wxStdDialogButtonSizerXmlHandler
 //-----------------------------------------------------------------------------
+#if wxUSE_BUTTON
 
 IMPLEMENT_DYNAMIC_CLASS(wxStdDialogButtonSizerXmlHandler, wxXmlResourceHandler)
 
@@ -438,5 +439,6 @@ bool wxStdDialogButtonSizerXmlHandler::CanHandle(wxXmlNode *node)
     return (!m_isInside && IsOfClass(node, wxT("wxStdDialogButtonSizer"))) ||
            (m_isInside && IsOfClass(node, wxT("button")));
 }
+#endif // wxUSE_BUTTON
 
 #endif // wxUSE_XRC

diff --git a/src/xrc/xh_spin.cpp b/src/xrc/xh_spin.cpp
index d7a2b589de00d52f79d80590914a8e41bb59c676..15e878c3d383156fba5a71dbb7a11fce1db140da 100644 (file)
--- a/src/xrc/xh_spin.cpp
+++ b/src/xrc/xh_spin.cpp
@@ -15,7 +15,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC
+#if wxUSE_XRC 
 
 #include "wx/xrc/xh_spin.h"
 

diff --git a/src/xrc/xh_split.cpp b/src/xrc/xh_split.cpp
index f1dc8312461ab513580ddb88cf9abe5c9ac9fa41..be23b871f5dbf5e8e32b2761d0da5e9362c4a4b4 100644 (file)
--- a/src/xrc/xh_split.cpp
+++ b/src/xrc/xh_split.cpp
@@ -15,7 +15,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC
+#if wxUSE_XRC && wxUSE_SPLITTER
 
 #include "wx/xrc/xh_split.h"
 
@@ -107,4 +107,4 @@ bool wxSplitterWindowXmlHandler::CanHandle(wxXmlNode *node)
      return IsOfClass(node, wxT("wxSplitterWindow"));
 }
 
-#endif // wxUSE_XRC
+#endif // wxUSE_XRC && wxUSE_SPLITTER

diff --git a/src/xrc/xh_tglbtn.cpp b/src/xrc/xh_tglbtn.cpp
index 205f9e0d7a8d07bc5179894e73ea39301a387a06..91f433d8a9cbd5c1afc4be21f8de1c8acc872b49 100644 (file)
--- a/src/xrc/xh_tglbtn.cpp
+++ b/src/xrc/xh_tglbtn.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_tglbtn.cpp
-// Purpose:     XRC resource for wxCheckBox
+// Purpose:     XRC resource for wxToggleButton
 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$

diff --git a/src/xrc/xh_toolb.cpp b/src/xrc/xh_toolb.cpp
index f89cc657c1370a2accc6686b3e05555cbdaa8f4c..83b7a6758460b3c89ae9d65ba51159731bc231fe 100644 (file)
--- a/src/xrc/xh_toolb.cpp
+++ b/src/xrc/xh_toolb.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/xrc/xh_toolb.cpp
-// Purpose:     XRC resource for wxBoxSizer
+// Purpose:     XRC resource for wxToolBar
 // Author:      Vaclav Slavik
 // Created:     2000/08/11
 // RCS-ID:      $Id$

diff --git a/src/xrc/xmlrsall.cpp b/src/xrc/xmlrsall.cpp
index 73df95c094aa2070c7c6a7e4d015719b3c331381..c87da9a59287252dc26cc5f2e51aa01d0e220cf9 100644 (file)
--- a/src/xrc/xmlrsall.cpp
+++ b/src/xrc/xmlrsall.cpp
@@ -22,24 +22,46 @@
 
 void wxXmlResource::InitAllHandlers()
 {
+    // these are the handlers, which we always have
+    AddHandler(new wxUnknownWidgetXmlHandler);
     AddHandler(new wxBitmapXmlHandler);
     AddHandler(new wxIconXmlHandler);
-    AddHandler(new wxMenuXmlHandler);
-    AddHandler(new wxMenuBarXmlHandler);
     AddHandler(new wxDialogXmlHandler);
     AddHandler(new wxPanelXmlHandler);
     AddHandler(new wxSizerXmlHandler);
+    AddHandler(new wxFrameXmlHandler);
+    AddHandler(new wxScrolledWindowXmlHandler);
+
+    // these are configurable handlers
+#if wxUSE_MENUS
+    AddHandler(new wxMenuXmlHandler);
+    AddHandler(new wxMenuBarXmlHandler);
+#endif
+#if wxUSE_BUTTON
     AddHandler(new wxStdDialogButtonSizerXmlHandler);
     AddHandler(new wxButtonXmlHandler);
+#endif
+#if wxUSE_BMPBUTTON
     AddHandler(new wxBitmapButtonXmlHandler);
+#endif
+#if wxUSE_STATTEXT
     AddHandler(new wxStaticTextXmlHandler);
+#endif
+#if wxUSE_STATBOX
     AddHandler(new wxStaticBoxXmlHandler);
+#endif
+#if wxUSE_STATBMP
     AddHandler(new wxStaticBitmapXmlHandler);
+#endif
+#if wxUSE_TREECTRL
     AddHandler(new wxTreeCtrlXmlHandler);
+#endif
 #if wxUSE_CALENDARCTRL
     AddHandler(new wxCalendarCtrlXmlHandler);
 #endif
+#if wxUSE_LISTCTRL
     AddHandler(new wxListCtrlXmlHandler);
+#endif
 #if wxUSE_CHECKLISTBOX
     AddHandler(new wxCheckListBoxXmlHandler);
 #endif
@@ -72,6 +94,8 @@ void wxXmlResource::InitAllHandlers()
 #endif
 #if wxUSE_RADIOBOX
     AddHandler(new wxRadioBoxXmlHandler);
+#endif
+#if wxUSE_RADIOBTN
     AddHandler(new wxRadioButtonXmlHandler);
 #endif
 #if wxUSE_COMBOBOX
@@ -95,7 +119,9 @@ void wxXmlResource::InitAllHandlers()
 #if wxUSE_TREEBOOK
     AddHandler(new wxTreebookXmlHandler);
 #endif
+#if wxUSE_TEXTCTRL
     AddHandler(new wxTextCtrlXmlHandler);
+#endif
 #if wxUSE_LISTBOX
     AddHandler(new wxListBoxXmlHandler);
 #endif
@@ -105,13 +131,12 @@ void wxXmlResource::InitAllHandlers()
 #if wxUSE_STATLINE
     AddHandler(new wxStaticLineXmlHandler);
 #endif
-    AddHandler(new wxUnknownWidgetXmlHandler);
 #if wxUSE_DIRDLG
     AddHandler(new wxGenericDirCtrlXmlHandler);
 #endif
-    AddHandler(new wxFrameXmlHandler);
-    AddHandler(new wxScrolledWindowXmlHandler);
+#if wxUSE_SPLITTER
     AddHandler(new wxSplitterWindowXmlHandler);
+#endif
 #if wxUSE_WIZARDDLG
     AddHandler(new wxWizardXmlHandler);
 #endif