From: Julian Smart <julian@anthemion.co.uk>
Date: Wed, 22 Feb 2012 17:35:21 +0000 (+0000)
Subject: Compile fixes for wxUSE_COLLPANE=0
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/abe0903cd4a16c6d8f50a3263d601fc718038c6d

Compile fixes for wxUSE_COLLPANE=0


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

diff --git a/src/generic/aboutdlgg.cpp b/src/generic/aboutdlgg.cpp
index ba95a1cc74..9a81ffa006 100644
--- a/src/generic/aboutdlgg.cpp
+++ b/src/generic/aboutdlgg.cpp
@@ -249,6 +249,7 @@ void wxGenericAboutDialog::AddText(const wxString& text)
         AddControl(new wxStaticText(this, wxID_ANY, text));
 }
 
+#if wxUSE_COLLPANE
 void wxGenericAboutDialog::AddCollapsiblePane(const wxString& title,
                                               const wxString& text)
 {
@@ -271,6 +272,7 @@ void wxGenericAboutDialog::AddCollapsiblePane(const wxString& title,
     // NB: all the wxCollapsiblePanes must be added with a null proportion value
     m_sizerText->Add(pane, wxSizerFlags(0).Expand().Border(wxBOTTOM));
 }
+#endif
 
 #if !wxUSE_MODAL_ABOUT_DIALOG
 
diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp
index f03ba5cc39..8e7da47eb4 100644
--- a/src/generic/logg.cpp
+++ b/src/generic/logg.cpp
@@ -753,11 +753,17 @@ wxLogDialog::wxLogDialog(wxWindow *parent,
 
     // add the details pane
 #ifndef __SMARTPHONE__
+
+#if wxUSE_COLLPANE
     wxCollapsiblePane * const
         collpane = new wxCollapsiblePane(this, wxID_ANY, ms_details);
     sizerTop->Add(collpane, wxSizerFlags(1).Expand().Border());
 
     wxWindow *win = collpane->GetPane();
+#else
+    wxPanel* win = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
+                               wxBORDER_NONE);
+#endif
     wxSizer * const paneSz = new wxBoxSizer(wxVERTICAL);
 
     CreateDetailsControls(win);