added Next/PrevControlId

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

diff --git a/include/wx/msw/app.h b/include/wx/msw/app.h
index 4b17c47a422eb96836f1e36ad0eb073e667b5e9d..85a0e6cd34f64734aafd3daa6aef0f5f78c4414f 100644 (file)
--- a/include/wx/msw/app.h
+++ b/include/wx/msw/app.h
@@ -18,6 +18,7 @@
 
 #include "wx/defs.h"
 #include "wx/object.h"
 
 #include "wx/defs.h"
 #include "wx/object.h"

+#include "wx/event.h"

 
 class WXDLLEXPORT wxFrame;
 class WXDLLEXPORT wxWindow;
 
 class WXDLLEXPORT wxFrame;
 class WXDLLEXPORT wxWindow;


@@ -57,7 +58,7 @@ class WXDLLEXPORT wxApp: public wxEvtHandler
   void OnEndSession(wxCloseEvent& event);
   void OnQueryEndSession(wxCloseEvent& event);
 
   void OnEndSession(wxCloseEvent& event);
   void OnQueryEndSession(wxCloseEvent& event);
 

-// Generic
+  // Generic

   virtual bool OnInit() { return FALSE; };
 
   // No specific tasks to do here.
   virtual bool OnInit() { return FALSE; };
 
   // No specific tasks to do here.


@@ -67,14 +68,18 @@ class WXDLLEXPORT wxApp: public wxEvtHandler
   virtual int OnRun() { return MainLoop(); };
   virtual int OnExit() { return 0; }
 
   virtual int OnRun() { return MainLoop(); };
   virtual int OnExit() { return 0; }
 

+  // called when a fatal exception occurs, this function should take care not
+  // to do anything which might provoke a nested exception!
+  virtual void OnFatalException() { }
+

   inline void SetPrintMode(int mode) { m_printMode = mode; }
   inline int GetPrintMode() const { return m_printMode; }
 
   inline void SetExitOnFrameDelete(bool flag) { m_exitOnFrameDelete = flag; }
   inline bool GetExitOnFrameDelete() const { return m_exitOnFrameDelete; }
 
   inline void SetPrintMode(int mode) { m_printMode = mode; }
   inline int GetPrintMode() const { return m_printMode; }
 
   inline void SetExitOnFrameDelete(bool flag) { m_exitOnFrameDelete = flag; }
   inline bool GetExitOnFrameDelete() const { return m_exitOnFrameDelete; }
 

-  inline wxString GetAppName() const {
-      if (m_appName != "")
+  inline const wxString& GetAppName() const {
+      if (m_appName != _T(""))

         return m_appName;
       else return m_className;
     }
         return m_appName;
       else return m_className;
     }


@@ -139,6 +144,9 @@ public:
   virtual bool ProcessMessage(WXMSG* pMsg);
   void DeletePendingObjects();
   bool ProcessIdle();
   virtual bool ProcessMessage(WXMSG* pMsg);
   void DeletePendingObjects();
   bool ProcessIdle();

+#if wxUSE_THREADS
+  void ProcessPendingEvents();
+#endif

   int GetComCtl32Version() const;
 
 public:
   int GetComCtl32Version() const;
 
 public: