Use "<Application> Preferences" as generic wxPreferencesEditor dialog title.

This is more appropriate than just "Preferences" under MSW and GTK which use
the generic wxPreferencesEditor, OS X has its own native version which
continues to correctly use "Preferences" for the title.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74007 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-05-16 14:42:59 +00:00
parent 654c4b7b14
commit dc5d118e65
2 changed files with 12 additions and 1 deletions

View File

@@ -224,6 +224,11 @@ bool MyApp::OnInit()
if ( !wxApp::OnInit() ) if ( !wxApp::OnInit() )
return false; return false;
// This will be used in the title of the preferences dialog under some
// platforms, don't leave it as default "Preferences" because this would
// result in rather strange "Preferences Preferences" title.
SetAppDisplayName("wxWidgets Sample");
MyFrame *frame = new MyFrame(); MyFrame *frame = new MyFrame();
frame->Show(true); frame->Show(true);

View File

@@ -27,6 +27,7 @@
#ifndef wxHAS_PREF_EDITOR_NATIVE #ifndef wxHAS_PREF_EDITOR_NATIVE
#include "wx/app.h"
#include "wx/dialog.h" #include "wx/dialog.h"
#include "wx/notebook.h" #include "wx/notebook.h"
#include "wx/sizer.h" #include "wx/sizer.h"
@@ -100,7 +101,12 @@ protected:
wxGenericPrefsDialog *CreateDialog(wxWindow *parent) wxGenericPrefsDialog *CreateDialog(wxWindow *parent)
{ {
if ( m_title.empty() ) if ( m_title.empty() )
m_title = _("Preferences"); {
// Use the default title, which should include the application name
// under both MSW and GTK (and OSX uses its own native
// implementation anyhow).
m_title.Printf(_("%s Preferences"), wxTheApp->GetAppDisplayName());
}
wxGenericPrefsDialog *dlg = new wxGenericPrefsDialog(parent, m_title); wxGenericPrefsDialog *dlg = new wxGenericPrefsDialog(parent, m_title);