Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compile fixes for wxUSE_COLLPANE=0

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70671 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2012-02-22 17:35:21 +00:00
parent 96b57f0d2a
commit abe0903cd4
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/generic/aboutdlgg.cpp
View File

@@ -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, void wxGenericAboutDialog::AddCollapsiblePane(const wxString& title,
const wxString& text) 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 // NB: all the wxCollapsiblePanes must be added with a null proportion value
m_sizerText->Add(pane, wxSizerFlags(0).Expand().Border(wxBOTTOM)); m_sizerText->Add(pane, wxSizerFlags(0).Expand().Border(wxBOTTOM));
} }
#endif
#if !wxUSE_MODAL_ABOUT_DIALOG #if !wxUSE_MODAL_ABOUT_DIALOG

6
src/generic/logg.cpp
View File

@@ -753,11 +753,17 @@ wxLogDialog::wxLogDialog(wxWindow *parent,
// add the details pane // add the details pane
#ifndef __SMARTPHONE__ #ifndef __SMARTPHONE__
#if wxUSE_COLLPANE
wxCollapsiblePane * const wxCollapsiblePane * const
collpane = new wxCollapsiblePane(this, wxID_ANY, ms_details); collpane = new wxCollapsiblePane(this, wxID_ANY, ms_details);
sizerTop->Add(collpane, wxSizerFlags(1).Expand().Border()); sizerTop->Add(collpane, wxSizerFlags(1).Expand().Border());
wxWindow *win = collpane->GetPane(); wxWindow *win = collpane->GetPane();
#else
wxPanel* win = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
wxBORDER_NONE);
#endif
wxSizer * const paneSz = new wxBoxSizer(wxVERTICAL); wxSizer * const paneSz = new wxBoxSizer(wxVERTICAL);
CreateDetailsControls(win); CreateDetailsControls(win);