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

don't show more than one about dialog (slightly modified patch 1829097)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49775 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-11-09 20:19:11 +00:00
parent 0a7b022960
commit 350bedb40f
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gtk/aboutdlg.cpp
View File

@@ -85,10 +85,15 @@ private:
// implementation // implementation
// ============================================================================ // ============================================================================
// GTK+ about dialog is modeless, keep track of it in this variable
static GtkAboutDialog *gs_aboutDialog = NULL;
extern "C" void extern "C" void
wxGtkAboutDialogOnClose(GtkAboutDialog *about) wxGtkAboutDialogOnClose(GtkAboutDialog *about)
{ {
gtk_widget_destroy(GTK_WIDGET(about)); gtk_widget_destroy(GTK_WIDGET(about));
if ( about == gs_aboutDialog )
gs_aboutDialog = NULL;
} }
extern "C" void extern "C" void
@@ -103,7 +108,11 @@ 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()); // 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_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()));
@@ -171,7 +180,7 @@ void wxAboutBox(const wxAboutDialogInfo& info)
g_signal_connect(dlg, "response", g_signal_connect(dlg, "response",
G_CALLBACK(wxGtkAboutDialogOnClose), NULL); G_CALLBACK(wxGtkAboutDialogOnClose), NULL);
gtk_widget_show(GTK_WIDGET(dlg)); gtk_window_present(GTK_WINDOW(dlg));
return; return;
} }