wxCheckListBox doesn't require wxUSE_OWNER_DRAWN when using WXUNIVERSAL

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34232 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/xrc/xh_chckl.h b/include/wx/xrc/xh_chckl.h
index 577065e986c2aa4bb8b6c66b69c7c69405d7ee44..d3a2bc2abe8550f685943acc39df13723d7e3a16 100644 (file)
--- a/include/wx/xrc/xh_chckl.h
+++ b/include/wx/xrc/xh_chckl.h
@@ -17,6 +17,8 @@
 
 #include "wx/xrc/xmlres.h"
 
 
 #include "wx/xrc/xmlres.h"
 

+#if wxUSE_CHECKLISTBOX
+

 class WXDLLIMPEXP_XRC wxCheckListBoxXmlHandler : public wxXmlResourceHandler
 {
 DECLARE_DYNAMIC_CLASS(wxCheckListBoxXmlHandler)
 class WXDLLIMPEXP_XRC wxCheckListBoxXmlHandler : public wxXmlResourceHandler
 {
 DECLARE_DYNAMIC_CLASS(wxCheckListBoxXmlHandler)


@@ -29,6 +31,6 @@ private:
     wxArrayString strList;
 };
 
     wxArrayString strList;
 };
 

-
+#endif

 
 #endif // _WX_XH_CHECKLIST_H_
 
 #endif // _WX_XH_CHECKLIST_H_

diff --git a/src/xrc/xh_chckl.cpp b/src/xrc/xh_chckl.cpp
index 8ed6fef709096e4f11a208f0b9b392c03e6f4c34..d7e5226486b447435d85dda7a54bd9fa429343e7 100644 (file)
--- a/src/xrc/xh_chckl.cpp
+++ b/src/xrc/xh_chckl.cpp
@@ -21,7 +21,7 @@
 
 #if wxUSE_XRC
 
 
 #if wxUSE_XRC
 

-#if wxUSE_OWNER_DRAWN || !defined(__WXMSW__)
+#if wxUSE_CHECKLISTBOX

 
 #include "wx/xrc/xh_chckl.h"
 #include "wx/checklst.h"
 
 #include "wx/xrc/xh_chckl.h"
 #include "wx/checklst.h"


@@ -131,6 +131,6 @@ bool wxCheckListBoxXmlHandler::CanHandle(wxXmlNode *node)
            (m_insideBox && node->GetName() == wxT("item")));
 }
 
            (m_insideBox && node->GetName() == wxT("item")));
 }
 

-#endif // wxUSE_OWNER_DRAWN || !defined(__WXMSW__)
+#endif // wxUSE_CHECKLISTBOX

 
 #endif // wxUSE_XRC
 
 #endif // wxUSE_XRC