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

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

+#if wxUSE_OWNER_DRAWN
+

 #include "wx/xrc/xh_chckl.h"
 #include "wx/checklst.h"
 #include "wx/intl.h"
 #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")));
 }
 
            (m_insideBox && node->GetName() == wxT("item")));
 }
 

-
+#endif
\ No newline at end of file

diff --git a/contrib/src/xrc/xh_menu.cpp b/contrib/src/xrc/xh_menu.cpp
index 08d5dc4d210cfb2b6afbb29bb82605684f19812e..ec9a9d0f5ffb21787bb626546b35f0a42ba8e4c8 100644 (file)
--- a/contrib/src/xrc/xh_menu.cpp
+++ b/contrib/src/xrc/xh_menu.cpp
@@ -86,8 +86,10 @@ wxObject *wxMenuXmlHandler::DoCreateResource()
                                                GetText(wxT("help")), kind);
                                                
 #if wxCHECK_VERSION(2,3,0) || defined(__WXMSW__)
                                                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));
                 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 408c02570dd950022cbc7dd36b17b2e1f0c5bd5f..46be0a3364f56c55d823df68cca0b54b5978cb02 100644 (file)
--- a/src/xrc/xh_chckl.cpp
+++ b/src/xrc/xh_chckl.cpp
@@ -19,6 +19,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_OWNER_DRAWN
+

 #include "wx/xrc/xh_chckl.h"
 #include "wx/checklst.h"
 #include "wx/intl.h"
 #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")));
 }
 
            (m_insideBox && node->GetName() == wxT("item")));
 }
 

-
+#endif
\ No newline at end of file

diff --git a/src/xrc/xh_menu.cpp b/src/xrc/xh_menu.cpp
index 08d5dc4d210cfb2b6afbb29bb82605684f19812e..ec9a9d0f5ffb21787bb626546b35f0a42ba8e4c8 100644 (file)
--- a/src/xrc/xh_menu.cpp
+++ b/src/xrc/xh_menu.cpp
@@ -86,8 +86,10 @@ wxObject *wxMenuXmlHandler::DoCreateResource()
                                                GetText(wxT("help")), kind);
                                                
 #if wxCHECK_VERSION(2,3,0) || defined(__WXMSW__)
                                                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));
                 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));