Fixed compilation error on OS/2 (strnlen declaration was not visible).

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

diff --git a/include/wx/app.h b/include/wx/app.h
index ccd8ef978c92f0b086fcdac634bbd02fddc30d90..d4ff10377945d3f4367abcefc7143ff415fe4af3 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


@@ -195,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
     // --------------------------


@@ -212,6 +221,16 @@ public:
     virtual int FilterEvent(wxEvent& event);
 
 #if wxUSE_EXCEPTIONS
     virtual int FilterEvent(wxEvent& event);
 
 #if wxUSE_EXCEPTIONS

+    // execute the functor to handle the given event
+    //
+    // this is a generalization of HandleEvent() below and the base class
+    // implementation of CallEventHandler() still calls HandleEvent() for
+    // compatibility for functors which are just wxEventFunctions (i.e. methods
+    // of wxEvtHandler)
+    virtual void CallEventHandler(wxEvtHandler *handler,
+                                  wxEventFunctor& functor,
+                                  wxEvent& event) const;
+

     // call the specified handler on the given object with the given event
     //
     // this method only exists to allow catching the exceptions thrown by any
     // call the specified handler on the given object with the given event
     //
     // this method only exists to allow catching the exceptions thrown by any


@@ -235,8 +254,8 @@ public:
     // (already) be dispatched
     static bool IsMainLoopRunning();
 
     // (already) be dispatched
     static bool IsMainLoopRunning();
 

-    // process all events in the wxPendingEvents list -- it is necessary to
-    // call this function to process posted events. This happens during each
+    // process all events in the wxHandlersWithPendingEvents list -- it is necessary
+    // to call this function to process posted events. This happens during each

     // event loop iteration in GUI mode but if there is no main loop, it may be
     // also called directly.
     virtual void ProcessPendingEvents();
     // event loop iteration in GUI mode but if there is no main loop, it may be
     // also called directly.
     virtual void ProcessPendingEvents();


@@ -445,6 +464,10 @@ public:
         //          with _extreme_ care or, better, don't use at all!
     virtual bool Yield(bool onlyIfNeeded = false) = 0;
 
         //          with _extreme_ care or, better, don't use at all!
     virtual bool Yield(bool onlyIfNeeded = false) = 0;
 

+        // returns true if the main thread is inside a Yield() call
+    bool IsYielding() const
+        { return m_isInsideYield; }
+

         // this virtual function is called in the GUI mode when the application
         // becomes idle and normally just sends wxIdleEvent to all interested
         // parties
         // this virtual function is called in the GUI mode when the application
         // becomes idle and normally just sends wxIdleEvent to all interested
         // parties


@@ -509,6 +532,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)
     // ------------------------------------------------------------------------


@@ -564,6 +590,7 @@ protected:
     // does any of our windows have focus?
     bool m_isActive;
 
     // does any of our windows have focus?
     bool m_isActive;
 

+    bool m_isInsideYield;

 
     DECLARE_NO_COPY_CLASS(wxAppBase)
 };
 
     DECLARE_NO_COPY_CLASS(wxAppBase)
 };


@@ -593,7 +620,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__)


@@ -621,7 +648,7 @@ protected:
 //
 // the cast is safe as in GUI build we only use wxApp, not wxAppConsole, and in
 // console mode it does nothing at all
 //
 // the cast is safe as in GUI build we only use wxApp, not wxAppConsole, and in
 // console mode it does nothing at all

-#define wxTheApp wx_static_cast(wxApp*, wxApp::GetInstance())
+#define wxTheApp static_cast<wxApp*>(wxApp::GetInstance())

 
 // ----------------------------------------------------------------------------
 // global functions
 
 // ----------------------------------------------------------------------------
 // global functions


@@ -631,13 +658,20 @@ protected:
 // ------------------------------------------------------
 
 // Force an exit from main loop
 // ------------------------------------------------------
 
 // Force an exit from main loop

-extern void WXDLLIMPEXP_BASE wxExit();
+WXDLLIMPEXP_BASE void 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
 
 // Yield to other apps/messages

-extern bool WXDLLIMPEXP_BASE wxYield();
+WXDLLIMPEXP_CORE bool wxYield();
+
+#endif // wx_YIELD_DECLARED

 
 // Yield to other apps/messages
 
 // Yield to other apps/messages

-extern void WXDLLIMPEXP_BASE wxWakeUpIdle();
+WXDLLIMPEXP_BASE void wxWakeUpIdle();

 
 // ----------------------------------------------------------------------------
 // macros for dynamic creation of the application object
 
 // ----------------------------------------------------------------------------
 // macros for dynamic creation of the application object


@@ -691,7 +725,7 @@ public:
     wxAppInitializer                                                        \
         wxTheAppInitializer((wxAppInitializerFunction) wxCreateApp);        \
     DECLARE_APP(appname)                                                    \
     wxAppInitializer                                                        \
         wxTheAppInitializer((wxAppInitializerFunction) wxCreateApp);        \
     DECLARE_APP(appname)                                                    \

-    appname& wxGetApp() { return *wx_static_cast(appname*, wxApp::GetInstance()); }
+    appname& wxGetApp() { return *static_cast<appname*>(wxApp::GetInstance()); }

 
 // Same as IMPLEMENT_APP() normally but doesn't include themes support in
 // wxUniversal builds
 
 // Same as IMPLEMENT_APP() normally but doesn't include themes support in
 // wxUniversal builds