Patch level : 10.0 196

Files correlati     : xvaga.dll
Ricompilazione Demo : [ ]
Commento            :
Aggiunto supporto per conteggio ed azzeramento dei menu Outlook


git-svn-id: svn://10.65.10.50/trunk@17926 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2008-12-17 11:40:23 +00:00
parent 6bc17bec40
commit fd12442304
5 changed files with 27 additions and 13 deletions

View File

@ -1047,12 +1047,6 @@ int OsWin32_GetSessionId()
return (int)session; return (int)session;
} }
//definito il valore della variabile intera SM_REMOTESESSION
// che non esiste per WINVER < 0x500
#ifndef SM_REMOTESESSION
#define SM_REMOTESESSION 0x1000
#endif
bool OsWin32_IsWindowsServer() bool OsWin32_IsWindowsServer()
{ {
return ::GetSystemMetrics(SM_REMOTESESSION) != 0; return ::GetSystemMetrics(SM_REMOTESESSION) != 0;
@ -1060,7 +1054,10 @@ bool OsWin32_IsWindowsServer()
void OsWin32_NumberFormat(char* str, int size) void OsWin32_NumberFormat(char* str, int size)
{ {
char buf[80]; if (str && *str)
{
char buf[80] = "";
::GetNumberFormat(LOCALE_USER_DEFAULT, 0, str, NULL, buf, sizeof(buf)); ::GetNumberFormat(LOCALE_USER_DEFAULT, 0, str, NULL, buf, sizeof(buf));
wxStrncpy(str, buf, size); wxStrncpy(str, buf, size);
} }
}

View File

@ -7,7 +7,7 @@
#define __WXMSW__ #define __WXMSW__
#define __WIN95__ #define __WIN95__
#define __WIN32__ #define __WIN32__
#define WINVER 0x0400 #define WINVER 0x0500
#define STRICT #define STRICT
#define WXUSINGDLL 1 #define WXUSINGDLL 1
#include <wx/wxprec.h> #include <wx/wxprec.h>

View File

@ -47,6 +47,7 @@ long _startup_style = 0;
wxString _startup_dir; wxString _startup_dir;
wxString _strDefaultStatbarText; wxString _strDefaultStatbarText;
wxString _appl_name; wxString _appl_name;
wxLocale* _locale = NULL;
static wxHashTable _nice_icons; static wxHashTable _nice_icons;
static XVT_ERRMSG_HANDLER _error_handler = NULL; static XVT_ERRMSG_HANDLER _error_handler = NULL;
@ -411,9 +412,9 @@ XVTDLL void xvt_app_pre_create(void)
xvt_fsys_get_default_dir(&dir); // Init Startup Directory xvt_fsys_get_default_dir(&dir); // Init Startup Directory
wxString strResPath = dir.path; strResPath += "/res"; wxString strResPath = dir.path; strResPath += "/res";
wxLocale* pLoc = new wxLocale(wxLANGUAGE_DEFAULT); // wxLANGUAGE_ITALIAN _locale = new wxLocale(wxLANGUAGE_DEFAULT); // wxLANGUAGE_ITALIAN
pLoc->AddCatalogLookupPathPrefix(strResPath); _locale->AddCatalogLookupPathPrefix(strResPath);
pLoc->AddCatalog("wxstd", wxLanguage(pLoc->GetLanguage()), NULL); _locale->AddCatalog("wxstd", wxLanguage(_locale->GetLanguage()), NULL);
::wxInitAllImageHandlers(); ::wxInitAllImageHandlers();
@ -559,6 +560,12 @@ void xvt_app_destroy(void)
#ifdef SPEECH_API #ifdef SPEECH_API
xvt_dm_enable_speech(0x00); xvt_dm_enable_speech(0x00);
#endif #endif
if (_locale != NULL)
{
delete _locale;
_locale = NULL;
}
} }
DRAW_CTOOLS* xvt_app_get_default_ctools(DRAW_CTOOLS *ct) DRAW_CTOOLS* xvt_app_get_default_ctools(DRAW_CTOOLS *ct)

View File

@ -216,6 +216,7 @@ XVTDLL int xvt_list_add_item(WINDOW win, short icon, const char* text, int f
XVTDLL BOOLEAN xvt_list_clear(WINDOW win); XVTDLL BOOLEAN xvt_list_clear(WINDOW win);
XVTDLL BOOLEAN xvt_list_get_sel_index(WINDOW win); XVTDLL BOOLEAN xvt_list_get_sel_index(WINDOW win);
XVTDLL BOOLEAN xvt_list_set_sel(WINDOW win, int index, BOOLEAN select); XVTDLL BOOLEAN xvt_list_set_sel(WINDOW win, int index, BOOLEAN select);
XVTDLL int xvt_list_count(WINDOW win);
XVTDLL DATA_PTR xvt_mem_alloc(size_t size); XVTDLL DATA_PTR xvt_mem_alloc(size_t size);
XVTDLL void xvt_mem_free(DATA_PTR p); XVTDLL void xvt_mem_free(DATA_PTR p);

View File

@ -1483,6 +1483,15 @@ BOOLEAN xvt_list_set_sel(WINDOW win, int index, BOOLEAN select)
return olb != NULL; return olb != NULL;
} }
int xvt_list_count(WINDOW win)
{
int n = 0;
TwxOutlookBar* olb = wxDynamicCast((wxObject*)win, TwxOutlookBar);
if (olb != NULL)
n = olb->GetItemCount();
return n;
}
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
// ToolBar // ToolBar
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////