X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/30083ad8e7c0eb9ea3dcf4f2588149eeb7fe3e32..abd474ea63667f727940a009cc3e0b23ba9f418f:/src/gtk/aboutdlg.cpp diff --git a/src/gtk/aboutdlg.cpp b/src/gtk/aboutdlg.cpp index d8058f0336..dc17913122 100644 --- a/src/gtk/aboutdlg.cpp +++ b/src/gtk/aboutdlg.cpp @@ -31,31 +31,43 @@ #include "wx/gtk/private.h" // ---------------------------------------------------------------------------- -// GtkStr: temporary GTK string +// GtkArray: temporary array of GTK strings // ---------------------------------------------------------------------------- -class GtkStr : public wxGtkString +namespace { -public: - GtkStr(const wxString& s) - : wxGtkString(wx_const_cast(char *, wxGTK_CONV_SYS(s).release())) - { - } -}; - -// ---------------------------------------------------------------------------- -// GtkArray: temporary array of GTK strings -// ---------------------------------------------------------------------------- class GtkArray { public: + // Create empty GtkArray + GtkArray() : m_strings(0), m_count(0) + { + } + + // Create GtkArray from wxArrayString. Note that the created object is + // only valid as long as 'a' is! GtkArray(const wxArrayString& a) { m_count = a.size(); m_strings = new const gchar *[m_count + 1]; + for ( size_t n = 0; n < m_count; n++ ) + { +#if wxUSE_UNICODE + // notice that there is no need to copy the string pointer here + // because this class is used only as a temporary and during its + // existence the pointer persists in wxString which uses it either + // for internal representation (in wxUSE_UNICODE_UTF8 case) or as + // cached m_convertedToChar (in wxUSE_UNICODE_WCHAR case) + m_strings[n] = wxGTK_CONV_SYS(a[n]); +#else // !wxUSE_UNICODE + // and in ANSI build we can simply borrow the pointer from + // wxCharBuffer (which owns it in this case) instead of copying it + // but we then become responsible for freeing it m_strings[n] = wxGTK_CONV_SYS(a[n]).release(); +#endif // wxUSE_UNICODE/!wxUSE_UNICODE + } // array must be NULL-terminated m_strings[m_count] = NULL; @@ -65,8 +77,10 @@ public: ~GtkArray() { +#if !wxUSE_UNICODE for ( size_t n = 0; n < m_count; n++ ) - free(wx_const_cast(gchar *, m_strings[n])); + free(const_cast(m_strings[n])); +#endif delete [] m_strings; } @@ -75,17 +89,24 @@ private: const gchar **m_strings; size_t m_count; - DECLARE_NO_COPY_CLASS(GtkArray) + wxDECLARE_NO_COPY_CLASS(GtkArray); }; +} // anonymous namespace + // ============================================================================ // implementation // ============================================================================ +// GTK+ about dialog is modeless, keep track of it in this variable +static GtkAboutDialog *gs_aboutDialog = NULL; + extern "C" void wxGtkAboutDialogOnClose(GtkAboutDialog *about) { gtk_widget_destroy(GTK_WIDGET(about)); + if ( about == gs_aboutDialog ) + gs_aboutDialog = NULL; } extern "C" void @@ -96,23 +117,35 @@ wxGtkAboutDialogOnLink(GtkAboutDialog * WXUNUSED(about), wxLaunchDefaultBrowser(wxGTK_CONV_BACK_SYS(link)); } -void wxAboutBox(const wxAboutDialogInfo& info) +void wxAboutBox(const wxAboutDialogInfo& info, wxWindow* WXUNUSED(parent)) { if ( !gtk_check_version(2,6,0) ) { - GtkAboutDialog * const dlg = GTK_ABOUT_DIALOG(gtk_about_dialog_new()); - gtk_about_dialog_set_name(dlg, GtkStr(info.GetName())); + // don't create another dialog if one is already present + if ( !gs_aboutDialog ) + gs_aboutDialog = GTK_ABOUT_DIALOG(gtk_about_dialog_new()); + + GtkAboutDialog * const dlg = gs_aboutDialog; + gtk_about_dialog_set_program_name(dlg, wxGTK_CONV_SYS(info.GetName())); if ( info.HasVersion() ) - gtk_about_dialog_set_version(dlg, GtkStr(info.GetVersion())); + gtk_about_dialog_set_version(dlg, wxGTK_CONV_SYS(info.GetVersion())); + else + gtk_about_dialog_set_version(dlg, NULL); if ( info.HasCopyright() ) - gtk_about_dialog_set_copyright(dlg, GtkStr(info.GetCopyright())); + gtk_about_dialog_set_copyright(dlg, wxGTK_CONV_SYS(info.GetCopyrightToDisplay())); + else + gtk_about_dialog_set_copyright(dlg, NULL); if ( info.HasDescription() ) - gtk_about_dialog_set_comments(dlg, GtkStr(info.GetDescription())); + gtk_about_dialog_set_comments(dlg, wxGTK_CONV_SYS(info.GetDescription())); + else + gtk_about_dialog_set_comments(dlg, NULL); if ( info.HasLicence() ) - gtk_about_dialog_set_license(dlg, GtkStr(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(); - if ( icon.Ok() ) + if ( icon.IsOk() ) gtk_about_dialog_set_logo(dlg, info.GetIcon().GetPixbuf()); if ( info.HasWebSite() ) @@ -122,20 +155,32 @@ void wxAboutBox(const wxAboutDialogInfo& info) // this...) gtk_about_dialog_set_url_hook(wxGtkAboutDialogOnLink, NULL, NULL); - gtk_about_dialog_set_website(dlg, GtkStr(info.GetWebSiteURL())); + gtk_about_dialog_set_website(dlg, wxGTK_CONV_SYS(info.GetWebSiteURL())); gtk_about_dialog_set_website_label ( dlg, - GtkStr(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() ) gtk_about_dialog_set_authors(dlg, GtkArray(info.GetDevelopers())); + else + gtk_about_dialog_set_authors(dlg, GtkArray()); if ( info.HasDocWriters() ) gtk_about_dialog_set_documenters(dlg, GtkArray(info.GetDocWriters())); + else + gtk_about_dialog_set_documenters(dlg, GtkArray()); if ( info.HasArtists() ) gtk_about_dialog_set_artists(dlg, GtkArray(info.GetArtists())); + else + gtk_about_dialog_set_artists(dlg, GtkArray()); wxString transCredits; if ( info.HasTranslators() ) @@ -144,10 +189,10 @@ void wxAboutBox(const wxAboutDialogInfo& info) const size_t count = translators.size(); for ( size_t n = 0; n < count; n++ ) { - transCredits << translators[n] << _T('\n'); + transCredits << translators[n] << wxT('\n'); } } - else // no translators explicitely specified + else // no translators explicitly specified { // maybe we have translator credits in the message catalog? wxString translator = _("translator-credits"); @@ -163,12 +208,14 @@ void wxAboutBox(const wxAboutDialogInfo& info) } if ( !transCredits.empty() ) - gtk_about_dialog_set_translator_credits(dlg, GtkStr(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_CALLBACK(wxGtkAboutDialogOnClose), NULL); - gtk_widget_show(GTK_WIDGET(dlg)); + gtk_window_present(GTK_WINDOW(dlg)); return; }