From 3037523a7c04198b5ba1a27407213d66b570ce9d Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Wed, 2 Apr 2003 14:18:51 +0000 Subject: [PATCH] Applied patch [ 700313 ] Allow wxUSE_OWNER_DRAWN = 0 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/src/xrc/xh_chckl.cpp | 4 +++- contrib/src/xrc/xh_menu.cpp | 2 ++ src/xrc/xh_chckl.cpp | 4 +++- src/xrc/xh_menu.cpp | 2 ++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/contrib/src/xrc/xh_chckl.cpp b/contrib/src/xrc/xh_chckl.cpp index 408c02570d..46be0a3364 100644 --- a/contrib/src/xrc/xh_chckl.cpp +++ b/contrib/src/xrc/xh_chckl.cpp @@ -19,6 +19,8 @@ #pragma hdrstop #endif +#if wxUSE_OWNER_DRAWN + #include "wx/xrc/xh_chckl.h" #include "wx/checklst.h" #include "wx/intl.h" @@ -105,4 +107,4 @@ bool wxCheckListXmlHandler::CanHandle(wxXmlNode *node) (m_insideBox && node->GetName() == wxT("item"))); } - +#endif \ No newline at end of file diff --git a/contrib/src/xrc/xh_menu.cpp b/contrib/src/xrc/xh_menu.cpp index 08d5dc4d21..ec9a9d0f5f 100644 --- a/contrib/src/xrc/xh_menu.cpp +++ b/contrib/src/xrc/xh_menu.cpp @@ -86,8 +86,10 @@ wxObject *wxMenuXmlHandler::DoCreateResource() GetText(wxT("help")), kind); #if wxCHECK_VERSION(2,3,0) || defined(__WXMSW__) +#if wxUSE_OWNER_DRAWN if (HasParam(wxT("bitmap"))) mitem->SetBitmap(GetBitmap(wxT("bitmap"), wxART_MENU)); +#endif #endif p_menu->Append(mitem); mitem->Enable(GetBool(wxT("enabled"), TRUE)); diff --git a/src/xrc/xh_chckl.cpp b/src/xrc/xh_chckl.cpp index 408c02570d..46be0a3364 100644 --- a/src/xrc/xh_chckl.cpp +++ b/src/xrc/xh_chckl.cpp @@ -19,6 +19,8 @@ #pragma hdrstop #endif +#if wxUSE_OWNER_DRAWN + #include "wx/xrc/xh_chckl.h" #include "wx/checklst.h" #include "wx/intl.h" @@ -105,4 +107,4 @@ bool wxCheckListXmlHandler::CanHandle(wxXmlNode *node) (m_insideBox && node->GetName() == wxT("item"))); } - +#endif \ No newline at end of file diff --git a/src/xrc/xh_menu.cpp b/src/xrc/xh_menu.cpp index 08d5dc4d21..ec9a9d0f5f 100644 --- a/src/xrc/xh_menu.cpp +++ b/src/xrc/xh_menu.cpp @@ -86,8 +86,10 @@ wxObject *wxMenuXmlHandler::DoCreateResource() GetText(wxT("help")), kind); #if wxCHECK_VERSION(2,3,0) || defined(__WXMSW__) +#if wxUSE_OWNER_DRAWN if (HasParam(wxT("bitmap"))) mitem->SetBitmap(GetBitmap(wxT("bitmap"), wxART_MENU)); +#endif #endif p_menu->Append(mitem); mitem->Enable(GetBool(wxT("enabled"), TRUE)); -- 2.45.2