From 3dbebf5144f15b2964f85c5b93a695691904be2b Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Wed, 2 Apr 2003 14:26:58 +0000
Subject: [PATCH] Applied patch [ 700313 ] Allow wxUSE_OWNER_DRAWN = 0

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@19936 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, 8 insertions(+), 4 deletions(-)

diff --git a/contrib/src/xrc/xh_chckl.cpp b/contrib/src/xrc/xh_chckl.cpp
index 408c02570d..bac03e2823 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 || !defined(__WXMSW__)
+
 #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..80a992acfa 100644
--- a/contrib/src/xrc/xh_menu.cpp
+++ b/contrib/src/xrc/xh_menu.cpp
@@ -85,7 +85,7 @@ wxObject *wxMenuXmlHandler::DoCreateResource()
             wxMenuItem *mitem = new wxMenuItem(p_menu, id, fullLabel,
                                                GetText(wxT("help")), kind);
                                                
-#if wxCHECK_VERSION(2,3,0) || defined(__WXMSW__)
+#if wxCHECK_VERSION(2,3,0) || (defined(__WXMSW__) && wxUSE_OWNER_DRAWN)
                 if (HasParam(wxT("bitmap")))
                     mitem->SetBitmap(GetBitmap(wxT("bitmap"), wxART_MENU));
 #endif
diff --git a/src/xrc/xh_chckl.cpp b/src/xrc/xh_chckl.cpp
index 408c02570d..bac03e2823 100644
--- a/src/xrc/xh_chckl.cpp
+++ b/src/xrc/xh_chckl.cpp
@@ -19,6 +19,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_OWNER_DRAWN || !defined(__WXMSW__)
+
 #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..80a992acfa 100644
--- a/src/xrc/xh_menu.cpp
+++ b/src/xrc/xh_menu.cpp
@@ -85,7 +85,7 @@ wxObject *wxMenuXmlHandler::DoCreateResource()
             wxMenuItem *mitem = new wxMenuItem(p_menu, id, fullLabel,
                                                GetText(wxT("help")), kind);
                                                
-#if wxCHECK_VERSION(2,3,0) || defined(__WXMSW__)
+#if wxCHECK_VERSION(2,3,0) || (defined(__WXMSW__) && wxUSE_OWNER_DRAWN)
                 if (HasParam(wxT("bitmap")))
                     mitem->SetBitmap(GetBitmap(wxT("bitmap"), wxART_MENU));
 #endif