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

reset the dialog fields if they're not specified in wxAboutDialogInfo: it's necessary now that we can reuse an existing dialog (update of the patch 1829097)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-11-13 01:05:03 +00:00
parent c114eb7a9f
commit 49b3b52cc8
1 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/gtk/aboutdlg.cpp
View File

@@ -40,6 +40,11 @@ namespace
class GtkArray class GtkArray
{ {
public: public:
// Create empty GtkArray
GtkArray() : m_strings(0), m_count(0)
{
}
// Create GtkArray from wxArrayString. Note that the created object is // Create GtkArray from wxArrayString. Note that the created object is
// only valid as long as 'a' is! // only valid as long as 'a' is!
GtkArray(const wxArrayString& a) GtkArray(const wxArrayString& a)
@@ -116,12 +121,20 @@ void wxAboutBox(const wxAboutDialogInfo& info)
gtk_about_dialog_set_name(dlg, wxGTK_CONV_SYS(info.GetName())); gtk_about_dialog_set_name(dlg, wxGTK_CONV_SYS(info.GetName()));
if ( info.HasVersion() ) if ( info.HasVersion() )
gtk_about_dialog_set_version(dlg, wxGTK_CONV_SYS(info.GetVersion())); gtk_about_dialog_set_version(dlg, wxGTK_CONV_SYS(info.GetVersion()));
else
gtk_about_dialog_set_version(dlg, NULL);
if ( info.HasCopyright() ) if ( info.HasCopyright() )
gtk_about_dialog_set_copyright(dlg, wxGTK_CONV_SYS(info.GetCopyright())); gtk_about_dialog_set_copyright(dlg, wxGTK_CONV_SYS(info.GetCopyright()));
else
gtk_about_dialog_set_copyright(dlg, NULL);
if ( info.HasDescription() ) if ( info.HasDescription() )
gtk_about_dialog_set_comments(dlg, wxGTK_CONV_SYS(info.GetDescription())); gtk_about_dialog_set_comments(dlg, wxGTK_CONV_SYS(info.GetDescription()));
else
gtk_about_dialog_set_comments(dlg, NULL);
if ( info.HasLicence() ) if ( info.HasLicence() )
gtk_about_dialog_set_license(dlg, wxGTK_CONV_SYS(info.GetLicence())); gtk_about_dialog_set_license(dlg, wxGTK_CONV_SYS(info.GetLicence()));
else
gtk_about_dialog_set_license(dlg, NULL);
wxIcon icon = info.GetIcon(); wxIcon icon = info.GetIcon();
if ( icon.Ok() ) if ( icon.Ok() )
@@ -141,13 +154,25 @@ void wxAboutBox(const wxAboutDialogInfo& info)
wxGTK_CONV_SYS(info.GetWebSiteDescription()) wxGTK_CONV_SYS(info.GetWebSiteDescription())
); );
} }
else
{
gtk_about_dialog_set_website(dlg, NULL);
gtk_about_dialog_set_website_label(dlg, NULL);
gtk_about_dialog_set_url_hook(NULL, NULL, NULL);
}
if ( info.HasDevelopers() ) if ( info.HasDevelopers() )
gtk_about_dialog_set_authors(dlg, GtkArray(info.GetDevelopers())); gtk_about_dialog_set_authors(dlg, GtkArray(info.GetDevelopers()));
else
gtk_about_dialog_set_authors(dlg, GtkArray());
if ( info.HasDocWriters() ) if ( info.HasDocWriters() )
gtk_about_dialog_set_documenters(dlg, GtkArray(info.GetDocWriters())); gtk_about_dialog_set_documenters(dlg, GtkArray(info.GetDocWriters()));
else
gtk_about_dialog_set_documenters(dlg, GtkArray());
if ( info.HasArtists() ) if ( info.HasArtists() )
gtk_about_dialog_set_artists(dlg, GtkArray(info.GetArtists())); gtk_about_dialog_set_artists(dlg, GtkArray(info.GetArtists()));
else
gtk_about_dialog_set_artists(dlg, GtkArray());
wxString transCredits; wxString transCredits;
if ( info.HasTranslators() ) if ( info.HasTranslators() )
@@ -176,6 +201,8 @@ void wxAboutBox(const wxAboutDialogInfo& info)
if ( !transCredits.empty() ) if ( !transCredits.empty() )
gtk_about_dialog_set_translator_credits(dlg, wxGTK_CONV_SYS(transCredits)); gtk_about_dialog_set_translator_credits(dlg, wxGTK_CONV_SYS(transCredits));
else
gtk_about_dialog_set_translator_credits(dlg, NULL);
g_signal_connect(dlg, "response", g_signal_connect(dlg, "response",
G_CALLBACK(wxGtkAboutDialogOnClose), NULL); G_CALLBACK(wxGtkAboutDialogOnClose), NULL);