make wxTmemchr() return (and take) char* instead of void* in ANSI build too

[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 a6d165971f236fc259a20dbb94384402012619d1..d0dc8e915f88b71832bc287903d8147d4160ef12 100644 (file)
--- a/include/wx/xrc/xh_fontpicker.h
+++ b/include/wx/xrc/xh_fontpicker.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        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_