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
This commit is contained in:
@@ -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
|
@@ -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));
|
||||
|
@@ -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
|
@@ -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));
|
||||
|
Reference in New Issue
Block a user