add a radio box to select the combobox type (#9845)

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

diff --git a/include/wx/app.h b/include/wx/app.h
index 553a29aa5c2cb2b98ad429f4a57811b5c04b4545..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
     {
-        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
@@ -198,6 +200,13 @@ public:
     // allows us to abstract the differences behind the common facade
     wxAppTraits *GetTraits();
 
+    // this function provides safer access to traits object than
+    // wxTheApp->GetTraits() during startup or termination when the global
+    // application object itself may be unavailable
+    //
+    // of course, it still returns NULL in this case and the caller must check
+    // for it
+    static wxAppTraits *GetTraitsIfExists();
 
     // event processing functions
     // --------------------------
@@ -596,7 +605,7 @@ protected:
 #elif defined(__WXX11__)
     #include "wx/x11/app.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/app.h"
+    #include "wx/osx/app.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/app.h"
 #elif defined(__WXPM__)