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 ba95a1cc7443fc402581c89c82c4beefb0bf5a70..9a81ffa006988fbb3738494811bb26ab5c491ee7 100644 (file)
--- 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));
 }
 
         AddControl(new wxStaticText(this, wxID_ANY, text));
 }
 

+#if wxUSE_COLLPANE

 void wxGenericAboutDialog::AddCollapsiblePane(const wxString& title,
                                               const wxString& text)
 {
 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));
 }
     // 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
 
 
 #if !wxUSE_MODAL_ABOUT_DIALOG
 

diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp
index f03ba5cc39b6bf067e7796680029c9feb2788db2..8e7da47eb4e49311c8480bbfd6d14eebd2148fc6 100644 (file)
--- a/src/generic/logg.cpp
+++ b/src/generic/logg.cpp
@@ -753,11 +753,17 @@ wxLogDialog::wxLogDialog(wxWindow *parent,
 
     // add the details pane
 #ifndef __SMARTPHONE__
 
     // 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();
     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);
     wxSizer * const paneSz = new wxBoxSizer(wxVERTICAL);
 
     CreateDetailsControls(win);