Correction to last patch

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

diff --git a/contrib/src/xrc/xh_chckl.cpp b/contrib/src/xrc/xh_chckl.cpp
index 46be0a3364f56c55d823df68cca0b54b5978cb02..bac03e28237a72b49837d5b362a42138c9c7bd58 100644 (file)
--- a/contrib/src/xrc/xh_chckl.cpp
+++ b/contrib/src/xrc/xh_chckl.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

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

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

diff --git a/contrib/src/xrc/xh_menu.cpp b/contrib/src/xrc/xh_menu.cpp
index ec9a9d0f5ffb21787bb626546b35f0a42ba8e4c8..80a992acfa95a78e0310af47b70ef9e1377ae804 100644 (file)
--- a/contrib/src/xrc/xh_menu.cpp
+++ b/contrib/src/xrc/xh_menu.cpp
@@ -85,11 +85,9 @@ wxObject *wxMenuXmlHandler::DoCreateResource()
             wxMenuItem *mitem = new wxMenuItem(p_menu, id, fullLabel,
                                                GetText(wxT("help")), kind);
                                                
             wxMenuItem *mitem = new wxMenuItem(p_menu, id, fullLabel,
                                                GetText(wxT("help")), kind);
                                                

-#if wxCHECK_VERSION(2,3,0) || defined(__WXMSW__)
-#if wxUSE_OWNER_DRAWN
+#if wxCHECK_VERSION(2,3,0) || (defined(__WXMSW__) && wxUSE_OWNER_DRAWN)

                 if (HasParam(wxT("bitmap")))
                     mitem->SetBitmap(GetBitmap(wxT("bitmap"), wxART_MENU));
                 if (HasParam(wxT("bitmap")))
                     mitem->SetBitmap(GetBitmap(wxT("bitmap"), wxART_MENU));

-#endif

 #endif
             p_menu->Append(mitem);
             mitem->Enable(GetBool(wxT("enabled"), TRUE));
 #endif
             p_menu->Append(mitem);
             mitem->Enable(GetBool(wxT("enabled"), TRUE));

diff --git a/src/xrc/xh_chckl.cpp b/src/xrc/xh_chckl.cpp
index 46be0a3364f56c55d823df68cca0b54b5978cb02..bac03e28237a72b49837d5b362a42138c9c7bd58 100644 (file)
--- a/src/xrc/xh_chckl.cpp
+++ b/src/xrc/xh_chckl.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

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

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

diff --git a/src/xrc/xh_menu.cpp b/src/xrc/xh_menu.cpp
index ec9a9d0f5ffb21787bb626546b35f0a42ba8e4c8..80a992acfa95a78e0310af47b70ef9e1377ae804 100644 (file)
--- a/src/xrc/xh_menu.cpp
+++ b/src/xrc/xh_menu.cpp
@@ -85,11 +85,9 @@ wxObject *wxMenuXmlHandler::DoCreateResource()
             wxMenuItem *mitem = new wxMenuItem(p_menu, id, fullLabel,
                                                GetText(wxT("help")), kind);
                                                
             wxMenuItem *mitem = new wxMenuItem(p_menu, id, fullLabel,
                                                GetText(wxT("help")), kind);
                                                

-#if wxCHECK_VERSION(2,3,0) || defined(__WXMSW__)
-#if wxUSE_OWNER_DRAWN
+#if wxCHECK_VERSION(2,3,0) || (defined(__WXMSW__) && wxUSE_OWNER_DRAWN)

                 if (HasParam(wxT("bitmap")))
                     mitem->SetBitmap(GetBitmap(wxT("bitmap"), wxART_MENU));
                 if (HasParam(wxT("bitmap")))
                     mitem->SetBitmap(GetBitmap(wxT("bitmap"), wxART_MENU));

-#endif

 #endif
             p_menu->Append(mitem);
             mitem->Enable(GetBool(wxT("enabled"), TRUE));
 #endif
             p_menu->Append(mitem);
             mitem->Enable(GetBool(wxT("enabled"), TRUE));