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

Correction to last patch

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19935 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-04-02 14:25:23 +00:00
parent 3037523a7c
commit 5e7ea8ebb2
4 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,7 +19,7 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#if wxUSE_OWNER_DRAWN #if wxUSE_OWNER_DRAWN || !defined(__WXMSW__)
#include "wx/xrc/xh_chckl.h" #include "wx/xrc/xh_chckl.h"
#include "wx/checklst.h" #include "wx/checklst.h"

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

@@ -85,11 +85,9 @@ wxObject *wxMenuXmlHandler::DoCreateResource()
wxMenuItem *mitem = new wxMenuItem(p_menu, id, fullLabel, wxMenuItem *mitem = new wxMenuItem(p_menu, id, fullLabel,
GetText(wxT("help")), kind); GetText(wxT("help")), kind);
#if wxCHECK_VERSION(2,3,0) || defined(__WXMSW__) #if wxCHECK_VERSION(2,3,0) || (defined(__WXMSW__) && wxUSE_OWNER_DRAWN)
#if wxUSE_OWNER_DRAWN
if (HasParam(wxT("bitmap"))) if (HasParam(wxT("bitmap")))
mitem->SetBitmap(GetBitmap(wxT("bitmap"), wxART_MENU)); mitem->SetBitmap(GetBitmap(wxT("bitmap"), wxART_MENU));
#endif
#endif #endif
p_menu->Append(mitem); p_menu->Append(mitem);
mitem->Enable(GetBool(wxT("enabled"), TRUE)); mitem->Enable(GetBool(wxT("enabled"), TRUE));

2
src/xrc/xh_chckl.cpp
View File

@@ -19,7 +19,7 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#if wxUSE_OWNER_DRAWN #if wxUSE_OWNER_DRAWN || !defined(__WXMSW__)
#include "wx/xrc/xh_chckl.h" #include "wx/xrc/xh_chckl.h"
#include "wx/checklst.h" #include "wx/checklst.h"

4
src/xrc/xh_menu.cpp
View File

@@ -85,11 +85,9 @@ wxObject *wxMenuXmlHandler::DoCreateResource()
wxMenuItem *mitem = new wxMenuItem(p_menu, id, fullLabel, wxMenuItem *mitem = new wxMenuItem(p_menu, id, fullLabel,
GetText(wxT("help")), kind); GetText(wxT("help")), kind);
#if wxCHECK_VERSION(2,3,0) || defined(__WXMSW__) #if wxCHECK_VERSION(2,3,0) || (defined(__WXMSW__) && wxUSE_OWNER_DRAWN)
#if wxUSE_OWNER_DRAWN
if (HasParam(wxT("bitmap"))) if (HasParam(wxT("bitmap")))
mitem->SetBitmap(GetBitmap(wxT("bitmap"), wxART_MENU)); mitem->SetBitmap(GetBitmap(wxT("bitmap"), wxART_MENU));
#endif
#endif #endif
p_menu->Append(mitem); p_menu->Append(mitem);
mitem->Enable(GetBool(wxT("enabled"), TRUE)); mitem->Enable(GetBool(wxT("enabled"), TRUE));