From b6f96ca48bc156898df79deba63d270b393fb150 Mon Sep 17 00:00:00 2001
From: Thales1330 <thaleslima.ufu@gmail.com>
Date: Thu, 5 Jan 2017 19:31:28 -0200
Subject: Text bugs fixed

---
 Project/main.cpp | 42 ++++++++++++++++--------------------------
 1 file changed, 16 insertions(+), 26 deletions(-)

(limited to 'Project/main.cpp')

diff --git a/Project/main.cpp b/Project/main.cpp
index 106ca82..515b433 100644
--- a/Project/main.cpp
+++ b/Project/main.cpp
@@ -8,42 +8,32 @@
 // Define the MainApp
 class MainApp : public wxApp
 {
-   public:
+public:
     MainApp() {}
     virtual ~MainApp() {}
     void LoadCatalogs(wxLocale* locale)
     {
-		locale->Init(
-			locale->GetSystemLanguage(),
-			wxLOCALE_DONT_LOAD_DEFAULT);  // captura as propriedades locais do computador (idioma, numeração, etc...)
-
-		wxString langPath = wxStandardPaths::Get().GetExecutablePath();
-		// remove o nome do executável
-		for(int i = langPath.size(); i >= 0; i--) {
-			if(langPath[i] == '/' || langPath[i] == '\\') {
-				langPath.Truncate(i + 1);
-				break;
-				}
-			}
-		langPath += wxT("data\\lang");
-
-		locale->AddCatalogLookupPathPrefix(langPath);
-		// Carregar catálogos de tradução
-		locale->AddCatalog(wxT("pt_BR"), wxLANGUAGE_PORTUGUESE_BRAZILIAN);
+        // Load computer settings.
+        locale->Init(locale->GetSystemLanguage(), wxLOCALE_DONT_LOAD_DEFAULT);
+
+        wxFileName fn(wxStandardPaths::Get().GetExecutablePath());
+        wxString langPath = fn.GetPath() + "\\..\\data\\lang";
+        locale->AddCatalogLookupPathPrefix(langPath);
+        // Load translation catalogs.
+        locale->AddCatalog(wxT("pt_BR"), wxLANGUAGE_PORTUGUESE_BRAZILIAN);
     }
 
     virtual bool OnInit()
     {
-		// Add the common image handlers
-		wxImage::AddHandler(new wxPNGHandler);
-		wxImage::AddHandler(new wxJPEGHandler);
+        // Add png image handler
+        wxImage::AddHandler(new wxPNGHandler);
 
-		wxLocale* locale = new wxLocale();
-		LoadCatalogs(locale);
+        wxLocale* locale = new wxLocale();
+        LoadCatalogs(locale);
 
-		MainFrame* mainFrame = new MainFrame(NULL, locale);
-		SetTopWindow(mainFrame);
-		return GetTopWindow()->Show();
+        MainFrame* mainFrame = new MainFrame(NULL, locale);
+        SetTopWindow(mainFrame);
+        return GetTopWindow()->Show();
     }
 };
 
-- 
cgit