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 a757d7f55df09bee6028273ae976da02785cba8f..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


@@ -143,6 +145,19 @@ public:
     const wxString& GetVendorName() const { return m_vendorName; }
     void SetVendorName(const wxString& name) { m_vendorName = name; }
 
     const wxString& GetVendorName() const { return m_vendorName; }
     void SetVendorName(const wxString& name) { m_vendorName = name; }
 

+        // set/get the vendor display name:  the display name is shown
+        // in titles/reports/dialogs to the user, while the vendor name
+        // is used in some areas such as wxConfig, wxStandardPaths, etc
+    const wxString& GetVendorDisplayName() const
+    {
+        return m_vendorDisplayName.empty() ? GetVendorName()
+                                           : m_vendorDisplayName;
+    }
+    void SetVendorDisplayName(const wxString& name)
+    {
+        m_vendorDisplayName = name;
+    }
+

 
     // cmd line parsing stuff
     // ----------------------
 
     // cmd line parsing stuff
     // ----------------------


@@ -182,9 +197,16 @@ public:
     // either should be configurable by the user (then he can change the
     // default behaviour simply by overriding CreateTraits() and returning his
     // own traits object) or which is GUI/console dependent as then wxAppTraits
     // either should be configurable by the user (then he can change the
     // default behaviour simply by overriding CreateTraits() and returning his
     // own traits object) or which is GUI/console dependent as then wxAppTraits

-    // allows us to abstract the differences behind the common fa�de
+    // allows us to abstract the differences behind the common facade

     wxAppTraits *GetTraits();
 
     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
     // --------------------------
 
     // event processing functions
     // --------------------------


@@ -346,7 +368,8 @@ protected:
     wxEventLoopBase *CreateMainLoop();
 
     // application info (must be set from the user code)
     wxEventLoopBase *CreateMainLoop();
 
     // application info (must be set from the user code)

-    wxString m_vendorName,        // vendor name (e.g. "ACME Inc")
+    wxString m_vendorName,        // vendor name ("acme")
+             m_vendorDisplayName, // vendor display name (e.g. "ACME Inc")

              m_appName,           // app name ("myapp")
              m_appDisplayName,    // app display name ("My Application")
              m_className;         // class name
              m_appName,           // app name ("myapp")
              m_appDisplayName,    // app display name ("My Application")
              m_className;         // class name


@@ -495,6 +518,9 @@ public:
     // if it's unknown
     virtual wxLayoutDirection GetLayoutDirection() const;
 
     // if it's unknown
     virtual wxLayoutDirection GetLayoutDirection() const;
 

+    // Change the theme used by the application, return true on success.
+    virtual bool SetNativeTheme(const wxString& WXUNUSED(theme)) { return false; }
+

 
     // command line parsing (GUI-specific)
     // ------------------------------------------------------------------------
 
     // command line parsing (GUI-specific)
     // ------------------------------------------------------------------------


@@ -579,7 +605,7 @@ protected:
 #elif defined(__WXX11__)
     #include "wx/x11/app.h"
 #elif defined(__WXMAC__)
 #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__)
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/app.h"
 #elif defined(__WXPM__)


@@ -619,9 +645,16 @@ protected:
 // Force an exit from main loop
 extern void WXDLLIMPEXP_BASE wxExit();
 
 // Force an exit from main loop
 extern void WXDLLIMPEXP_BASE wxExit();
 

+// avoid redeclaring this function here if it had been already declated by
+// wx/utils.h, this results in warnings from g++ with -Wredundant-decls
+#ifndef wx_YIELD_DECLARED
+#define wx_YIELD_DECLARED
+

 // Yield to other apps/messages
 extern bool WXDLLIMPEXP_BASE wxYield();
 
 // Yield to other apps/messages
 extern bool WXDLLIMPEXP_BASE wxYield();
 

+#endif // wx_YIELD_DECLARED
+

 // Yield to other apps/messages
 extern void WXDLLIMPEXP_BASE wxWakeUpIdle();
 
 // Yield to other apps/messages
 extern void WXDLLIMPEXP_BASE wxWakeUpIdle();