Pass the config object into the wxHtmlHelpFrame so it has the config

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

diff --git a/include/wx/app.h b/include/wx/app.h
index da16865843a7f11e0b0cd00782d590a939e18337..2f1ffac900dc0ed5193b14e0310f7019e15e32f5 100644 (file)
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -18,16 +18,9 @@
 // ----------------------------------------------------------------------------
 
 #include "wx/event.h"       // for the base class
-
-#if wxUSE_GUI
-    #include "wx/window.h"  // for wxTopLevelWindows
-
-    #include "wx/vidmode.h"
-#endif // wxUSE_GUI
-
 #include "wx/build.h"
 #include "wx/init.h"        // we must declare wxEntry()
-#include "wx/intl.h"
+#include "wx/intl.h"        // for wxLayoutDirection
 
 class WXDLLIMPEXP_BASE wxAppConsole;
 class WXDLLIMPEXP_BASE wxAppTraits;
@@ -37,6 +30,7 @@ class WXDLLIMPEXP_BASE wxMessageOutput;
 
 #if wxUSE_GUI
     class WXDLLEXPORT wxEventLoop;
+    struct WXDLLIMPEXP_CORE wxVideoMode;
 #endif
 
 // ----------------------------------------------------------------------------
@@ -114,9 +108,6 @@ public:
     // Called from wxExit() function, should terminate the application a.s.a.p.
     virtual void Exit();
 
-    // Return the layout direction for the current locale
-    virtual wxLayoutDirection GetLayoutDirection() const;
-
 
     // application info: name, description, vendor
     // -------------------------------------------
@@ -447,15 +438,7 @@ public:
         // return the "main" top level window (if it hadn't been set previously
         // with SetTopWindow(), will return just some top level window and, if
         // there are none, will return NULL)
-    virtual wxWindow *GetTopWindow() const
-    {
-        if (m_topWindow)
-            return m_topWindow;
-        else if (wxTopLevelWindows.GetCount() > 0)
-            return wxTopLevelWindows.GetFirst()->GetData();
-        else
-            return (wxWindow *)NULL;
-    }
+    virtual wxWindow *GetTopWindow() const;
 
         // control the exit behaviour: by default, the program will exit the
         // main loop (and so, usually, terminate) when the last top-level
@@ -473,7 +456,7 @@ public:
 
         // Get display mode that is used use. This is only used in framebuffer
         // wxWin ports (such as wxMGL or wxDFB).
-    virtual wxVideoMode GetDisplayMode() const { return wxVideoMode(); }
+    virtual wxVideoMode GetDisplayMode() const;
         // Set display mode to use. This is only used in framebuffer wxWin
         // ports (such as wxMGL or wxDFB). This method should be called from
         // wxApp::OnInitGui
@@ -490,6 +473,10 @@ public:
     virtual void SetPrintMode(int WXUNUSED(mode)) { }
     int GetPrintMode() const { return wxPRINT_POSTSCRIPT; }
 
+    // Return the layout direction for the current locale or wxLayout_Default
+    // if it's unknown
+    virtual wxLayoutDirection GetLayoutDirection() const;
+
 
     // command line parsing (GUI-specific)
     // ------------------------------------------------------------------------
@@ -607,7 +594,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
-#define wxTheApp ((wxApp *)wxApp::GetInstance())
+#define wxTheApp wx_static_cast(wxApp*, wxApp::GetInstance())
 
 // ----------------------------------------------------------------------------
 // global functions
@@ -655,9 +642,12 @@ public:
 #ifdef __WXUNIVERSAL__
     #include "wx/univ/theme.h"
 
-    #define IMPLEMENT_WX_THEME_SUPPORT \
-        WX_USE_THEME(win32); \
-        WX_USE_THEME(gtk);
+    #ifdef wxUNIV_DEFAULT_THEME
+        #define IMPLEMENT_WX_THEME_SUPPORT \
+            WX_USE_THEME(wxUNIV_DEFAULT_THEME);
+    #else
+        #define IMPLEMENT_WX_THEME_SUPPORT
+    #endif
 #else
     #define IMPLEMENT_WX_THEME_SUPPORT
 #endif
@@ -674,7 +664,7 @@ public:
     wxAppInitializer                                                        \
         wxTheAppInitializer((wxAppInitializerFunction) wxCreateApp);        \
     DECLARE_APP(appname)                                                    \
-    appname& wxGetApp() { return *(appname *)wxTheApp; }
+    appname& wxGetApp() { return *wx_static_cast(appname*, wxApp::GetInstance()); }
 
 // Same as IMPLEMENT_APP() normally but doesn't include themes support in
 // wxUniversal builds