Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Warning fixes found under hardest mode of OpenWatcom. Seems clean in Borland, MinGW and DMC.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-10-05 15:38:40 +00:00
parent 908686c52e
commit 254a21292b
49 changed files with 721 additions and 792 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
demos/dbbrowse/browsedb.cpp
View File

@@ -252,7 +252,7 @@ bool BrowserDB::OnGetNext(int Cols,int WXUNUSED(Quiet))
{
case DB_DATA_TYPE_VARCHAR:
wxStrcpy(s_temp,_T(""));
if (!db_BrowserDB->GetData(i+1,(cl_BrowserDB+i)->pColFor->i_dbDataType,&s_temp,sizeof(s_temp), &cb))
if (!db_BrowserDB->GetData((UWORD)(i+1),(SWORD)((cl_BrowserDB+i)->pColFor->i_dbDataType),&s_temp[0],sizeof(s_temp), &cb))
{
Temp0.Printf(_("\n-E-> BrowserDB::OnGetNext - ODBC-Error with GetNext of >%s<.\n-E-> "),(cl_BrowserDB+i)->tableName);
Temp0 += GetExtendedDBErrorMsg(__TFILE__,__LINE__);
@@ -263,7 +263,7 @@ bool BrowserDB::OnGetNext(int Cols,int WXUNUSED(Quiet))
break;
case DB_DATA_TYPE_INTEGER:
l_temp = 0;
if (!db_BrowserDB->GetData(i+1,(cl_BrowserDB+i)->pColFor->i_sqlDataType,&l_temp,sizeof(l_temp), &cb))
if (!db_BrowserDB->GetData((UWORD)(i+1),(SWORD)((cl_BrowserDB+i)->pColFor->i_sqlDataType),&l_temp,sizeof(l_temp), &cb))
{
Temp0.Printf(_("\n-E-> BrowserDB::OnGetData - ODBC-Error with GetNext \n-E-> "));
Temp0 += GetExtendedDBErrorMsg(__TFILE__,__LINE__);
@@ -276,7 +276,7 @@ bool BrowserDB::OnGetNext(int Cols,int WXUNUSED(Quiet))
break;
case DB_DATA_TYPE_FLOAT:
f_temp = 0;
if (!db_BrowserDB->GetData(i+1,(cl_BrowserDB+i)->pColFor->i_sqlDataType,&f_temp,sizeof(f_temp), &cb))
if (!db_BrowserDB->GetData((UWORD)(i+1),(SWORD)((cl_BrowserDB+i)->pColFor->i_sqlDataType),&f_temp,sizeof(f_temp), &cb))
{
Temp0.Printf(_("\n-E-> BrowserDB::OnGetData - ODBC-Error with GetNext \n-E-> "));
Temp0 += GetExtendedDBErrorMsg(__TFILE__,__LINE__);
@@ -289,8 +289,14 @@ bool BrowserDB::OnGetNext(int Cols,int WXUNUSED(Quiet))
}
break;
case DB_DATA_TYPE_DATE:
t_temp.day = t_temp.month = t_temp.year = t_temp.hour = t_temp.minute = t_temp.second = t_temp.fraction = 0;
if (!db_BrowserDB->GetData(i+1,(cl_BrowserDB+i)->pColFor->i_sqlDataType,&t_temp,sizeof(t_temp), &cb))
t_temp.day = 0;
t_temp.month = 0;
t_temp.year = 0;
t_temp.hour = 0;
t_temp.minute = 0;
t_temp.second = 0;
t_temp.fraction = 0;
if (!db_BrowserDB->GetData((UWORD)(i+1),(SWORD)((cl_BrowserDB+i)->pColFor->i_sqlDataType),&t_temp,sizeof(t_temp), &cb))
{
Temp0.Printf(_("\n-E-> BrowserDB::OnGetData - ODBC-Error with GetNext \n-E-> "));
Temp0 += GetExtendedDBErrorMsg(__TFILE__,__LINE__);

12
demos/dbbrowse/tabpgwin.cpp
View File

@@ -50,12 +50,6 @@ twTabInfo::twTabInfo()
: mpContent( 0 )
{}
//---------------------------------------------------------------------------
twTabInfo::~twTabInfo()
{
// FOR NOW:: nothing
}
//---------------------------------------------------------------------------
int twTabInfo::ImgWidth()
{
@@ -721,12 +715,6 @@ wxPagedWindow::wxPagedWindow()
mNoVertScroll = true; // Horizontale Scroll abschalten
}
//---------------------------------------------------------------------------
wxPagedWindow::~wxPagedWindow()
{
// nothing (base class handles destruction)
}
//---------------------------------------------------------------------------
wxFont wxPagedWindow::GetLabelingFont()
{

6
demos/dbbrowse/tabpgwin.h
View File

@@ -112,7 +112,7 @@ public:
virtual void AddTab( wxWindow* pContent,
wxString tabText,
wxBitmap* pImage = NULL );
wxBitmap* pImage );
virtual void RemoveTab( int tabNo );
@@ -200,7 +200,7 @@ public:
public:
wxPagedWindow();
~wxPagedWindow();
~wxPagedWindow(){};
// NOTE:: use public methods of the base class
// to add "pages" to this window
@@ -243,7 +243,7 @@ class twTabInfo : public wxObject
DECLARE_DYNAMIC_CLASS( twTabInfo )
public:
twTabInfo();
~twTabInfo();
~twTabInfo(){};
int ImgWidth();
int ImgHeight();

11
demos/forty/card.cpp
View File

@@ -133,17 +133,6 @@ void Card::SetScale(double scale)
m_height = int(70*scale);
}
//+-------------------------------------------------------------+
//| Card::~Card() |
//+-------------------------------------------------------------+
//| Description: |
//| Destructor - nothing to do at present. |
//+-------------------------------------------------------------+
Card::~Card()
{
}
//+-------------------------------------------------------------+
//| Card::Erase() |
//+-------------------------------------------------------------+

2
demos/forty/card.h
View File

@@ -44,7 +44,7 @@ class Card {
public:
Card(int value, WayUp way_up = facedown);
virtual ~Card();
virtual ~Card(){};
void Draw(wxDC& pDC, int x, int y);
static void DrawNullCard(wxDC& pDC, int x, int y); // Draw card place-holder

8
demos/forty/forty.cpp
View File

@@ -58,10 +58,6 @@ wxColour* FortyApp::m_backgroundColour = 0;
wxColour* FortyApp::m_textColour = 0;
wxBrush* FortyApp::m_backgroundBrush = 0;
FortyApp::FortyApp()
{
}
FortyApp::~FortyApp()
{
delete m_backgroundColour;
@@ -210,10 +206,6 @@ FortyFrame::FortyFrame(wxFrame* frame, const wxString& title, const wxPoint& pos
#endif // wxUSE_STATUSBAR
}
FortyFrame::~FortyFrame()
{
}
void FortyFrame::OnCloseWindow(wxCloseEvent& event)
{
if (m_canvas->OnCloseCanvas() )

4
demos/forty/forty.h
View File

@@ -16,7 +16,7 @@
class FortyApp: public wxApp
{
public:
FortyApp();
FortyApp(){};
~FortyApp();
bool OnInit();
@@ -39,7 +39,7 @@ class FortyFrame: public wxFrame
{
public:
FortyFrame(wxFrame* frame, const wxString& title, const wxPoint& pos, const wxSize& size, bool largecards);
virtual ~FortyFrame();
virtual ~FortyFrame(){};
void OnCloseWindow(wxCloseEvent& event);

16
demos/forty/game.cpp
View File

@@ -861,11 +861,6 @@ bool Base::AcceptCard(Card* card)
return retval;
}
Base::~Base()
{
// nothing special at the moment
};
//----------------------------------------------------------------//
// The Foundation class: holds the cards built up from the ace... //
@@ -895,11 +890,6 @@ bool Foundation::AcceptCard(Card* card)
return retval;
}
Foundation::~Foundation()
{
// nothing special at the moment
};
//----------------------------------------------------//
// The Discard class: holds cards dealt from the m_pack //
@@ -992,9 +982,3 @@ Card* Discard::RemoveTopCard(wxDC& dc, int m_xOffset, int m_yOffset)
return card;
}
Discard::~Discard()
{
// nothing special at the moment
};

6
demos/forty/game.h
View File

@@ -39,7 +39,7 @@ public:
class Base : public Pile {
public:
Base(int x, int y);
~Base();
~Base(){};
bool AcceptCard(Card* card);
};
@@ -50,7 +50,7 @@ public:
class Foundation : public Pile {
public:
Foundation(int x, int y);
~Foundation();
~Foundation(){};
bool AcceptCard(Card* card);
};
@@ -61,7 +61,7 @@ public:
class Discard : public Pile {
public:
Discard(int x, int y);
~Discard();
~Discard(){};
void Redraw(wxDC& dc);
void GetTopCardPos(int& x, int& y);
Card* RemoveTopCard(wxDC& dc, int m_xOffset, int m_yOffset);

6
demos/forty/pile.cpp
View File

@@ -298,9 +298,3 @@ bool Pile::Overlap(int x, int y)
}
return false;
}
Pile::~Pile()
{
// nothing special at the moment
}

2
demos/forty/pile.h
View File

@@ -42,7 +42,7 @@ const int NumCards = 2 * PackSize;
class Pile {
public:
Pile(int x, int y, int dx = 0, int dy = 0);
virtual ~Pile();
virtual ~Pile(){};
// General functions
virtual void ResetPile() { m_topCard = -1; }

4
demos/forty/playerdg.cpp
View File

@@ -83,10 +83,6 @@ PlayerSelectionDialog::PlayerSelectionDialog(
CentreOnParent();
}
PlayerSelectionDialog::~PlayerSelectionDialog()
{
}
void PlayerSelectionDialog::OnSize(wxSizeEvent& WXUNUSED(event))
{
Layout();

2
demos/forty/playerdg.h
View File

@@ -17,7 +17,7 @@ class PlayerSelectionDialog : public wxDialog
{
public:
PlayerSelectionDialog(wxWindow* parent, ScoreFile* file);
virtual ~PlayerSelectionDialog();
virtual ~PlayerSelectionDialog(){};
const wxString& GetPlayersName();
void ButtonCallback(wxCommandEvent& event);

4
demos/forty/scoredg.cpp
View File

@@ -203,10 +203,6 @@ ScoreDialog::ScoreDialog(wxWindow* parent, ScoreFile* file) :
CentreOnParent();
}
ScoreDialog::~ScoreDialog()
{
}
void ScoreDialog::Display()
{
ShowModal();

2
demos/forty/scoredg.h
View File

@@ -17,7 +17,7 @@ class ScoreDialog : public wxDialog
{
public:
ScoreDialog(wxWindow* parent, ScoreFile* file);
virtual ~ScoreDialog();
virtual ~ScoreDialog(){};
void Display();

2
demos/life/life.cpp
View File

@@ -1025,7 +1025,7 @@ void LifeCanvas::OnSize(wxSizeEvent& event)
void LifeCanvas::OnScroll(wxScrollWinEvent& event)
{
WXTYPE type = event.GetEventType();
WXTYPE type = (WXTYPE)event.GetEventType();
int pos = event.GetPosition();
int orient = event.GetOrientation();

4
demos/poem/wxpoem.cpp
View File

@@ -220,7 +220,7 @@ void MainWindow::ScanBuffer(wxDC *dc, bool DrawIt, int *max_x, int *max_y)
while (((ch = poem_buffer[i]) != 10) && (ch != 0))
#endif
{
line[j] = ch;
line[j] = (wxChar)ch;
j ++;
i ++;
}
@@ -851,7 +851,7 @@ bool LoadPoem(wxChar *file_name, long position)
i++;
}
poem_buffer[i] = ch;
poem_buffer[i] = (wxChar)ch;
i ++;
if (i == buf_size)

7
include/wx/dbtable.h
View File

@@ -184,10 +184,13 @@ public:
const wxString &qryTblName=wxEmptyString, bool qryOnly = !wxDB_QUERY_ONLY,
const wxString &tblPath=wxEmptyString);
// DEPRECATED
#if WXWIN_COMPATIBILITY_2_4
wxDEPRECATED(
wxDbTable(wxDb *pwxDb, const wxString &tblName, const UWORD numColumns,
const wxChar *qryTblName=wxEmptyString, bool qryOnly = !wxDB_QUERY_ONLY,
const wxString &tblPath=wxEmptyString);
const wxString &tblPath=wxEmptyString)
);
#endif // WXWIN_COMPATIBILITY_2_4
virtual ~wxDbTable();

2
include/wx/txtstrm.h
View File

@@ -56,7 +56,7 @@ public:
wxString ReadString(); // deprecated: use ReadLine or ReadWord instead
wxString ReadLine();
wxString ReadWord();
wxChar GetChar() { wxChar c = NextChar(); return c != wxEOT ? c : 0; }
wxChar GetChar() { wxChar c = NextChar(); return (wxChar)(c != wxEOT ? c : 0); }
wxString GetStringSeparators() const { return m_separators; }
void SetStringSeparators(const wxString &c) { m_separators = c; }

6
src/common/dbgrid.cpp
View File

@@ -320,7 +320,7 @@ bool wxDbGridTableBase::CanGetValueAs(int row, int col, const wxString& typeName
return true;
}
if (m_data->IsColNull(m_ColInfo[col].DbCol))
if (m_data->IsColNull((UWORD)m_ColInfo[col].DbCol))
{
return false;
}
@@ -508,7 +508,7 @@ void* wxDbGridTableBase::GetValueAsCustom(int row, int col, const wxString& type
wxFAIL_MSG (_T("You can not use GetValueAsCustom for virtual columns"));
return NULL;
}
if (m_data->IsColNull(m_ColInfo[col].DbCol))
if (m_data->IsColNull((UWORD)m_ColInfo[col].DbCol))
return NULL;
if (typeName == wxGRID_VALUE_DATETIME)
@@ -580,7 +580,7 @@ bool wxDbGridTableBase::IsEmptyCell(int row, int col)
wxLogDebug(wxT("IsEmtpyCell on %i,%i"),row,col);
ValidateRow(row);
return m_data->IsColNull(m_ColInfo[col].DbCol);
return m_data->IsColNull((UWORD)m_ColInfo[col].DbCol);
}

32
src/common/dbtable.cpp
View File

@@ -116,6 +116,7 @@ wxDbTable::wxDbTable(wxDb *pwxDb, const wxString &tblName, const UWORD numColumn
/***** DEPRECATED: use wxDbTable::wxDbTable() format above *****/
#if WXWIN_COMPATIBILITY_2_4
wxDbTable::wxDbTable(wxDb *pwxDb, const wxString &tblName, const UWORD numColumns,
const wxChar *qryTblName, bool qryOnly, const wxString &tblPath)
{
@@ -124,6 +125,7 @@ wxDbTable::wxDbTable(wxDb *pwxDb, const wxString &tblName, const UWORD numColumn
if (!initialize(pwxDb, tblName, numColumns, tempQryTblName, qryOnly, tblPath))
cleanup();
} // wxDbTable::wxDbTable()
#endif // WXWIN_COMPATIBILITY_2_4
/********** wxDbTable::~wxDbTable() **********/
@@ -1260,7 +1262,7 @@ void wxDbTable::BuildWhereClause(wxString &pWhereClause, int typeOfWhere,
{
// Determine if this column should be included in the WHERE clause
if ((typeOfWhere == DB_WHERE_KEYFIELDS && colDefs[colNo].KeyField) ||
(typeOfWhere == DB_WHERE_MATCHING && (!IsColNull(colNo))))
(typeOfWhere == DB_WHERE_MATCHING && (!IsColNull((UWORD)colNo))))
{
// Skip over timestamp columns
if (colDefs[colNo].SqlCtype == SQL_C_TIMESTAMP)
@@ -2217,7 +2219,7 @@ void wxDbTable::ClearMemberVars(bool setToNull)
// Loop through the columns setting each member variable to zero
for (i=0; i < noCols; i++)
ClearMemberVar(i,setToNull);
ClearMemberVar((UWORD)i,setToNull);
} // wxDbTable::ClearMemberVars()
@@ -2558,7 +2560,7 @@ bool wxDbTable::SetColNull(const wxString &colName, bool set)
{
colDefs[colNo].Null = set;
if (set) // Blank out the values in the member variable
ClearMemberVar(colNo,false); // Must call with false here, or infinite recursion will happen
ClearMemberVar((UWORD)colNo,false); // Must call with false here, or infinite recursion will happen
setCbValueForColumn(colNo);
@@ -2665,7 +2667,7 @@ void wxDbTable::SetRowMode(const rowmode_t rowmode)
wxVariant wxDbTable::GetCol(const int colNo) const
{
wxVariant val;
if ((colNo < noCols) && (!IsColNull(colNo)))
if ((colNo < noCols) && (!IsColNull((UWORD)colNo)))
{
switch (colDefs[colNo].SqlCtype)
{
@@ -2718,7 +2720,7 @@ void wxDbTable::SetCol(const int colNo, const wxVariant val)
//FIXME: Add proper wxDateTime support to wxVariant..
wxDateTime dateval;
SetColNull(colNo, val.IsNull());
SetColNull((UWORD)colNo, val.IsNull());
if (!val.IsNull())
{
@@ -2728,7 +2730,7 @@ void wxDbTable::SetCol(const int colNo, const wxVariant val)
{
//Returns null if invalid!
if (!dateval.ParseDate(val.GetString()))
SetColNull(colNo, true);
SetColNull((UWORD)colNo, true);
}
switch (colDefs[colNo].SqlCtype)
@@ -2745,7 +2747,7 @@ void wxDbTable::SetCol(const int colNo, const wxVariant val)
break;
case SQL_C_SHORT:
case SQL_C_SSHORT:
*(short *)(colDefs[colNo].PtrDataObj) = val.GetLong();
*(short *)(colDefs[colNo].PtrDataObj) = (short)val.GetLong();
break;
case SQL_C_ULONG:
*(unsigned long *)(colDefs[colNo].PtrDataObj) = val.GetLong();
@@ -2757,7 +2759,7 @@ void wxDbTable::SetCol(const int colNo, const wxVariant val)
*(wxChar *)(colDefs[colNo].PtrDataObj) = val.GetChar();
break;
case SQL_C_USHORT:
*(unsigned short *)(colDefs[colNo].PtrDataObj) = val.GetLong();
*(unsigned short *)(colDefs[colNo].PtrDataObj) = (unsigned short)val.GetLong();
break;
//FIXME: Add proper wxDateTime support to wxVariant..
case SQL_C_DATE:
@@ -2765,9 +2767,9 @@ void wxDbTable::SetCol(const int colNo, const wxVariant val)
DATE_STRUCT *dataptr =
(DATE_STRUCT *)colDefs[colNo].PtrDataObj;
dataptr->year = dateval.GetYear();
dataptr->month = dateval.GetMonth()+1;
dataptr->day = dateval.GetDay();
dataptr->year = (SQLSMALLINT)dateval.GetYear();
dataptr->month = (SQLUSMALLINT)(dateval.GetMonth()+1);
dataptr->day = (SQLUSMALLINT)dateval.GetDay();
}
break;
case SQL_C_TIME:
@@ -2784,9 +2786,9 @@ void wxDbTable::SetCol(const int colNo, const wxVariant val)
{
TIMESTAMP_STRUCT *dataptr =
(TIMESTAMP_STRUCT *)colDefs[colNo].PtrDataObj;
dataptr->year = dateval.GetYear();
dataptr->month = dateval.GetMonth()+1;
dataptr->day = dateval.GetDay();
dataptr->year = (SQLSMALLINT)dateval.GetYear();
dataptr->month = (SQLUSMALLINT)(dateval.GetMonth()+1);
dataptr->day = (SQLUSMALLINT)dateval.GetDay();
dataptr->hour = dateval.GetHour();
dataptr->minute = dateval.GetMinute();
@@ -2841,7 +2843,7 @@ void wxDbTable::SetKey(const GenericKey& k)
{
if (colDefs[i].KeyField)
{
SetColNull(i, false);
SetColNull((UWORD)i, false);
memcpy(colDefs[i].PtrDataObj, blkptr, colDefs[i].SzDataObj);
blkptr += colDefs[i].SzDataObj;
}

2
src/common/filefn.cpp
View File

@@ -911,7 +911,7 @@ wxDos2UnixFilename (wxChar *s)
*s = _T('/');
#ifdef __WXMSW__
else
*s = wxTolower (*s); // Case INDEPENDENT
*s = (wxChar)wxTolower (*s); // Case INDEPENDENT
#endif
s++;
}

2
src/common/ftp.cpp
View File

@@ -728,7 +728,7 @@ wxSocketBase *wxFTP::GetPassivePort()
(wxUint16)a[3] << 16 |
(wxUint16)a[4] << 8 |
a[5];
wxUint16 port = (wxUint16)a[0] << 8 | a[1];
wxUint16 port = (wxUint16)(a[0] << 8 | a[1]);
wxIPV4address addr;
addr.Hostname(hostaddr);

4
src/common/intl.cpp
View File

@@ -1126,7 +1126,7 @@ bool wxMsgCatalogFile::Load(const wxChar *szDirPrefix, const wxChar *szName0,
// read the whole file in memory
m_pData = new size_t8[nSize];
if ( fileMsg.Read(m_pData, nSize) != (size_t)nSize ) {
if ( fileMsg.Read(m_pData, (size_t)nSize) != (size_t)nSize ) {
wxDELETEA(m_pData);
return false;
}
@@ -1157,7 +1157,7 @@ bool wxMsgCatalogFile::Load(const wxChar *szDirPrefix, const wxChar *szName0,
Swap(pHeader->ofsOrigTable));
m_pTransTable = (wxMsgTableEntry *)(m_pData +
Swap(pHeader->ofsTransTable));
m_nSize = nSize;
m_nSize = (size_t)nSize;
// now parse catalog's header and try to extract catalog charset and
// plural forms formula from it:

3
src/common/log.cpp
View File

@@ -558,7 +558,8 @@ void wxLogStderr::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
if ( traits && !traits->HasStderr() )
{
wxMessageOutputDebug().Printf(_T("%s"), str.c_str());
wxMessageOutputDebug dbgout;
dbgout.Printf(_T("%s"), str.c_str());
}
}
}

5
src/common/variant.cpp
View File

@@ -1017,7 +1017,7 @@ public:
{ m_value = wxDateTime(valptr->day, (wxDateTime::Month) (valptr->month - 1),valptr->year); }
wxVariantDataDateTime(const TIMESTAMP_STRUCT* valptr)
{ m_value = wxDateTime(valptr->day, (wxDateTime::Month) (valptr->month - 1), valptr->year,
valptr->hour, valptr->minute, valptr->second, valptr->fraction ); }
valptr->hour, valptr->minute, valptr->second, (wxDateTime::wxDateTime_t)valptr->fraction ); }
#endif //ODBC
inline wxDateTime GetValue() const { return m_value; }
@@ -1722,7 +1722,8 @@ wxVariant wxVariant::operator[] (size_t idx) const
wxVariantDataStringList* data = (wxVariantDataStringList*) m_data;
wxASSERT_MSG( (idx < (size_t) data->GetValue().GetCount()), wxT("Invalid index for array") );
wxVariant variant( wxString( (const wxChar*) (data->GetValue().Item(idx)->GetData()) ));
wxString str( (const wxChar*) (data->GetValue().Item(idx)->GetData()) );
wxVariant variant( str );
return variant;
}
return wxNullVariant;

6
src/generic/colrdlgg.cpp
View File

@@ -545,7 +545,7 @@ void wxGenericColourDialog::OnRedSlider(wxCommandEvent& WXUNUSED(event))
return;
wxClientDC dc(this);
singleCustomColour.Set(redSlider->GetValue(), singleCustomColour.Green(), singleCustomColour.Blue());
singleCustomColour.Set((unsigned char)redSlider->GetValue(), singleCustomColour.Green(), singleCustomColour.Blue());
PaintCustomColour(dc);
}
@@ -555,7 +555,7 @@ void wxGenericColourDialog::OnGreenSlider(wxCommandEvent& WXUNUSED(event))
return;
wxClientDC dc(this);
singleCustomColour.Set(singleCustomColour.Red(), greenSlider->GetValue(), singleCustomColour.Blue());
singleCustomColour.Set(singleCustomColour.Red(), (unsigned char)greenSlider->GetValue(), singleCustomColour.Blue());
PaintCustomColour(dc);
}
@@ -565,7 +565,7 @@ void wxGenericColourDialog::OnBlueSlider(wxCommandEvent& WXUNUSED(event))
return;
wxClientDC dc(this);
singleCustomColour.Set(singleCustomColour.Red(), singleCustomColour.Green(), blueSlider->GetValue());
singleCustomColour.Set(singleCustomColour.Red(), singleCustomColour.Green(), (unsigned char)blueSlider->GetValue());
PaintCustomColour(dc);
}

2
src/generic/filedlgg.cpp
View File

@@ -218,7 +218,7 @@ void wxFileData::ReadData()
}
}
m_size = buff.st_size;
m_size = (long)buff.st_size;
m_dateTime = buff.st_mtime;

13
utils/HelpGen/src/HelpGen.cpp
View File

@@ -669,7 +669,7 @@ int main(int argc, char **argv)
}
directoryOut = argv[current];
if ( !!directoryOut ) {
if ( !directoryOut.IsEmpty() ) {
// terminate with a '/' if it doesn't have it
switch ( directoryOut.Last() ) {
case '/':
@@ -729,7 +729,7 @@ int main(int argc, char **argv)
// create a parser object and a visitor derivation
CJSourceParser parser;
HelpGenVisitor visitor(directoryOut, overwrite);
if ( !!ignoreFile && mode == Mode_Dump )
if ( !ignoreFile.IsEmpty() && mode == Mode_Dump )
visitor.GetIgnoreHandler().AddNamesFromFile(ignoreFile);
spContext *ctxTop = NULL;
@@ -775,7 +775,7 @@ int main(int argc, char **argv)
}
}
if ( !!ignoreFile )
if ( !ignoreFile.IsEmpty() )
docman.GetIgnoreHandler().AddNamesFromFile(ignoreFile);
docman.DumpDifferences(ctxTop);
@@ -1417,7 +1417,7 @@ bool DocManager::ParseTeXFile(const wxString& filename)
char *buf = new char[len + 1];
buf[len] = '\0';
if ( file.Read(buf, len) == wxInvalidOffset ) {
if ( (wxFileOffset)file.Read(buf, len) == wxInvalidOffset ) {
delete [] buf;
return false;
@@ -1988,7 +1988,7 @@ bool IgnoreNamesHandler::AddNamesFromFile(const wxString& filename)
char *buf = new char[len + 1];
buf[len] = '\0';
if ( file.Read(buf, len) == wxInvalidOffset ) {
if ( (wxFileOffset)file.Read(buf, len) == wxInvalidOffset ) {
delete [] buf;
return false;
@@ -2186,6 +2186,9 @@ static const wxString GetVersionString()
/*
$Log$
Revision 1.31 2004/10/05 15:38:29 ABX
Warning fixes found under hardest mode of OpenWatcom. Seems clean in Borland, MinGW and DMC.
Revision 1.30 2004/06/18 19:25:50 ABX
Small step in making HelpGen up to date unicode application.

4
utils/configtool/src/appsettings.cpp
View File

@@ -86,10 +86,6 @@ ctSettings::ctSettings(const ctSettings& settings)
}
ctSettings::~ctSettings()
{
}
void ctSettings::operator = (const ctSettings& settings)
{
Copy(settings);

2
utils/configtool/src/appsettings.h
View File

@@ -43,7 +43,7 @@ public:
ctSettings(const ctSettings& settings);
/// Destructor.
~ctSettings();
~ctSettings(){};
// Operations

4
utils/configtool/src/configtoolview.cpp
View File

@@ -95,10 +95,6 @@ BEGIN_EVENT_TABLE(ctConfigToolView, wxView)
END_EVENT_TABLE()
ctConfigToolView::ctConfigToolView()
{
}
// What to do when a view is created. Creates actual
// windows for displaying the view.
bool ctConfigToolView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )

2
utils/configtool/src/configtoolview.h
View File

@@ -33,7 +33,7 @@ class ctConfigToolView: public wxView
{
DECLARE_DYNAMIC_CLASS(ctConfigToolView)
public:
ctConfigToolView();
ctConfigToolView(){};
~ctConfigToolView(){};
//// Overrides

4
utils/configtool/src/htmlparser.cpp
View File

@@ -201,7 +201,7 @@ bool wxSimpleHtmlParser::ParseText(wxString& text)
{
while (!Eof() && GetChar(m_pos) != wxT('<'))
{
text += GetChar(m_pos);
text += (wxChar)GetChar(m_pos);
m_pos ++;
}
DecodeSpecialChars(text);
@@ -441,7 +441,7 @@ bool wxSimpleHtmlParser::ReadLiteral(wxString& str, bool eatIt)
while (!Eof(pos) && !IsWhitespace(GetChar(pos)) && !IsTagEndBracket(GetChar(pos)) && GetChar(pos) != wxT('='))
{
str += GetChar(pos);
str += (wxChar)GetChar(pos);
pos ++;
}
if (eatIt)

4
utils/configtool/src/mainframe.cpp
View File

@@ -438,10 +438,6 @@ ctOutputWindow::ctOutputWindow(wxWindow* parent, wxWindowID id,
CreateWindows();
}
ctOutputWindow::~ctOutputWindow()
{
}
/// Initialise the windows.
void ctOutputWindow::CreateWindows()
{

2
utils/configtool/src/mainframe.h
View File

@@ -178,7 +178,7 @@ DECLARE_CLASS(ctOutputWindow)
public:
ctOutputWindow(wxWindow* parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0);
~ctOutputWindow();
~ctOutputWindow(){};
/// Initialise the windows.
void CreateWindows();

4
utils/configtool/src/propeditor.cpp
View File

@@ -65,10 +65,6 @@ ctPropertyEditor::ctPropertyEditor(wxWindow *parent, wxWindowID id, const wxPoin
CreateControls(this);
}
ctPropertyEditor::~ctPropertyEditor()
{
}
void ctPropertyEditor::CreateControls(wxWindow* parent)
{
m_elementTitleTextCtrl = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY);

2
utils/configtool/src/propeditor.h
View File

@@ -35,7 +35,7 @@ class ctPropertyEditor: public wxPanel
DECLARE_CLASS(ctPropertyEditor)
public:
ctPropertyEditor(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style);
~ctPropertyEditor();
~ctPropertyEditor(){};
// Event handlers

6
utils/configtool/src/utils.cpp
View File

@@ -82,9 +82,9 @@ wxString apColourToHexString(const wxColour& col)
// Convert 6-digit hex string to a colour
wxColour apHexStringToColour(const wxString& hex)
{
unsigned int r = wxHexToDec(hex.Mid(0, 2));
unsigned int g = wxHexToDec(hex.Mid(2, 2));
unsigned int b = wxHexToDec(hex.Mid(4, 2));
unsigned char r = (unsigned char)wxHexToDec(hex.Mid(0, 2));
unsigned char g = (unsigned char)wxHexToDec(hex.Mid(2, 2));
unsigned char b = (unsigned char)wxHexToDec(hex.Mid(4, 2));
return wxColour(r, g, b);
}

4
utils/configtool/src/wxconfigtool.cpp
View File

@@ -57,10 +57,6 @@ ctApp::ctApp()
m_docManager = NULL;
}
ctApp::~ctApp()
{
}
bool ctApp::OnInit(void)
{

2
utils/configtool/src/wxconfigtool.h
View File

@@ -43,7 +43,7 @@ public:
ctApp();
/// Destructor.
~ctApp();
~ctApp(){};
// Accessors

6
utils/emulator/src/emulator.cpp
View File

@@ -557,9 +557,9 @@ wxString wxColourToHexString(const wxColour& col)
// Convert 6-digit hex string to a colour
wxColour wxHexStringToColour(const wxString& hex)
{
unsigned int r = wxHexToDec(hex.Mid(0, 2));
unsigned int g = wxHexToDec(hex.Mid(2, 2));
unsigned int b = wxHexToDec(hex.Mid(4, 2));
unsigned char r = (unsigned char)wxHexToDec(hex.Mid(0, 2));
unsigned char g = (unsigned char)wxHexToDec(hex.Mid(2, 2));
unsigned char b = (unsigned char)wxHexToDec(hex.Mid(4, 2));
return wxColour(r, g, b);
}

3
utils/helpview/src/helpview.cpp
View File

@@ -68,7 +68,8 @@ bool hvApp::OnInit()
int istyle = wxHF_DEFAULT_STYLE;
wxString service, windowName, book[10], titleFormat, argStr;
wxString service, windowName, titleFormat, argStr;
wxString book[10];
int bookCount = 0;
int i;
bool hasService = false;

2
utils/tex2rtf/src/bmputils.h
View File

@@ -161,7 +161,7 @@ struct mfPLACEABLEHEADER {
bool GetMetafileHeader(FILE *handle, int *width, int *height)
{
char buffer[40];
mfPLACEABLEHEADER *theHeader = (mfPLACEABLEHEADER *)&buffer;
mfPLACEABLEHEADER *theHeader = (mfPLACEABLEHEADER *)&buffer[0];
fread((void *)theHeader, sizeof(char), sizeof(mfPLACEABLEHEADER), handle);
if (theHeader->key != 0x9AC6CDD7)
{

11
utils/tex2rtf/src/rtfutils.cpp
View File

@@ -242,11 +242,11 @@ void WriteWinHelpContentsFileLine(wxChar *topicName, wxChar *xitle, int level)
int d=0;
while ( (xitle[s]!=0)&&(d<255) )
{
wxChar ch=xitle[s]&0xff;
wxChar ch=wxChar(xitle[s]&0xff);
if (ch==0x5c) {
wxChar ch1=xitle[s+1]&0xff;
wxChar ch2=xitle[s+2]&0xff;
wxChar ch3=xitle[s+3]&0xff;
wxChar ch1=wxChar(xitle[s+1]&0xff);
wxChar ch2=wxChar(xitle[s+2]&0xff);
wxChar ch3=wxChar(xitle[s+3]&0xff);
s+=4; // next character
if ((ch1==0x27)&&(ch2==0x66)&&(ch3==0x36)) { title[d++]=_T('<EFBFBD>'); }
if ((ch1==0x27)&&(ch2==0x65)&&(ch3==0x34)) { title[d++]=_T('<EFBFBD>'); }
@@ -270,9 +270,6 @@ void WriteWinHelpContentsFileLine(wxChar *topicName, wxChar *xitle, int level)
ResetContentsLevels(level);
if (!title)
return;
if (winHelp && winHelpContents && WinHelpContentsFile)
{
TexTopic *texTopic = (TexTopic *)TopicTable.Get(topicName);

20
utils/tex2rtf/src/tex2any.cpp
View File

@@ -522,7 +522,7 @@ bool read_a_line(wxChar *buf)
return false;
}
buf[bufIndex] = ch;
buf[bufIndex] = (wxChar)ch;
bufIndex ++;
}
}
@@ -588,7 +588,7 @@ bool read_a_line(wxChar *buf)
// whether there should be a '\' before it or not
if (ch != '_')
{
buf[bufIndex++] = ch;
buf[bufIndex++] = (wxChar)ch;
break;
}
@@ -625,7 +625,7 @@ bool read_a_line(wxChar *buf)
}
}
}
buf[bufIndex++] = ch;
buf[bufIndex++] = (wxChar)ch;
break;
} // switch
} // else
@@ -1014,7 +1014,7 @@ int ParseArg(TexChunk *thisArg, wxList& children, wxChar *buffer, int pos, wxCha
while (!eof && ch != 13 && ch != 32 && ch != 10 &&
ch != 0 && ch != '{')
{
BigBuffer[buf_ptr] = ch;
BigBuffer[buf_ptr] = (wxChar)ch;
buf_ptr ++;
pos ++;
ch = buffer[pos];
@@ -1190,7 +1190,7 @@ int ParseArg(TexChunk *thisArg, wxList& children, wxChar *buffer, int pos, wxCha
}
else
{
wxTex2RTFBuffer[i] = ch;
wxTex2RTFBuffer[i] = (wxChar)ch;
pos ++;
i ++;
if (ch == 0)
@@ -3436,12 +3436,12 @@ bool DefaultOnArgument(int macroId, int arg_no, bool start)
if (fd)
{
ch = getc(fd);
smallBuf[0] = ch;
smallBuf[0] = (wxChar)ch;
while (ch != EOF)
{
TexOutput(smallBuf);
ch = getc(fd);
smallBuf[0] = ch;
smallBuf[0] = (wxChar)ch;
}
fclose(fd);
}
@@ -3515,7 +3515,7 @@ bool DefaultOnArgument(int macroId, int arg_no, bool start)
wxChar *s1 = copystring(s);
int i;
for (i = 0; i < (int)wxStrlen(s); i++)
s1[i] = wxToupper(s[i]);
s1[i] = (wxChar)wxToupper(s[i]);
TexOutput(s1);
delete[] s1;
return false;
@@ -3535,7 +3535,7 @@ bool DefaultOnArgument(int macroId, int arg_no, bool start)
wxChar *s1 = copystring(s);
int i;
for (i = 0; i < (int)wxStrlen(s); i++)
s1[i] = wxTolower(s[i]);
s1[i] = (wxChar)wxTolower(s[i]);
TexOutput(s1);
delete[] s1;
return false;
@@ -3555,7 +3555,7 @@ bool DefaultOnArgument(int macroId, int arg_no, bool start)
wxChar *s1 = copystring(s);
int i;
for (i = 0; i < (int)wxStrlen(s); i++)
s1[i] = wxToupper(s[i]);
s1[i] = (wxChar)wxToupper(s[i]);
TexOutput(s1);
delete[] s1;
return false;

4
utils/tex2rtf/src/tex2rtf.cpp
View File

@@ -1213,10 +1213,6 @@ Tex2RTFConnection::Tex2RTFConnection(wxChar *buf, int size):wxDDEConnection(buf,
{
}
Tex2RTFConnection::~Tex2RTFConnection(void)
{
}
bool SplitCommand(wxChar *data, wxChar *firstArg, wxChar *secondArg)
{
firstArg[0] = 0;

2
utils/tex2rtf/src/tex2rtf.h
View File

@@ -74,7 +74,7 @@ class Tex2RTFConnection: public wxDDEConnection
{
public:
Tex2RTFConnection(wxChar *buf, int size);
~Tex2RTFConnection(void);
~Tex2RTFConnection(void){};
bool OnExecute(const wxString& topic, wxChar *data, int size, wxIPCFormat format);
wxChar *OnRequest(const wxString& topic, const wxString& item, int *size, wxIPCFormat format);
};

8
utils/tex2rtf/src/texutils.cpp
View File

@@ -496,12 +496,12 @@ void BibEatWhiteSpace(wxSTD istream& str)
{
char ch = (char)str.peek();
while (!str.eof() && (ch == ' ' || ch == '\t' || ch == 13 || ch == 10 || ch == EOF))
while (!str.eof() && (ch == ' ' || ch == '\t' || ch == 13 || ch == 10 || ch == (char)EOF))
{
if (ch == 10)
BibLine ++;
str.get(ch);
if ((ch == EOF) || str.eof()) return;
if ((ch == (char)EOF) || str.eof()) return;
ch = (char)str.peek();
}
@@ -1704,10 +1704,10 @@ wxChar *ConvertCase(wxChar *s)
int i;
if (upperCaseNames)
for (i = 0; i < len; i ++)
buf[i] = wxToupper(s[i]);
buf[i] = (wxChar)wxToupper(s[i]);
else
for (i = 0; i < len; i ++)
buf[i] = wxTolower(s[i]);
buf[i] = (wxChar)wxTolower(s[i]);
buf[i] = 0;
return buf;
}