From 0fc672d384bb1dd57711c5d3c88f98458c08ee9b Mon Sep 17 00:00:00 2001 From: Kiri Date: Wed, 12 Aug 2015 03:32:11 +0100 Subject: [PATCH] Added wxLocale lines and altered the code for checking the version required for Xestia Common Components. --- source/main.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/source/main.cpp b/source/main.cpp index ed4e656..249c5a7 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -26,19 +26,18 @@ IMPLEMENT_APP(XestiaABApp); bool XestiaABApp::OnInit() { - // Check that on Win32 systems that. + // Setup the locale. -#if defined(__WIN32__) + wxLocale locale; + locale.Init(wxLANGUAGE_DEFAULT, wxLOCALE_LOAD_DEFAULT); -#include +#if defined(__WIN32__) - XCCVer XCCRequiredVer; - XCCRequiredVer.MajorVer = 1; - XCCRequiredVer.MinorVer = 0; + // Check that the minimum version of Xestia Common Components is installed on the system. - XCCVer XCCRetrievedVer = GetXCCLibraryVersion(); +#include - if (XCCRetrievedVer < XCCRequiredVer){ + if (!CheckXCCVersion(1, 0, 0)){ MessageBox(0, L"The version of Xestia Common Components installed is an older version not supported by this version of Xestia Address Book.\n\nPlease visit http://xestia.co.uk/commoncomponents and follow the page instructions to download the version required.", L"Older version of Xestia Common Components installed", MB_OK|MB_ICONSTOP); this->Exit(); } -- 2.39.2