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

Unicode compilation fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41702 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-10-08 13:44:32 +00:00
parent e5b41495b4
commit 9b82d31bdd
1 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/gtk/aboutdlg.cpp
View File

@@ -29,6 +29,19 @@
#include "wx/gtk/private.h" #include "wx/gtk/private.h"
// ----------------------------------------------------------------------------
// GtkStr: temporary GTK string
// ----------------------------------------------------------------------------
class GtkStr : public wxGtkString
{
public:
GtkStr(const wxString& s)
: wxGtkString(wx_const_cast(char *, wxGTK_CONV_SYS(s).data()))
{
}
};
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// GtkArray: temporary array of GTK strings // GtkArray: temporary array of GTK strings
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -73,15 +86,15 @@ void wxAboutBox(const wxAboutDialogInfo& info)
if ( !gtk_check_version(2,6,0) ) if ( !gtk_check_version(2,6,0) )
{ {
GtkAboutDialog * const dlg = GTK_ABOUT_DIALOG(gtk_about_dialog_new()); GtkAboutDialog * const dlg = GTK_ABOUT_DIALOG(gtk_about_dialog_new());
gtk_about_dialog_set_name(dlg, info.GetName()); gtk_about_dialog_set_name(dlg, GtkStr(info.GetName()));
if ( info.HasVersion() ) if ( info.HasVersion() )
gtk_about_dialog_set_version(dlg, info.GetVersion()); gtk_about_dialog_set_version(dlg, GtkStr(info.GetVersion()));
if ( info.HasCopyright() ) if ( info.HasCopyright() )
gtk_about_dialog_set_copyright(dlg, info.GetCopyright()); gtk_about_dialog_set_copyright(dlg, GtkStr(info.GetCopyright()));
if ( info.HasDescription() ) if ( info.HasDescription() )
gtk_about_dialog_set_comments(dlg, info.GetDescription()); gtk_about_dialog_set_comments(dlg, GtkStr(info.GetDescription()));
if ( info.HasLicence() ) if ( info.HasLicence() )
gtk_about_dialog_set_license(dlg, info.GetLicence()); gtk_about_dialog_set_license(dlg, GtkStr(info.GetLicence()));
wxIcon icon = info.GetIcon(); wxIcon icon = info.GetIcon();
if ( icon.Ok() ) if ( icon.Ok() )
@@ -89,8 +102,12 @@ void wxAboutBox(const wxAboutDialogInfo& info)
if ( info.HasWebSite() ) if ( info.HasWebSite() )
{ {
gtk_about_dialog_set_website(dlg, info.GetWebSiteURL()); gtk_about_dialog_set_website(dlg, GtkStr(info.GetWebSiteURL()));
gtk_about_dialog_set_website_label(dlg, info.GetWebSiteDescription()); gtk_about_dialog_set_website_label
(
dlg,
GtkStr(info.GetWebSiteDescription())
);
} }
if ( info.HasDevelopers() ) if ( info.HasDevelopers() )
@@ -100,7 +117,13 @@ void wxAboutBox(const wxAboutDialogInfo& info)
if ( info.HasArtists() ) if ( info.HasArtists() )
gtk_about_dialog_set_artists(dlg, GtkArray(info.GetArtists())); gtk_about_dialog_set_artists(dlg, GtkArray(info.GetArtists()));
if ( info.HasTranslators() ) if ( info.HasTranslators() )
gtk_about_dialog_set_translator_credits(dlg, _("translator-credits")); {
gtk_about_dialog_set_translator_credits
(
dlg,
GtkStr(_("translator-credits"))
);
}
gtk_widget_show(GTK_WIDGET(dlg)); gtk_widget_show(GTK_WIDGET(dlg));
return; return;