compilation fix for !wxUSE_STATBOX

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

diff --git a/include/wx/xrc/xh_sizer.h b/include/wx/xrc/xh_sizer.h
index 04fb8e6f857be034ed95c17cfd559d1e03a0a6a1..f97aba525d5e7965162b7e234121f232d7675d18 100644 (file)
--- a/include/wx/xrc/xh_sizer.h
+++ b/include/wx/xrc/xh_sizer.h
@@ -41,7 +41,9 @@ private:
     wxObject* Handle_spacer();
     wxObject* Handle_sizer();
     wxSizer*  Handle_wxBoxSizer();
     wxObject* Handle_spacer();
     wxObject* Handle_sizer();
     wxSizer*  Handle_wxBoxSizer();

+#if wxUSE_STATBOX

     wxSizer*  Handle_wxStaticBoxSizer();
     wxSizer*  Handle_wxStaticBoxSizer();

+#endif

     wxSizer*  Handle_wxGridSizer();
     wxSizer*  Handle_wxFlexGridSizer();
     wxSizer*  Handle_wxGridBagSizer();
     wxSizer*  Handle_wxGridSizer();
     wxSizer*  Handle_wxFlexGridSizer();
     wxSizer*  Handle_wxGridBagSizer();

diff --git a/src/xrc/xh_sizer.cpp b/src/xrc/xh_sizer.cpp
index b33ac93219a4ec8baf5237820988e7b97453d555..d0b26df54004b844587eeb9d361cf6e962be4daf 100644 (file)
--- a/src/xrc/xh_sizer.cpp
+++ b/src/xrc/xh_sizer.cpp
@@ -191,8 +191,10 @@ wxObject* wxSizerXmlHandler::Handle_sizer()
     if (m_class == wxT("wxBoxSizer"))
         sizer = Handle_wxBoxSizer();
 
     if (m_class == wxT("wxBoxSizer"))
         sizer = Handle_wxBoxSizer();
 

+#if wxUSE_STATBOX

     else if (m_class == wxT("wxStaticBoxSizer"))
         sizer = Handle_wxStaticBoxSizer();
     else if (m_class == wxT("wxStaticBoxSizer"))
         sizer = Handle_wxStaticBoxSizer();

+#endif

 
     else if (m_class == wxT("wxGridSizer"))
         sizer = Handle_wxGridSizer();
 
     else if (m_class == wxT("wxGridSizer"))
         sizer = Handle_wxGridSizer();


@@ -251,6 +253,7 @@ wxSizer*  wxSizerXmlHandler::Handle_wxBoxSizer()
     return new wxBoxSizer(GetStyle(wxT("orient"), wxHORIZONTAL));
 }
 
     return new wxBoxSizer(GetStyle(wxT("orient"), wxHORIZONTAL));
 }
 

+#if wxUSE_STATBOX

 wxSizer*  wxSizerXmlHandler::Handle_wxStaticBoxSizer()
 {
     return new wxStaticBoxSizer(
 wxSizer*  wxSizerXmlHandler::Handle_wxStaticBoxSizer()
 {
     return new wxStaticBoxSizer(


@@ -262,6 +265,7 @@ wxSizer*  wxSizerXmlHandler::Handle_wxStaticBoxSizer()
                             GetName()),
             GetStyle(wxT("orient"), wxHORIZONTAL));
 }
                             GetName()),
             GetStyle(wxT("orient"), wxHORIZONTAL));
 }

+#endif // wxUSE_STATBOX

 
 wxSizer*  wxSizerXmlHandler::Handle_wxGridSizer()
 {
 
 wxSizer*  wxSizerXmlHandler::Handle_wxGridSizer()
 {