Dispatch pending events without waiting for idle time (closes #10994).

[wxWidgets.git] / include / wx / aboutdlg.h

diff --git a/include/wx/aboutdlg.h b/include/wx/aboutdlg.h
index 2c38167c7ddc86d849bc6fd1a2dd1df5fd446a16..8a4ccb36a1e613460dc6c5935d8a48a626263ea3 100644 (file)
--- a/include/wx/aboutdlg.h
+++ b/include/wx/aboutdlg.h
@@ -31,31 +31,31 @@ public:
     // accessors for various simply fields
     // -----------------------------------
 
     // accessors for various simply fields
     // -----------------------------------
 

-    // name of the program, if not used defaults wxApp::GetAppName()
+    // name of the program, if not used defaults to wxApp::GetAppDisplayName()

     void SetName(const wxString& name) { m_name = name; }
     wxString GetName() const
     void SetName(const wxString& name) { m_name = name; }
     wxString GetName() const

-        { return m_name.empty() ? wxTheApp->GetAppName() : m_name; }
+        { return m_name.empty() ? wxTheApp->GetAppDisplayName() : m_name; }

 
     // version of the program, in free format (but without "version" word)
     void SetVersion(const wxString& version) { m_version = version; }
     bool HasVersion() const { return !m_version.empty(); }
 
     // version of the program, in free format (but without "version" word)
     void SetVersion(const wxString& version) { m_version = version; }
     bool HasVersion() const { return !m_version.empty(); }

-    wxString GetVersion() const { return m_version; }
+    const wxString& GetVersion() const { return m_version; }

 
     // brief, but possibly multiline, description of the program
     void SetDescription(const wxString& desc) { m_description = desc; }
     bool HasDescription() const { return !m_description.empty(); }
 
     // brief, but possibly multiline, description of the program
     void SetDescription(const wxString& desc) { m_description = desc; }
     bool HasDescription() const { return !m_description.empty(); }

-    wxString GetDescription() const { return m_description; }
+    const wxString& GetDescription() const { return m_description; }

 
     // short string containing the program copyright information
     void SetCopyright(const wxString& copyright) { m_copyright = copyright; }
     bool HasCopyright() const { return !m_copyright.empty(); }
 
     // short string containing the program copyright information
     void SetCopyright(const wxString& copyright) { m_copyright = copyright; }
     bool HasCopyright() const { return !m_copyright.empty(); }

-    wxString GetCopyright() const { return m_copyright; }
+    const wxString& GetCopyright() const { return m_copyright; }

 
     // long, multiline string containing the text of the program licence
     void SetLicence(const wxString& licence) { m_licence = licence; }
     void SetLicense(const wxString& licence) { m_licence = licence; }
     bool HasLicence() const { return !m_licence.empty(); }
 
     // long, multiline string containing the text of the program licence
     void SetLicence(const wxString& licence) { m_licence = licence; }
     void SetLicense(const wxString& licence) { m_licence = licence; }
     bool HasLicence() const { return !m_licence.empty(); }

-    wxString GetLicence() const { return m_licence; }
+    const wxString& GetLicence() const { return m_licence; }

 
     // icon to be shown in the dialog, defaults to the main frame icon
     void SetIcon(const wxIcon& icon) { m_icon = icon; }
 
     // icon to be shown in the dialog, defaults to the main frame icon
     void SetIcon(const wxIcon& icon) { m_icon = icon; }


@@ -72,8 +72,8 @@ public:
 
     bool HasWebSite() const { return !m_url.empty(); }
 
 
     bool HasWebSite() const { return !m_url.empty(); }
 

-    wxString GetWebSiteURL() const { return m_url; }
-    wxString GetWebSiteDescription() const { return m_urlDesc; }
+    const wxString& GetWebSiteURL() const { return m_url; }
+    const wxString& GetWebSiteDescription() const { return m_urlDesc; }

 
     // accessors for the arrays
     // ------------------------
 
     // accessors for the arrays
     // ------------------------


@@ -128,6 +128,10 @@ public:
     // artists and translators) as a one long multiline string
     wxString GetDescriptionAndCredits() const;
 
     // artists and translators) as a one long multiline string
     wxString GetDescriptionAndCredits() const;
 

+    // returns the copyright with the (C) string substituted by the Unicode
+    // character U+00A9
+    wxString GetCopyrightToDisplay() const;
+

 private:
     wxString m_name,
              m_version,
 private:
     wxString m_name,
              m_version,


@@ -147,7 +151,7 @@ private:
 };
 
 // functions to show the about dialog box
 };
 
 // functions to show the about dialog box

-WXDLLIMPEXP_ADV void wxAboutBox(const wxAboutDialogInfo& info);
+WXDLLIMPEXP_ADV void wxAboutBox(const wxAboutDialogInfo& info, wxWindow* parent = NULL);

 
 #endif // wxUSE_ABOUTDLG
 
 
 #endif // wxUSE_ABOUTDLG