X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c1d028f225491065ab11912a9c9bc2ad3f320930..7d6a4d96961eac84d05db8bb24c64d39003f6e54:/src/gtk/aboutdlg.cpp diff --git a/src/gtk/aboutdlg.cpp b/src/gtk/aboutdlg.cpp index 10c843cd4a..501d6d7c11 100644 --- a/src/gtk/aboutdlg.cpp +++ b/src/gtk/aboutdlg.cpp @@ -21,14 +21,19 @@ #if wxUSE_ABOUTDLG && defined(__WXGTK26__) +#include "wx/aboutdlg.h" + #ifndef WX_PRECOMP #include "wx/utils.h" // for wxLaunchDefaultBrowser() #endif //WX_PRECOMP -#include "wx/aboutdlg.h" +#ifndef __WXGTK3__ #include "wx/generic/aboutdlgg.h" +#endif +#include #include "wx/gtk/private.h" +#include "wx/gtk/private/gtk2-compat.h" // ---------------------------------------------------------------------------- // GtkArray: temporary array of GTK strings @@ -40,6 +45,11 @@ namespace 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) @@ -49,11 +59,19 @@ public: for ( size_t n = 0; n < m_count; n++ ) { -#if wxUSE_UNICODE_UTF8 - m_strings[n] = a[n].utf8_str(); -#else +#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 +#endif // wxUSE_UNICODE/!wxUSE_UNICODE } // array must be NULL-terminated @@ -64,9 +82,9 @@ public: ~GtkArray() { -#if !wxUSE_UNICODE_UTF8 +#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; @@ -76,7 +94,7 @@ private: const gchar **m_strings; size_t m_count; - DECLARE_NO_COPY_CLASS(GtkArray) + wxDECLARE_NO_COPY_CLASS(GtkArray); }; } // anonymous namespace @@ -85,60 +103,113 @@ private: // implementation // ============================================================================ -extern "C" void -wxGtkAboutDialogOnClose(GtkAboutDialog *about) +// GTK+ about dialog is modeless, keep track of it in this variable +static GtkAboutDialog *gs_aboutDialog = NULL; + +extern "C" { +static void wxGtkAboutDialogOnClose(GtkAboutDialog *about) { gtk_widget_destroy(GTK_WIDGET(about)); + if ( about == gs_aboutDialog ) + gs_aboutDialog = NULL; +} } -extern "C" void -wxGtkAboutDialogOnLink(GtkAboutDialog * WXUNUSED(about), - const gchar *link, - gpointer WXUNUSED(data)) +#ifdef __WXGTK3__ +extern "C" { +static gboolean activate_link(GtkAboutDialog*, const char* link, void* dontIgnore) +{ + if (dontIgnore) + { + wxLaunchDefaultBrowser(wxGTK_CONV_BACK_SYS(link)); + return true; + } + return false; +} +} +#else +extern "C" { +static void wxGtkAboutDialogOnLink(GtkAboutDialog*, const char* link, void*) { wxLaunchDefaultBrowser(wxGTK_CONV_BACK_SYS(link)); } +} +#endif -void wxAboutBox(const wxAboutDialogInfo& info) +void wxAboutBox(const wxAboutDialogInfo& info, wxWindow* WXUNUSED(parent)) { +#ifndef __WXGTK3__ if ( !gtk_check_version(2,6,0) ) +#endif { - GtkAboutDialog * const dlg = GTK_ABOUT_DIALOG(gtk_about_dialog_new()); - gtk_about_dialog_set_name(dlg, wxGTK_CONV(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, wxGTK_CONV(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, wxGTK_CONV(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, wxGTK_CONV(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, wxGTK_CONV(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() ) { +#ifdef __WXGTK3__ + g_signal_connect(dlg, "activate-link", G_CALLBACK(activate_link), dlg); +#else // NB: must be called before gtk_about_dialog_set_website() as // otherwise it has no effect (although GTK+ docs don't mention // this...) gtk_about_dialog_set_url_hook(wxGtkAboutDialogOnLink, NULL, NULL); +#endif - gtk_about_dialog_set_website(dlg, wxGTK_CONV(info.GetWebSiteURL())); + gtk_about_dialog_set_website(dlg, wxGTK_CONV_SYS(info.GetWebSiteURL())); gtk_about_dialog_set_website_label ( dlg, - wxGTK_CONV(info.GetWebSiteDescription()) + wxGTK_CONV_SYS(info.GetWebSiteDescription()) ); } + else + { + gtk_about_dialog_set_website(dlg, NULL); + gtk_about_dialog_set_website_label(dlg, NULL); +#ifdef __WXGTK3__ + g_signal_connect(dlg, "activate-link", G_CALLBACK(activate_link), NULL); +#else + gtk_about_dialog_set_url_hook(NULL, NULL, NULL); +#endif + } 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() ) @@ -147,10 +218,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"); @@ -166,17 +237,20 @@ void wxAboutBox(const wxAboutDialogInfo& info) } if ( !transCredits.empty() ) - gtk_about_dialog_set_translator_credits(dlg, wxGTK_CONV(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)); - return; + gtk_window_present(GTK_WINDOW(dlg)); } - - // native about dialog not available, fall back to the generic one - wxGenericAboutBox(info); +#ifndef __WXGTK3__ + else + // native about dialog not available, fall back to the generic one + wxGenericAboutBox(info); +#endif } #endif // wxUSE_ABOUTDLG && GTK+ 2.6+