From 06b41b506bccbddcdca6479525c60f8fdf2e1735 Mon Sep 17 00:00:00 2001
From: guy <guy@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Tue, 16 Dec 2008 14:47:30 +0000
Subject: [PATCH] Patch level         : 10.0 Files correlati     : xvaga,dll
 Ricompilazione Demo : [ ] Commento            : Supporto per lingua italiana
 nei bottoni standard

git-svn-id: svn://10.65.10.50/trunk@17917 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 xvaga/xvaga.cpp  | 14 ++++++++++----
 xvaga/xvt.h      |  2 +-
 xvaga/xvtwin.cpp |  6 ++++--
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/xvaga/xvaga.cpp b/xvaga/xvaga.cpp
index 0f9641ce7..b8fe829ed 100755
--- a/xvaga/xvaga.cpp
+++ b/xvaga/xvaga.cpp
@@ -407,10 +407,13 @@ void xvt_app_allow_quit(void)
 
 XVTDLL void xvt_app_pre_create(void)
 {
-  xvt_fsys_get_default_dir(NULL); // Init Startup Directory
+  DIRECTORY dir;
+  xvt_fsys_get_default_dir(&dir); // Init Startup Directory
+  wxString strResPath = dir.path; strResPath += "/res";
 
-  wxLocale locale;
-  locale.Init(wxLocale::GetSystemLanguage());  // wxLANGUAGE_ITALIAN
+  wxLocale* pLoc = new wxLocale(wxLANGUAGE_DEFAULT); // wxLANGUAGE_ITALIAN
+  pLoc->AddCatalogLookupPathPrefix(strResPath);
+  pLoc->AddCatalog("wxstd", wxLanguage(pLoc->GetLanguage()), NULL);
 
  	::wxInitAllImageHandlers();
 
@@ -2373,15 +2376,18 @@ static wxString _strSavedir;
 
 void xvt_fsys_restore_dir()
 {
+  wxASSERT(!_strSavedir.IsEmpty());
 	::wxSetWorkingDirectory(_strSavedir);
+  _strSavedir = wxEmptyString;
 }
 
 void xvt_fsys_save_dir()
 {
+  wxASSERT(_strSavedir.IsEmpty());
 	_strSavedir = ::wxGetCwd();
 }
 
-BOOLEAN xvt_fsys_set_dir(DIRECTORY *dirp)
+BOOLEAN xvt_fsys_set_dir(const DIRECTORY *dirp)
 {
 	return ::wxSetWorkingDirectory(dirp->path);
 }
diff --git a/xvaga/xvt.h b/xvaga/xvt.h
index df9677073..61e0b9533 100755
--- a/xvaga/xvt.h
+++ b/xvaga/xvt.h
@@ -171,7 +171,7 @@ XVTDLL SLIST    xvt_fsys_list_files(const char *type, const char *pat, BOOLEAN d
 XVTDLL BOOLEAN  xvt_fsys_parse_pathname (const char *mbs, char *volname, char *dirname, char *leafroot, char *leafext, char *leafvers);
 XVTDLL void     xvt_fsys_restore_dir();
 XVTDLL void     xvt_fsys_save_dir();
-XVTDLL BOOLEAN  xvt_fsys_set_dir(DIRECTORY *dirp);
+XVTDLL BOOLEAN  xvt_fsys_set_dir(const DIRECTORY* dirp);
 XVTDLL long     xvt_fsys_get_file_attr(const FILE_SPEC *fs, long attr); // Place older
 // Added by Guy
 XVTDLL unsigned long  xvt_fsys_get_disk_size(const char* path, char unit);
diff --git a/xvaga/xvtwin.cpp b/xvaga/xvtwin.cpp
index fe39e6f2d..ab275586a 100755
--- a/xvaga/xvtwin.cpp
+++ b/xvaga/xvtwin.cpp
@@ -117,12 +117,14 @@ void TwxCaret::Toggle()
 
 void xvt_win_set_caret_size(WINDOW win, int width, int height)
 {
-	_TheCaret.SetSize(width, height);
+  if (win != NULL_WIN)
+	  _TheCaret.SetSize(width, height);
 }
 
 void xvt_win_set_caret_pos(WINDOW win, PNT p)
 {
-	_TheCaret.SetPos(p.h, p.v-1);
+  if (win != NULL_WIN)
+	  _TheCaret.SetPos(p.h, p.v-1);
 }
 
 void xvt_win_set_caret_visible(WINDOW win, BOOLEAN on)