Some code renaming to avoid confusion. Test editable column in sample.

[wxWidgets.git] / include / wx / xrc / xh_fontpicker.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$
 // Author:      Francesco Montorsi
 // Created:     2006-04-17
 // RCS-ID:      $Id$


@@ -13,17 +13,18 @@
 
 #include "wx/xrc/xmlres.h"
 
 
 #include "wx/xrc/xmlres.h"
 

-#if wxUSE_FONTPICKERCTRL
+#if wxUSE_XRC && wxUSE_FONTPICKERCTRL

 
 class WXDLLIMPEXP_XRC wxFontPickerCtrlXmlHandler : public wxXmlResourceHandler
 {
 
 class WXDLLIMPEXP_XRC wxFontPickerCtrlXmlHandler : public wxXmlResourceHandler
 {

-DECLARE_DYNAMIC_CLASS(wxFontPickerCtrlXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxFontPickerCtrlXmlHandler)
+

 public:
     wxFontPickerCtrlXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 };
 
 public:
     wxFontPickerCtrlXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 };
 

-#endif // wxUSE_FONTPICKERCTRL
+#endif // wxUSE_XRC && wxUSE_FONTPICKERCTRL

 
 #endif // _WX_XH_FONTPICKERCTRL_H_
 
 #endif // _WX_XH_FONTPICKERCTRL_H_