capitalize the application name in GetAppDisplayName() by default; this results in...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54916 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/app.h b/include/wx/app.h
index ef542febc3825c17ff2b6910f23a325fc9c722cc..ccba2765a0342b47883670d0ba204bff57330112 100644 (file)
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -131,8 +131,10 @@ public:
         // so the app name could be myapp while display name could be "My App"
     wxString GetAppDisplayName() const
     {
         // so the app name could be myapp while display name could be "My App"
     wxString GetAppDisplayName() const
     {

-        return m_appDisplayName.empty() ? GetAppName() : m_appDisplayName;
+        return m_appDisplayName.empty() ? GetAppName().Capitalize()
+                                        : m_appDisplayName;

     }
     }

+

     void SetAppDisplayName(const wxString& name) { m_appDisplayName = name; }
 
         // set/get the app class name
     void SetAppDisplayName(const wxString& name) { m_appDisplayName = name; }
 
         // set/get the app class name

diff --git a/interface/wx/app.h b/interface/wx/app.h
index 8316c30e7580f02b90ac4afd6c5853a6e4806067..60f7ff619eea7d5336151baa5c5cd3b5c70aef94 100644 (file)
--- a/interface/wx/app.h
+++ b/interface/wx/app.h
@@ -76,11 +76,12 @@ public:
     /**
         Returns the user-readable application name.
 
     /**
         Returns the user-readable application name.
 

-        The difference between this string and the one returned by GetAppName() is that
-        this one is meant to be shown to the user and so should be used for the window
-        titles, page headers and so on while the other one should be only used internally,
-        e.g. for the file names or configuration file keys.
-        By default, returns the same string as GetAppName().
+        The difference between this string and the one returned by GetAppName()
+        is that this one is meant to be shown to the user and so should be used
+        for the window titles, page headers and so on while the other one
+        should be only used internally, e.g. for the file names or
+        configuration file keys. By default, returns the application name as
+        returned by GetAppName() capitalized using wxString::Capitalize().

 
         @since 2.9.0
     */
 
         @since 2.9.0
     */


@@ -370,9 +371,14 @@ public:
     virtual bool Pending();
 
     /**
     virtual bool Pending();
 
     /**

-        Set the application name to be used in the user-visible places such as window
-        titles. See GetAppDisplayName() for more about the differences between the
+        Set the application name to be used in the user-visible places such as
+        window titles.
+
+        See GetAppDisplayName() for more about the differences between the

         display name and name.
         display name and name.

+
+        Notice that if this function is called, the name is used as is, without
+        any capitalization as done by default by GetAppDisplayName().

     */
     void SetAppDisplayName(const wxString& name);
 
     */
     void SetAppDisplayName(const wxString& name);