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

1. removed useless GtkStr class, wxGTK_CONV is the way to do the conversion2. don't make unnecessary copies in GtkArray in UTF8 build

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46244 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-05-30 12:53:51 +00:00
parent 6679eeeb9b
commit 7e9b47df4f
1 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/gtk/aboutdlg.cpp
View File

@@ -30,19 +30,6 @@
#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).release()))
{
}
};
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// GtkArray: temporary array of GTK strings // GtkArray: temporary array of GTK strings
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -50,12 +37,21 @@ public:
class GtkArray class GtkArray
{ {
public: public:
// Create GtkArray from wxArrayString. Note that the created object is
// only valid as long as 'a' is!
GtkArray(const wxArrayString& a) GtkArray(const wxArrayString& a)
{ {
m_count = a.size(); m_count = a.size();
m_strings = new const gchar *[m_count + 1]; m_strings = new const gchar *[m_count + 1];
for ( size_t n = 0; n < m_count; n++ ) for ( size_t n = 0; n < m_count; n++ )
{
#if wxUSE_UNICODE_UTF8
m_strings[n] = a[n].utf8_str();
#else
m_strings[n] = wxGTK_CONV_SYS(a[n]).release(); m_strings[n] = wxGTK_CONV_SYS(a[n]).release();
#endif
}
// array must be NULL-terminated // array must be NULL-terminated
m_strings[m_count] = NULL; m_strings[m_count] = NULL;
@@ -65,8 +61,10 @@ public:
~GtkArray() ~GtkArray()
{ {
#if !wxUSE_UNICODE_UTF8
for ( size_t n = 0; n < m_count; n++ ) for ( size_t n = 0; n < m_count; n++ )
free(wx_const_cast(gchar *, m_strings[n])); free(wx_const_cast(gchar *, m_strings[n]));
#endif
delete [] m_strings; delete [] m_strings;
} }
@@ -101,15 +99,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, GtkStr(info.GetName())); gtk_about_dialog_set_name(dlg, wxGTK_CONV(info.GetName()));
if ( info.HasVersion() ) if ( info.HasVersion() )
gtk_about_dialog_set_version(dlg, GtkStr(info.GetVersion())); gtk_about_dialog_set_version(dlg, wxGTK_CONV(info.GetVersion()));
if ( info.HasCopyright() ) if ( info.HasCopyright() )
gtk_about_dialog_set_copyright(dlg, GtkStr(info.GetCopyright())); gtk_about_dialog_set_copyright(dlg, wxGTK_CONV(info.GetCopyright()));
if ( info.HasDescription() ) if ( info.HasDescription() )
gtk_about_dialog_set_comments(dlg, GtkStr(info.GetDescription())); gtk_about_dialog_set_comments(dlg, wxGTK_CONV(info.GetDescription()));
if ( info.HasLicence() ) if ( info.HasLicence() )
gtk_about_dialog_set_license(dlg, GtkStr(info.GetLicence())); gtk_about_dialog_set_license(dlg, wxGTK_CONV(info.GetLicence()));
wxIcon icon = info.GetIcon(); wxIcon icon = info.GetIcon();
if ( icon.Ok() ) if ( icon.Ok() )
@@ -122,11 +120,11 @@ void wxAboutBox(const wxAboutDialogInfo& info)
// this...) // this...)
gtk_about_dialog_set_url_hook(wxGtkAboutDialogOnLink, NULL, NULL); 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(info.GetWebSiteURL()));
gtk_about_dialog_set_website_label gtk_about_dialog_set_website_label
( (
dlg, dlg,
GtkStr(info.GetWebSiteDescription()) wxGTK_CONV(info.GetWebSiteDescription())
); );
} }
@@ -163,7 +161,7 @@ void wxAboutBox(const wxAboutDialogInfo& info)
} }
if ( !transCredits.empty() ) if ( !transCredits.empty() )
gtk_about_dialog_set_translator_credits(dlg, GtkStr(transCredits)); gtk_about_dialog_set_translator_credits(dlg, wxGTK_CONV(transCredits));
g_signal_connect(dlg, "response", g_signal_connect(dlg, "response",
G_CALLBACK(wxGtkAboutDialogOnClose), NULL); G_CALLBACK(wxGtkAboutDialogOnClose), NULL);