Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied patch [ 700313 ] Allow wxUSE_OWNER_DRAWN = 0

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@19936 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-04-02 14:26:58 +00:00
parent 125372dd45
commit 3dbebf5144
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/src/xrc/xh_chckl.cpp
View File

@@ -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

2
contrib/src/xrc/xh_menu.cpp
View File

@@ -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

4
src/xrc/xh_chckl.cpp
View File

@@ -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

2
src/xrc/xh_menu.cpp
View File

@@ -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