Fix missing or broken interface items for Phoenix

[wxWidgets.git] / src / generic / aboutdlgg.cpp

diff --git a/src/generic/aboutdlgg.cpp b/src/generic/aboutdlgg.cpp
index ba95a1cc7443fc402581c89c82c4beefb0bf5a70..86c6da123a7898c38490eaea87cebbaad441e846 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
 


@@ -307,7 +309,8 @@ void wxGenericAboutBox(const wxAboutDialogInfo& info, wxWindow* parent)
 
 // currently wxAboutBox is implemented natively only under these platforms, for
 // the others we provide a generic fallback here
 
 // currently wxAboutBox is implemented natively only under these platforms, for
 // the others we provide a generic fallback here

-#if !defined(__WXMSW__) && !defined(__WXMAC__) && !defined(__WXGTK26__)
+#if !defined(__WXMSW__) && !defined(__WXMAC__) && \
+        (!defined(__WXGTK20__) || defined(__WXUNIVERSAL__))

 
 void wxAboutBox(const wxAboutDialogInfo& info, wxWindow* parent)
 {
 
 void wxAboutBox(const wxAboutDialogInfo& info, wxWindow* parent)
 {