root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level : 10.0

Browse Source 
Files correlati     : xvaga.dll
Ricompilazione Demo : [ ]
Commento            :
Eliminati alcuni innocui ma fastidiosi warning di compilazione


git-svn-id: svn://10.65.10.50/trunk@17786 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2008-12-03 12:07:57 +00:00
parent 36d430f5dc
commit 0cc5a6b35f
2 changed files with 27 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
xvaga/oswin32.cpp
View File

@ -90,8 +90,8 @@ struct XvtData
int CALLBACK FamilyEnumerator(
const LOGFONT *plf, // pointer to logical-font data
const TEXTMETRIC *lpntme, // pointer to physical-font data
unsigned long FontType, // type of font
const TEXTMETRIC * WXUNUSED(lpntme), // pointer to physical-font data
unsigned long WXUNUSED(FontType), // type of font
LPARAM lParam // application-defined data
)
{
@ -100,14 +100,14 @@ int CALLBACK FamilyEnumerator(
int i;
for (i = n-1; i >= 0 && wxStricmp(d->families[i], plf->lfFaceName); i--);
if (i < 0) // Controlla che il nome del font non ci sia gia'
d->families[n++] = _strdup(plf->lfFaceName);
d->families[n++] = wxStrdup(plf->lfFaceName);
return n < d->max_count;
}
int CALLBACK SizeEnumerator(
const LOGFONT *plf, // pointer to logical-font data
const TEXTMETRIC *lpntme, // pointer to physical-font data
unsigned long FontType, // type of font
unsigned long WXUNUSED(FontType), // type of font
LPARAM lParam // application-defined data
)
{
@ -480,7 +480,7 @@ static wxString FindHelpFile(const char* topic)
return str;
}
int OsWin32_Help(WXHWND handle, const char* hlp, unsigned int cmd, const char* topic)
int OsWin32_Help(WXHWND handle, const char* WXUNUSED(hlp), unsigned int cmd, const char* topic)
{
wxString str;
switch(cmd)
@ -622,7 +622,7 @@ unsigned int OsWin32_FindMenuContainer()
return (unsigned int)w._hwnd;
}
static BOOL CALLBACK CountChildrenProc(HWND hwnd, LPARAM lParam)
static BOOL CALLBACK CountChildrenProc(HWND WXUNUSED(hwnd), LPARAM lParam)
{
if (lParam)
{
@ -674,7 +674,7 @@ static BOOL CALLBACK CloseSiblingProc(HWND hwnd, LPARAM lParam)
return TRUE;
}
void OsWin32_CloseSiblings(unsigned int parent)
void OsWin32_CloseSiblings(unsigned int WXUNUSED(parent))
{
// NON FUNZIONA!!!!!!!!!!!!!!!!!!!!!!!!!!!
// ::EnumWindows(CloseSiblingProc, parent);

57
xvaga/xvaga.cpp
View File

@ -3,7 +3,6 @@
#include <wx/clipbrd.h>
#include <wx/calctrl.h>
#include <wx/colordlg.h>
#include <wx/confbase.h>
#include <wx/dialup.h>
#include <wx/fileconf.h>
#include <wx/filename.h>
@ -193,11 +192,12 @@ void xvt_sys_sorry_box(const char* func, const char* file, int line)
void xvt_sys_deprecated_box(const char* func, const char* file, int line)
{
static wxHashTable deprecated;
wxString strKey; strKey << file << ':' << line;
if (deprecated.Get(strKey) == NULL)
if (deprecated.Get(func) == NULL)
{
deprecated.Put(strKey, &deprecated); // Dummy
const wxString strMessage = wxString::Format("Function %s in file %s at line %d is deprecated:\nYou can blame Guy for this, if you're bold enough!", func, file, line);
deprecated.Put(func, &deprecated); // Dummy
wxString strMessage;
strMessage.Printf("Function %s in file %s at line %d is deprecated:\nYou can blame Guy for this, if you're bold enough!",
func, file, line);
_MessageBox(strMessage, wxOK | wxICON_WARNING);
}
}
@ -284,7 +284,7 @@ const wxIcon& _GetIconResource(int rid)
const wxCursor* GetCursorResource(int rid)
{
static wxHashTable _nice_cursors;
wxCursor* cursor = wxDynamicCast(_nice_cursors.Get(rid), wxCursor);
const wxCursor* cursor = wxDynamicCast(_nice_cursors.Get(rid), wxCursor);
if (cursor == NULL)
{
switch (rid)
@ -313,9 +313,9 @@ const wxCursor* GetCursorResource(int rid)
if (cursor == NULL)
{
XVT_ASSERT(false);
cursor = (wxCursor*)wxSTANDARD_CURSOR;
cursor = wxSTANDARD_CURSOR;
}
_nice_cursors.Put(rid, cursor);
_nice_cursors.Put(rid, (wxCursor*)cursor);
}
return cursor;
}
@ -415,8 +415,10 @@ XVTDLL void xvt_app_pre_create(void)
::wxInitAllImageHandlers();
#ifdef WIN32
if (wxTheApp->GetComCtl32Version() >= 600 && ::wxDisplayDepth() >= 32)
if (::wxDisplayDepth() >= 32 && wxTheApp->GetComCtl32Version() >= 600)
wxSystemOptions::SetOption(wxT("msw.remap"), 2);
else
wxSystemOptions::SetOption(wxT("msw.remap"), 0);
#endif
#ifdef SPEECH_API
@ -424,7 +426,7 @@ XVTDLL void xvt_app_pre_create(void)
#endif
}
void xvt_app_create(int argc, char **argv, unsigned long flags,
void xvt_app_create(int argc, char **argv, unsigned long WXUNUSED(flags),
EVENT_HANDLER eh, XVT_CONFIG *config)
{
_task_win_handler = eh;
@ -440,14 +442,6 @@ void xvt_app_create(int argc, char **argv, unsigned long flags,
bool bHasMenu = true, bCanChangeFirm = true;
#ifdef WIN32
if (wxTheApp->GetComCtl32Version() >= 600 && ::wxDisplayDepth() >= 32)
{
wxSystemOptions::SetOption(wxT("msw.display.directdraw"), 1);
wxSystemOptions::SetOption(wxT("msw.remap"), 2);
}
else
wxSystemOptions::SetOption(wxT("msw.remap"), 0);
HWND hwndParent = (HWND)OsWin32_FindMenuContainer();
if (hwndParent != NULL)
{
@ -633,17 +627,17 @@ char* xvt_cb_get_data(CB_FORMAT cbfmt, char *name, long *sizep)
return NULL;
}
BOOLEAN xvt_cb_has_format(CB_FORMAT fmt, char *name)
BOOLEAN xvt_cb_has_format(CB_FORMAT fmt, char* WXUNUSED(name))
{
return (fmt == CB_TEXT) && wxTheClipboard->IsSupported(wxDF_TEXT);
}
BOOLEAN xvt_cb_open(BOOLEAN writing)
BOOLEAN xvt_cb_open(BOOLEAN WXUNUSED(writing))
{
return wxTheClipboard->Open();
}
BOOLEAN xvt_cb_put_data(CB_FORMAT cbfmt, char *name, long size, PICTURE pic)
BOOLEAN xvt_cb_put_data(CB_FORMAT cbfmt, char* WXUNUSED(name), long WXUNUSED(size), PICTURE WXUNUSED(pic))
{
BOOLEAN ok = cbfmt == CB_TEXT && ptrClipboardData != NULL;
if (ok)
@ -685,17 +679,15 @@ BOOLEAN xvt_dongle_hl_crypt(unsigned short* data) // Array di 4 words (8 bytes)
#else
return OsLinux_HL_Crypt(data);
#endif
return FALSE;
}
BOOLEAN xvt_dongle_hl_login(unsigned short address, const unsigned char* label, const unsigned char* password)
{
#ifdef WIN32
return OsWin32_HL_Login(address, label, password);
#else
#else
return OsLinux_HL_Login(address, label, password);
#endif
return FALSE;
}
BOOLEAN xvt_dongle_hl_logout()
@ -705,7 +697,6 @@ BOOLEAN xvt_dongle_hl_logout()
#else
return OsLinux_HL_Logout();
#endif
return TRUE;
}
BOOLEAN xvt_dongle_hl_read(unsigned short reg, unsigned short* data)
@ -715,7 +706,6 @@ BOOLEAN xvt_dongle_hl_read(unsigned short reg, unsigned short* data)
#else
return OsLinux_HL_Read(reg, data);
#endif
return FALSE;
}
BOOLEAN xvt_dongle_hl_read_block(unsigned char* data)
@ -725,7 +715,6 @@ BOOLEAN xvt_dongle_hl_read_block(unsigned char* data)
#else
return OsLinux_HL_ReadBlock(data);
#endif
return FALSE;
}
BOOLEAN xvt_dongle_hl_write(unsigned short reg, unsigned short data)
@ -735,7 +724,6 @@ BOOLEAN xvt_dongle_hl_write(unsigned short reg, unsigned short data)
#else
return OsLinux_HL_Write(reg, data);
#endif
return FALSE;
}
BOOLEAN xvt_dongle_sl_crypt(unsigned short* data)
@ -745,7 +733,6 @@ BOOLEAN xvt_dongle_sl_crypt(unsigned short* data)
#else
return OsLinux_SL_Crypt(data);
#endif
return FALSE;
}
BOOLEAN xvt_dongle_sl_login(const unsigned char* label, const unsigned char* password)
@ -755,7 +742,6 @@ BOOLEAN xvt_dongle_sl_login(const unsigned char* label, const unsigned char* pas
#else
return OsLinux_SL_Login(label, password);
#endif
return FALSE;
}
BOOLEAN xvt_dongle_sl_logout()
@ -765,7 +751,6 @@ BOOLEAN xvt_dongle_sl_logout()
#else
return OsLinux_SL_Logout();
#endif
return TRUE;
}
BOOLEAN xvt_dongle_sl_read_block(unsigned short reg, unsigned short size, unsigned short* data)
@ -775,7 +760,6 @@ BOOLEAN xvt_dongle_sl_read_block(unsigned short reg, unsigned short size, unsign
#else
return OsLinux_SL_ReadBlock(reg, size, data);
#endif
return FALSE;
}
BOOLEAN xvt_dongle_sl_write_block(unsigned short reg, unsigned short size, const unsigned short* data)
@ -785,7 +769,6 @@ BOOLEAN xvt_dongle_sl_write_block(unsigned short reg, unsigned short size, const
#else
return OsLinux_SL_WriteBlock(reg, size, data);
#endif
return FALSE;
}
///////////////////////////////////////////////////////////
@ -837,7 +820,7 @@ BEGIN_EVENT_TABLE(TwxCalendarDlg, wxDialog)
EVT_CALENDAR(wxID_ANY, TwxCalendarDlg::OnCalendar)
END_EVENT_TABLE()
void TwxCalendarDlg::OnCalendar(wxCalendarEvent& e)
void TwxCalendarDlg::OnCalendar(wxCalendarEvent& WXUNUSED(e))
{
wxCommandEvent evt(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
AddPendingEvent(evt);
@ -996,7 +979,7 @@ FL_STATUS xvt_dm_post_dir_sel(DIRECTORY *dir)
return FL_CANCEL;
}
BOOLEAN xvt_dm_post_font_sel(WINDOW win, XVT_FNTID font_id, PRINT_RCD *precp, unsigned long reserved)
BOOLEAN xvt_dm_post_font_sel(WINDOW win, XVT_FNTID font_id, PRINT_RCD* WXUNUSED(precp), unsigned long reserved)
{
CAST_FONT(font_id, font);
wxFontData data;
@ -1057,7 +1040,7 @@ struct XVAGA_HELP_INFO
bool m_hlp;
} help_info;
XVT_HELP_INFO xvt_help_open_helpfile(FILE_SPEC *fs, unsigned long flags)
XVT_HELP_INFO xvt_help_open_helpfile(FILE_SPEC* WXUNUSED(fs), unsigned long WXUNUSED(flags))
{
return (XVT_HELP_INFO)&help_info;
}
@ -3850,7 +3833,7 @@ unsigned long xvt_sys_get_free_memory()
unsigned long mem = 0;
if (::wxGetFreeMemory().GetHi())
mem = -1;
mem = (unsigned long)-1;
else
mem = ::wxGetFreeMemory().GetLo();