Don't infinitely recurse when setting the child focus. Without

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

diff --git a/include/wx/app.h b/include/wx/app.h
index 220c68a12849f2a24127109962d72cefd1ac2ee7..ccc781568e35f504548bb9f2a43f7f33e2136d3e 100644 (file)
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -21,6 +21,8 @@
 
 #if wxUSE_GUI
     #include "wx/window.h"  // for wxTopLevelWindows
+
+    #include "wx/vidmode.h"
 #endif // wxUSE_GUI
 
 #include "wx/build.h"
@@ -59,33 +61,6 @@ enum
     wxPRINT_POSTSCRIPT = 2
 };
 
-// ----------------------------------------------------------------------------
-// support for framebuffer ports
-// ----------------------------------------------------------------------------
-
-#if wxUSE_GUI
-// VS: Fullscreen/framebuffer application needs to choose display mode prior
-//     to wxWindows initialization. This class holds information about display
-//     mode. It is used by  wxApp::Set/GetDisplayMode.
-class WXDLLIMPEXP_CORE wxDisplayModeInfo
-{
-public:
-    wxDisplayModeInfo() : m_ok(FALSE) {}
-    wxDisplayModeInfo(unsigned width, unsigned height, unsigned depth)
-        : m_width(width), m_height(height), m_depth(depth), m_ok(TRUE) {}
-
-    unsigned GetWidth() const { return m_width; }
-    unsigned GetHeight() const { return m_height; }
-    unsigned GetDepth() const { return m_depth; }
-    bool IsOk() const { return m_ok; }
-
-private:
-    unsigned m_width, m_height, m_depth;
-    bool     m_ok;
-};
-#endif // wxUSE_GUI
-
-
 // ----------------------------------------------------------------------------
 // wxAppConsole: wxApp for non-GUI applications
 // ----------------------------------------------------------------------------
@@ -141,6 +116,20 @@ public:
     // crash.
     virtual void OnFatalException() { }
 
+#if wxUSE_EXCEPTIONS
+    // function called if an uncaught exception is caught inside the main
+    // event loop: it may return true to continue running the event loop or
+    // false to stop it (in the latter case it may rethrow the exception as
+    // well)
+    virtual bool OnExceptionInMainLoop() { throw; }
+
+    // Called when an unhandled C++ exception occurs inside OnRun(): note that
+    // the exception type is lost by now, so if you really want to handle the
+    // exception you should override OnRun() and put a try/catch around
+    // MainLoop() call there
+    virtual void OnUnhandledException() { }
+#endif // wxUSE_EXCEPTIONS
+
     // Called from wxExit() function, should terminate the application a.s.a.p.
     virtual void Exit();
 
@@ -239,6 +228,17 @@ public:
     // had been already processed or won't be processed at all, respectively
     virtual int FilterEvent(wxEvent& event);
 
+#if wxUSE_EXCEPTIONS
+    // call the specified handler on the given object with the given event
+    //
+    // this method only exists to allow catching the exceptions thrown by any
+    // event handler, it would lead to an extra (useless) virtual function call
+    // if the exceptions were not used, so it doesn't even exist in that case
+    virtual void HandleEvent(wxEvtHandler *handler,
+                             wxEventFunction func,
+                             wxEvent& event) const;
+#endif // wxUSE_EXCEPTIONS
+
     // process all events in the wxPendingEvents 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
@@ -386,10 +386,6 @@ public:
         // stop the program immediately!)
     virtual void ExitMainLoop();
 
-        // returns true if the program is initialized, i.e. OnInit() has been
-        // completed successfully
-    virtual bool Initialized() = 0;
-
         // returns TRUE if there are unprocessed events in the event queue
     virtual bool Pending();
 
@@ -463,11 +459,11 @@ public:
 
         // Get display mode that is used use. This is only used in framebuffer
         // wxWin ports (such as wxMGL).
-    virtual wxDisplayModeInfo GetDisplayMode() const { return wxDisplayModeInfo(); }
+    virtual wxVideoMode GetDisplayMode() const { return wxVideoMode(); }
         // Set display mode to use. This is only used in framebuffer wxWin
         // ports (such as wxMGL). This method should be called from
         // wxApp::OnInitGui
-    virtual bool SetDisplayMode(const wxDisplayModeInfo& WXUNUSED(info)) { return TRUE; }
+    virtual bool SetDisplayMode(const wxVideoMode& WXUNUSED(info)) { return TRUE; }
 
         // set use of best visual flag (see below)
     void SetUseBestVisual( bool flag ) { m_useBestVisual = flag; }
@@ -497,6 +493,11 @@ public:
     // deactivated
     virtual void SetActive(bool isActive, wxWindow *lastFocus);
 
+    // OBSOLETE: don't use, always returns true
+    //
+    // returns true if the program is successfully initialized
+    bool Initialized() { return true; }
+
 
 protected:
     // delete all objects in wxPendingDelete list
@@ -626,20 +627,26 @@ public:
     // we need HINSTANCE declaration to define WinMain()
     #include "wx/msw/wrapwin.h"
 
-    #ifdef SW_SHOWNORMAL
-    #define wxSW_SHOWNORMAL SW_SHOWNORMAL
+    #ifndef SW_SHOWNORMAL
+        #define SW_SHOWNORMAL 1
+    #endif
+
+    // WinMain() is always ANSI, even in Unicode build, under normal Windows
+    // but is always Unicode under CE
+    #ifdef __WXWINCE__
+        typedef wchar_t *wxCmdLineArgType;
     #else
-    #define wxSW_SHOWNORMAL 0
+        typedef char *wxCmdLineArgType;
     #endif
 
     #define IMPLEMENT_WXWIN_MAIN \
         extern int wxEntry(HINSTANCE hInstance,                               \
                            HINSTANCE hPrevInstance = NULL,                    \
-                           char *pCmdLine = NULL,                             \
-                           int nCmdShow = wxSW_SHOWNORMAL);                         \
+                           wxCmdLineArgType pCmdLine = NULL,                  \
+                           int nCmdShow = SW_SHOWNORMAL);                     \
         extern "C" int WINAPI WinMain(HINSTANCE hInstance,                    \
                                       HINSTANCE hPrevInstance,                \
-                                      char *lpCmdLine,                        \
+                                      wxCmdLineArgType lpCmdLine,             \
                                       int nCmdShow)                           \
         {                                                                     \
             return wxEntry(hInstance, hPrevInstance, lpCmdLine, nCmdShow);    \