diff --git a/build/wxExtend.props b/build/wxExtend.props new file mode 100644 index 0000000..08b2b3e --- /dev/null +++ b/build/wxExtend.props @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/build/wxExtend.vcxproj b/build/wxExtend.vcxproj index 0845e5b..d6f4265 100644 --- a/build/wxExtend.vcxproj +++ b/build/wxExtend.vcxproj @@ -20,6 +20,7 @@ + Create Create @@ -29,6 +30,7 @@ + @@ -66,21 +68,25 @@ + + + + diff --git a/build/wxExtend.vcxproj.filters b/build/wxExtend.vcxproj.filters index ec75aac..7f2eee1 100644 --- a/build/wxExtend.vcxproj.filters +++ b/build/wxExtend.vcxproj.filters @@ -21,6 +21,9 @@ Source Files + + Source Files + @@ -32,5 +35,8 @@ Header Files + + Header Files + \ No newline at end of file diff --git a/include/wxex/appbar.h b/include/wxex/appbar.h index 2f2cd0a..bae751f 100644 --- a/include/wxex/appbar.h +++ b/include/wxex/appbar.h @@ -24,6 +24,7 @@ #include #include +#include #define wxABT_AUTOHIDETIMERID 1 diff --git a/include/wxex/appex.h b/include/wxex/appex.h new file mode 100644 index 0000000..7b08537 --- /dev/null +++ b/include/wxex/appex.h @@ -0,0 +1,42 @@ +/* + Copyright 2016 Amebis + + This file is part of wxExtend. + + wxExtend is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + wxExtend is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with wxExtend. If not, see . +*/ + +#pragma once + +#include +#include + + +/// +/// Extended application +/// +class wxAppEx : public wxApp +{ +public: + /// + /// Called when application initializes. + /// + /// \returns + /// - true if initialization succeeded + /// - false otherwise + virtual bool OnInit(); + +protected: + wxLocale m_locale; ///< Current locale +}; diff --git a/src/appbar.cpp b/src/appbar.cpp index 8d76148..acc2c3f 100644 --- a/src/appbar.cpp +++ b/src/appbar.cpp @@ -1,5 +1,6 @@ /* Copyright 2016 Amebis + Based on code written by Jeffrey Richter. This file is part of wxExtend. diff --git a/src/appex.cpp b/src/appex.cpp new file mode 100644 index 0000000..9ec22d8 --- /dev/null +++ b/src/appex.cpp @@ -0,0 +1,41 @@ +/* + Copyright 2016 Amebis + + This file is part of wxExtend. + + wxExtend is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + wxExtend is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with wxExtend. If not, see . +*/ + +#include "stdafx.h" + + +////////////////////////////////////////////////////////////////////////// +// wxAppEx +////////////////////////////////////////////////////////////////////////// + +bool wxAppEx::OnInit() +{ + if (!wxApp::OnInit()) + return false; + + if (wxLocale::IsAvailable(wxLANGUAGE_SLOVENIAN)) { + wxString sPath(wxPathOnly(argv[0])); + sPath << wxT("\\..\\locale"); + m_locale.AddCatalogLookupPathPrefix(sPath); + wxVERIFY(m_locale.Init(wxLANGUAGE_SLOVENIAN)); + wxVERIFY(m_locale.AddCatalog(wxT("ZRCola"))); + } + + return true; +} diff --git a/src/stdafx.h b/src/stdafx.h index e2693c8..439ed65 100644 --- a/src/stdafx.h +++ b/src/stdafx.h @@ -19,9 +19,13 @@ #pragma once +// Since including introduces wrong include order in 3.0.2, +// include the grand at a cost of longer pre-compilation phase. +#include + #include "../include/wxex/appbar.h" +#include "../include/wxex/appex.h" #include "../include/wxex/common.h" #include -#include