projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix a bunch of warnings in unicode build
[wxWidgets.git]
/
src
/
xrc
/
xh_menu.cpp
diff --git
a/src/xrc/xh_menu.cpp
b/src/xrc/xh_menu.cpp
index e95171cc59ac60333d9c7436bc2168765a22c130..c23acf06aa6f640f72442e2c0af83996d91f7567 100644
(file)
--- a/
src/xrc/xh_menu.cpp
+++ b/
src/xrc/xh_menu.cpp
@@
-19,7
+19,7
@@
#pragma hdrstop
#endif
#pragma hdrstop
#endif
-#if wxUSE_X
ML && wxUSE_X
RC
+#if wxUSE_XRC
#include "wx/xrc/xh_menu.h"
#include "wx/menu.h"
#include "wx/xrc/xh_menu.h"
#include "wx/menu.h"
@@
-88,7
+88,7
@@
wxObject *wxMenuXmlHandler::DoCreateResource()
wxMenuItem *mitem = new wxMenuItem(p_menu, id, fullLabel,
GetText(wxT("help")), kind);
wxMenuItem *mitem = new wxMenuItem(p_menu, id, fullLabel,
GetText(wxT("help")), kind);
-#if wx
CHECK_VERSION(2,3,0) || (defined(__WXMSW__) && wxUSE_OWNER_DRAWN)
+#if wx
USE_OWNER_DRAWN
if (HasParam(wxT("bitmap")))
mitem->SetBitmap(GetBitmap(wxT("bitmap"), wxART_MENU));
#endif
if (HasParam(wxT("bitmap")))
mitem->SetBitmap(GetBitmap(wxT("bitmap"), wxART_MENU));
#endif
@@
-142,4
+142,4
@@
bool wxMenuBarXmlHandler::CanHandle(wxXmlNode *node)
return IsOfClass(node, wxT("wxMenuBar"));
}
return IsOfClass(node, wxT("wxMenuBar"));
}
-#endif // wxUSE_X
ML && wxUSE_X
RC
+#endif // wxUSE_XRC