projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed VC6 compilation - wxAny(const wxVariant&) ctor required a specific 'template<>')
[wxWidgets.git]
/
include
/
wx
/
xrc
/
xh_menu.h
diff --git
a/include/wx/xrc/xh_menu.h
b/include/wx/xrc/xh_menu.h
index fe116e8f71e2a4fc313a079a8820fe85b9173395..ee7c1ab7d8af68d1ed7388088de06d4b3a3fc386 100644
(file)
--- a/
include/wx/xrc/xh_menu.h
+++ b/
include/wx/xrc/xh_menu.h
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: xh_menu.h
+// Name:
wx/xrc/
xh_menu.h
// Purpose: XML resource handler for menus/menubars
// Author: Vaclav Slavik
// Created: 2000/03/05
// Purpose: XML resource handler for menus/menubars
// Author: Vaclav Slavik
// Created: 2000/03/05
@@
-13,9
+13,12
@@
#include "wx/xrc/xmlres.h"
#include "wx/xrc/xmlres.h"
+#if wxUSE_XRC && wxUSE_MENUS
+
class WXDLLIMPEXP_XRC wxMenuXmlHandler : public wxXmlResourceHandler
{
class WXDLLIMPEXP_XRC wxMenuXmlHandler : public wxXmlResourceHandler
{
-DECLARE_DYNAMIC_CLASS(wxMenuXmlHandler)
+ DECLARE_DYNAMIC_CLASS(wxMenuXmlHandler)
+
public:
wxMenuXmlHandler();
virtual wxObject *DoCreateResource();
public:
wxMenuXmlHandler();
virtual wxObject *DoCreateResource();
@@
-28,11
+31,13
@@
private:
class WXDLLIMPEXP_XRC wxMenuBarXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxMenuBarXmlHandler)
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_
#endif // _WX_XH_MENU_H_