From 6891792fce14dc4f7aa31946d6cf19f509249e50 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Mon, 14 Mar 2016 15:56:02 +0100 Subject: [PATCH] wxAppEx class removed --- build/wxExtend.vcxproj | 2 -- build/wxExtend.vcxproj.filters | 6 ----- include/wxex/appex.h | 44 ---------------------------------- src/appex.cpp | 41 ------------------------------- src/stdafx.h | 1 - 5 files changed, 94 deletions(-) delete mode 100644 include/wxex/appex.h delete mode 100644 src/appex.cpp diff --git a/build/wxExtend.vcxproj b/build/wxExtend.vcxproj index 4372cda..0bc58a7 100644 --- a/build/wxExtend.vcxproj +++ b/build/wxExtend.vcxproj @@ -20,7 +20,6 @@ - Create @@ -31,7 +30,6 @@ - diff --git a/build/wxExtend.vcxproj.filters b/build/wxExtend.vcxproj.filters index 9770a7f..5326fc7 100644 --- a/build/wxExtend.vcxproj.filters +++ b/build/wxExtend.vcxproj.filters @@ -25,9 +25,6 @@ Source Files - - Source Files - Source Files @@ -42,9 +39,6 @@ Header Files - - Header Files - Header Files diff --git a/include/wxex/appex.h b/include/wxex/appex.h deleted file mode 100644 index 2e5e479..0000000 --- a/include/wxex/appex.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - 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 "common.h" - -#include -#include - - -/// -/// Extended application -/// -class ZRCOLA_API 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/appex.cpp b/src/appex.cpp deleted file mode 100644 index 26aff8a..0000000 --- a/src/appex.cpp +++ /dev/null @@ -1,41 +0,0 @@ -/* - Copyright 2015-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("wxExtend"))); - } - - return true; -} diff --git a/src/stdafx.h b/src/stdafx.h index d3e333e..7ab1a0c 100644 --- a/src/stdafx.h +++ b/src/stdafx.h @@ -24,7 +24,6 @@ #include #include "../include/wxex/appbar.h" -#include "../include/wxex/appex.h" #include "../include/wxex/comutils.h" #include "../include/wxex/common.h"