#ifndef WX_PRECOMP
#include "wx/sizer.h"
-
#include "wx/statbmp.h"
#include "wx/stattext.h"
+ #include "wx/button.h"
#endif //WX_PRECOMP
#include "wx/aboutdlg.h"
#include "wx/generic/aboutdlgg.h"
#include "wx/hyperlink.h"
+#include "wx/collpane.h"
// ============================================================================
// implementation
s << _T('\n') << _("Developed by ") << AllAsString(GetDevelopers());
if ( HasDocWriters() )
- s << _T('\n') << ("Documentation by ") << AllAsString(GetDocWriters());
+ s << _T('\n') << _("Documentation by ") << AllAsString(GetDocWriters());
if ( HasArtists() )
- s << _T('\n') << ("Graphics art by ") << AllAsString(GetArtists());
+ s << _T('\n') << _("Graphics art by ") << AllAsString(GetArtists());
if ( HasTranslators() )
- s << _T('\n') << ("Translations by ") << AllAsString(GetTranslators());
+ s << _T('\n') << _("Translations by ") << AllAsString(GetTranslators());
return s;
}
+wxIcon wxAboutDialogInfo::GetIcon() const
+{
+ wxIcon icon = m_icon;
+ if ( !icon.Ok() && wxTheApp )
+ {
+ const wxTopLevelWindow * const
+ tlw = wxDynamicCast(wxTheApp->GetTopWindow(), wxTopLevelWindow);
+ if ( tlw )
+ icon = tlw->GetIcon();
+ }
+
+ return icon;
+}
+
// ----------------------------------------------------------------------------
-// wxAboutDialog
+// wxGenericAboutDialog
// ----------------------------------------------------------------------------
-bool wxAboutDialog::Create(const wxAboutDialogInfo& info)
+bool wxGenericAboutDialog::Create(const wxAboutDialogInfo& info)
{
// TODO: should we use main frame as parent by default here?
- if ( !wxDialog::Create(NULL, wxID_ANY, _("About ") + info.GetName()) )
+ if ( !wxDialog::Create(NULL, wxID_ANY, _("About ") + info.GetName(),
+ wxDefaultPosition, wxDefaultSize, wxRESIZE_BORDER|wxDEFAULT_DIALOG_STYLE) )
return false;
m_sizerText = new wxBoxSizer(wxVERTICAL);
#endif // wxUSE_HYPERLINKCTRL/!wxUSE_HYPERLINKCTRL
}
- // TODO: add licence
+#if wxUSE_COLLPANE
+ // add licence
+ if ( info.HasLicence() )
+ {
+ wxCollapsiblePane *
+ licensepnl = new wxCollapsiblePane(this, wxID_ANY, wxT("License"));
+
+ new wxStaticText(licensepnl->GetPane(), wxID_ANY, info.GetLicence(),
+ wxDefaultPosition, wxDefaultSize,
+ wxALIGN_CENTRE);
+
+ m_sizerText->Add(licensepnl, wxSizerFlags(1).Expand().Border(wxBOTTOM));
+ }
+#endif // wxUSE_COLLPANE
// TODO: add credits (developers, artists, doc writers, translators)
+ DoAddCustomControls();
+
wxSizer *sizerIconAndText = new wxBoxSizer(wxHORIZONTAL);
#if wxUSE_STATBMP
wxIcon icon = info.GetIcon();
- if ( !icon.Ok() && wxTheApp )
- {
- const wxTopLevelWindow * const
- tlw = wxDynamicCast(wxTheApp->GetTopWindow(), wxTopLevelWindow);
- if ( tlw )
- icon = tlw->GetIcon();
- }
-
if ( icon.Ok() )
{
sizerIconAndText->Add(new wxStaticBitmap(this, wxID_ANY, icon),
wxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);
sizerTop->Add(sizerIconAndText, wxSizerFlags(1).Expand().Border());
- sizerTop->Add(new wxButton(this, wxID_OK), wxSizerFlags().Right().Border());
+
+ wxSizer *sizerBtns = CreateButtonSizer(wxOK);
+ if ( sizerBtns )
+ {
+ sizerTop->Add(sizerBtns, wxSizerFlags().Expand().Border());
+ }
+
SetSizerAndFit(sizerTop);
CentreOnScreen();
+
return true;
}
-void wxAboutDialog::AddControl(wxWindow *win)
+void wxGenericAboutDialog::AddControl(wxWindow *win, const wxSizerFlags& flags)
{
wxCHECK_RET( m_sizerText, _T("can only be called after Create()") );
wxASSERT_MSG( win, _T("can't add NULL window to about dialog") );
- m_sizerText->Add(win, wxSizerFlags().Border(wxDOWN).Centre());
+ m_sizerText->Add(win, flags);
+}
+
+void wxGenericAboutDialog::AddControl(wxWindow *win)
+{
+ AddControl(win, wxSizerFlags().Border(wxDOWN).Centre());
}
-void wxAboutDialog::AddText(const wxString& text)
+void wxGenericAboutDialog::AddText(const wxString& text)
{
if ( !text.empty() )
AddControl(new wxStaticText(this, wxID_ANY, text));
void wxGenericAboutBox(const wxAboutDialogInfo& info)
{
- wxAboutDialog dlg(info);
+ wxGenericAboutDialog dlg(info);
dlg.ShowModal();
}
// currently wxAboutBox is implemented natively only under these platforms, for
// the others we provide a generic fallback here
-#if !defined(__WXMSW__) && !defined(__WXMAC__)
+#if !defined(__WXMSW__) && !defined(__WXMAC__) && !defined(__WXGTK26__)
void wxAboutBox(const wxAboutDialogInfo& info)
{