diff --git a/include/wx/app.h b/include/wx/app.h index 39e3f93c74..2f1ffac900 100644 --- a/include/wx/app.h +++ b/include/wx/app.h @@ -108,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 // ------------------------------------------- @@ -476,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) // ------------------------------------------------------------------------ diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp index d727ffeafd..697aa2dd87 100644 --- a/src/common/appbase.cpp +++ b/src/common/appbase.cpp @@ -215,24 +215,6 @@ void wxAppConsole::Exit() exit(-1); } -wxLayoutDirection wxAppConsole::GetLayoutDirection() const -{ -#if wxUSE_INTL - const wxLocale *const locale = wxGetLocale(); - if ( locale ) - { - const wxLanguageInfo *const - info = wxLocale::GetLanguageInfo(locale->GetLanguage()); - - if ( info ) - return info->LayoutDirection; - } -#endif // wxUSE_INTL - - // we don't know - return wxLayout_Default; -} - // ---------------------------------------------------------------------------- // traits stuff // ---------------------------------------------------------------------------- diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp index fb02e6b93d..44c63efd1a 100644 --- a/src/common/appcmn.cpp +++ b/src/common/appcmn.cpp @@ -157,6 +157,8 @@ void wxAppBase::CleanUp() #endif // wxUSE_THREADS } +// ---------------------------------------------------------------------------- +// various accessors // ---------------------------------------------------------------------------- wxWindow* wxAppBase::GetTopWindow() const @@ -172,6 +174,24 @@ wxVideoMode wxAppBase::GetDisplayMode() const return wxVideoMode(); } +wxLayoutDirection wxAppBase::GetLayoutDirection() const +{ +#if wxUSE_INTL + const wxLocale *const locale = wxGetLocale(); + if ( locale ) + { + const wxLanguageInfo *const + info = wxLocale::GetLanguageInfo(locale->GetLanguage()); + + if ( info ) + return info->LayoutDirection; + } +#endif // wxUSE_INTL + + // we don't know + return wxLayout_Default; +} + #if wxUSE_CMDLINE_PARSER // ----------------------------------------------------------------------------