Warning fixes for OpenWatcom.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-10-18 05:56:07 +00:00
parent 6c6ea7bed1
commit 1b941f2d31
23 changed files with 17 additions and 75 deletions

View File

@@ -362,7 +362,7 @@ public:
SWORD i_sqlDataType; SWORD i_sqlDataType;
wxDbColFor(); wxDbColFor();
~wxDbColFor(); ~wxDbColFor(){}
void Initialize(); void Initialize();
int Format(int Nation, int dbDataType, SWORD sqlDataType, short columnSize, short decimalDigits); int Format(int Nation, int dbDataType, SWORD sqlDataType, short columnSize, short decimalDigits);

View File

@@ -469,7 +469,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long type = wxDEFAULT_FRAME_STYLE, long type = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxT("frame")); const wxString& name = wxT("frame"));
~wxDocChildFrame(); ~wxDocChildFrame(){}
// Extend event processing to search the view's event table // Extend event processing to search the view's event table
virtual bool ProcessEvent(wxEvent& event); virtual bool ProcessEvent(wxEvent& event);

View File

@@ -481,7 +481,7 @@ private:
class WXDLLEXPORT wxBitmapList : public wxList class WXDLLEXPORT wxBitmapList : public wxList
{ {
public: public:
wxBitmapList(); wxBitmapList(){}
~wxBitmapList(); ~wxBitmapList();
void AddBitmap(wxBitmap *bitmap); void AddBitmap(wxBitmap *bitmap);

View File

@@ -64,7 +64,7 @@ class WXDLLEXPORT wxDirItemData : public wxTreeItemData
{ {
public: public:
wxDirItemData(const wxString& path, const wxString& name, bool isDir); wxDirItemData(const wxString& path, const wxString& name, bool isDir);
~wxDirItemData(); ~wxDirItemData(){}
void SetNewDirName(const wxString& path); void SetNewDirName(const wxString& path);
bool HasSubDirs() const; bool HasSubDirs() const;

View File

@@ -71,7 +71,7 @@ protected:
bool SaveDib(wxImage *image, wxOutputStream& stream, bool verbose, bool SaveDib(wxImage *image, wxOutputStream& stream, bool verbose,
bool IsBmp, bool IsMask); bool IsBmp, bool IsMask);
bool DoLoadDib(wxImage *image, int width, int height, int bpp, int ncolors, bool DoLoadDib(wxImage *image, int width, int height, int bpp, int ncolors,
int comp, off_t bmpOffset, wxInputStream& stream, int comp, wxFileOffset bmpOffset, wxInputStream& stream,
bool verbose, bool IsBmp, bool hasPalette); bool verbose, bool IsBmp, bool hasPalette);
bool LoadDib(wxImage *image, wxInputStream& stream, bool verbose, bool IsBmp); bool LoadDib(wxImage *image, wxInputStream& stream, bool verbose, bool IsBmp);
#endif // wxUSE_STREAMS #endif // wxUSE_STREAMS

View File

@@ -136,7 +136,7 @@ public:
class WXDLLEXPORT wxImage: public wxObject class WXDLLEXPORT wxImage: public wxObject
{ {
public: public:
wxImage(); wxImage(){}
wxImage( int width, int height, bool clear = true ); wxImage( int width, int height, bool clear = true );
wxImage( int width, int height, unsigned char* data, bool static_data = false ); wxImage( int width, int height, unsigned char* data, bool static_data = false );
wxImage( const wxString& name, long type = wxBITMAP_TYPE_ANY, int index = -1 ); wxImage( const wxString& name, long type = wxBITMAP_TYPE_ANY, int index = -1 );

View File

@@ -73,7 +73,7 @@ public:
// note that default copy ctor and assignment operators are ok // note that default copy ctor and assignment operators are ok
~wxIndividualLayoutConstraint(); ~wxIndividualLayoutConstraint(){}
void Set(wxRelationship rel, wxWindowBase *otherW, wxEdge otherE, int val = 0, int marg = wxLAYOUT_DEFAULT_MARGIN); void Set(wxRelationship rel, wxWindowBase *otherW, wxEdge otherE, int val = 0, int marg = wxLAYOUT_DEFAULT_MARGIN);
@@ -176,7 +176,7 @@ public:
// note that default copy ctor and assignment operators are ok // note that default copy ctor and assignment operators are ok
~wxLayoutConstraints(); ~wxLayoutConstraints(){}
bool SatisfyConstraints(wxWindowBase *win, int *noChanges); bool SatisfyConstraints(wxWindowBase *win, int *noChanges);
bool AreSatisfied() const bool AreSatisfied() const

View File

@@ -109,7 +109,7 @@ public:
m_toolStyle = wxTOOL_STYLE_CONTROL; m_toolStyle = wxTOOL_STYLE_CONTROL;
} }
~wxToolBarToolBase(); ~wxToolBarToolBase(){}
// accessors // accessors
// --------- // ---------

View File

@@ -254,8 +254,8 @@ public:
// creation // creation
// -------- // --------
wxTextCtrlBase(); wxTextCtrlBase(){}
~wxTextCtrlBase(); ~wxTextCtrlBase(){}
// accessors // accessors
// --------- // ---------

View File

@@ -30,7 +30,7 @@ public:
wxGenericValidator(wxArrayInt* val); wxGenericValidator(wxArrayInt* val);
wxGenericValidator(const wxGenericValidator& copyFrom); wxGenericValidator(const wxGenericValidator& copyFrom);
~wxGenericValidator(); ~wxGenericValidator(){}
// Make a clone of this validator (or return NULL) - currently necessary // Make a clone of this validator (or return NULL) - currently necessary
// if you're passing a reference to a validator. // if you're passing a reference to a validator.

View File

@@ -41,7 +41,7 @@ public:
wxTextValidator(long style = wxFILTER_NONE, wxString *val = 0); wxTextValidator(long style = wxFILTER_NONE, wxString *val = 0);
wxTextValidator(const wxTextValidator& val); wxTextValidator(const wxTextValidator& val);
~wxTextValidator(); ~wxTextValidator(){}
// Make a clone of this validator (or return NULL) - currently necessary // Make a clone of this validator (or return NULL) - currently necessary
// if you're passing a reference to a validator. // if you're passing a reference to a validator.

View File

@@ -241,11 +241,6 @@ wxDbColFor::wxDbColFor()
} // wxDbColFor::wxDbColFor() } // wxDbColFor::wxDbColFor()
wxDbColFor::~wxDbColFor()
{
} // wxDbColFor::~wxDbColFor()
/********** wxDbColFor::Initialize() **********/ /********** wxDbColFor::Initialize() **********/
void wxDbColFor::Initialize() void wxDbColFor::Initialize()
{ {

View File

@@ -1839,10 +1839,6 @@ wxDocChildFrame::wxDocChildFrame(wxDocument *doc,
view->SetFrame(this); view->SetFrame(this);
} }
wxDocChildFrame::~wxDocChildFrame()
{
}
// Extend event processing to search the view's event table // Extend event processing to search the view's event table
bool wxDocChildFrame::ProcessEvent(wxEvent& event) bool wxDocChildFrame::ProcessEvent(wxEvent& event)
{ {

View File

@@ -665,10 +665,6 @@ void wxDeleteStockLists()
// wxTheXXXList stuff (semi-obsolete) // wxTheXXXList stuff (semi-obsolete)
// ============================================================================ // ============================================================================
wxBitmapList::wxBitmapList()
{
}
wxBitmapList::~wxBitmapList () wxBitmapList::~wxBitmapList ()
{ {
wxList::compatibility_iterator node = GetFirst (); wxList::compatibility_iterator node = GetFirst ();

View File

@@ -453,7 +453,7 @@ typedef struct
bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height, bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
int bpp, int ncolors, int comp, int bpp, int ncolors, int comp,
off_t bmpOffset, wxInputStream& stream, wxFileOffset bmpOffset, wxInputStream& stream,
bool verbose, bool IsBmp, bool hasPalette) bool verbose, bool IsBmp, bool hasPalette)
{ {
wxInt32 aDword, rmask = 0, gmask = 0, bmask = 0; wxInt32 aDword, rmask = 0, gmask = 0, bmask = 0;
@@ -1210,7 +1210,7 @@ bool wxICOHandler::DoLoadFile(wxImage *image, wxInputStream& stream,
ICONDIR IconDir; ICONDIR IconDir;
off_t iPos = stream.TellI(); wxFileOffset iPos = stream.TellI();
stream.Read(&IconDir, sizeof(IconDir)); stream.Read(&IconDir, sizeof(IconDir));
wxUint16 nIcons = wxUINT16_SWAP_ON_BE(IconDir.idCount); wxUint16 nIcons = wxUINT16_SWAP_ON_BE(IconDir.idCount);
// nType is 1 for Icons, 2 for Cursors: // nType is 1 for Icons, 2 for Cursors:
@@ -1275,7 +1275,7 @@ bool wxICOHandler::DoLoadFile(wxImage *image, wxInputStream& stream,
int wxICOHandler::GetImageCount(wxInputStream& stream) int wxICOHandler::GetImageCount(wxInputStream& stream)
{ {
ICONDIR IconDir; ICONDIR IconDir;
off_t iPos = stream.TellI(); wxFileOffset iPos = stream.TellI();
stream.SeekI(0); stream.SeekI(0);
stream.Read(&IconDir, sizeof(IconDir)); stream.Read(&IconDir, sizeof(IconDir));
wxUint16 nIcons = wxUINT16_SWAP_ON_BE(IconDir.idCount); wxUint16 nIcons = wxUINT16_SWAP_ON_BE(IconDir.idCount);

View File

@@ -110,10 +110,6 @@ wxImage wxNullImage;
IMPLEMENT_DYNAMIC_CLASS(wxImage, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxImage, wxObject)
wxImage::wxImage()
{
}
wxImage::wxImage( int width, int height, bool clear ) wxImage::wxImage( int width, int height, bool clear )
{ {
Create( width, height, clear ); Create( width, height, clear );

View File

@@ -60,10 +60,6 @@ wxIndividualLayoutConstraint::wxIndividualLayoutConstraint()
otherWin = (wxWindowBase *) NULL; otherWin = (wxWindowBase *) NULL;
} }
wxIndividualLayoutConstraint::~wxIndividualLayoutConstraint()
{
}
void wxIndividualLayoutConstraint::Set(wxRelationship rel, wxWindowBase *otherW, wxEdge otherE, int val, int marg) void wxIndividualLayoutConstraint::Set(wxRelationship rel, wxWindowBase *otherW, wxEdge otherE, int val, int marg)
{ {
if (rel == wxSameAs) if (rel == wxSameAs)
@@ -960,10 +956,6 @@ wxLayoutConstraints::wxLayoutConstraints()
height.SetEdge(wxHeight); height.SetEdge(wxHeight);
} }
wxLayoutConstraints::~wxLayoutConstraints()
{
}
bool wxLayoutConstraints::SatisfyConstraints(wxWindowBase *win, int *nChanges) bool wxLayoutConstraints::SatisfyConstraints(wxWindowBase *win, int *nChanges)
{ {
int noChanges = 0; int noChanges = 0;

View File

@@ -114,10 +114,6 @@ bool wxToolBarToolBase::SetLongHelp(const wxString& help)
return true; return true;
} }
wxToolBarToolBase::~wxToolBarToolBase()
{
}
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxToolBarBase adding/deleting items // wxToolBarBase adding/deleting items
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

View File

@@ -53,18 +53,6 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_ENTER)
DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_URL) DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_URL)
DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_MAXLEN) DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_MAXLEN)
// ----------------------------------------------------------------------------
// ctor
// ----------------------------------------------------------------------------
wxTextCtrlBase::wxTextCtrlBase()
{
}
wxTextCtrlBase::~wxTextCtrlBase()
{
}
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// style functions - not implemented here // style functions - not implemented here
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

View File

@@ -100,10 +100,6 @@ bool wxGenericValidator::Copy(const wxGenericValidator& val)
return true; return true;
} }
wxGenericValidator::~wxGenericValidator()
{
}
// Called to transfer data to the window // Called to transfer data to the window
bool wxGenericValidator::TransferToWindow(void) bool wxGenericValidator::TransferToWindow(void)
{ {

View File

@@ -79,10 +79,6 @@ bool wxTextValidator::Copy(const wxTextValidator& val)
return true; return true;
} }
wxTextValidator::~wxTextValidator()
{
}
static bool wxIsAlpha(const wxString& val) static bool wxIsAlpha(const wxString& val)
{ {
int i; int i;

View File

@@ -375,10 +375,6 @@ wxDirItemData::wxDirItemData(const wxString& path, const wxString& name,
m_isDir = isDir; m_isDir = isDir;
} }
wxDirItemData::~wxDirItemData()
{
}
void wxDirItemData::SetNewDirName(const wxString& path) void wxDirItemData::SetNewDirName(const wxString& path)
{ {
m_path = path; m_path = path;

View File

@@ -206,7 +206,7 @@ public:
wxGridRowLabelWindow *rowLblWin, wxGridRowLabelWindow *rowLblWin,
wxGridColLabelWindow *colLblWin, wxGridColLabelWindow *colLblWin,
wxWindowID id, const wxPoint &pos, const wxSize &size ); wxWindowID id, const wxPoint &pos, const wxSize &size );
~wxGridWindow(); ~wxGridWindow(){}
void ScrollWindow( int dx, int dy, const wxRect *rect ); void ScrollWindow( int dx, int dy, const wxRect *rect );
@@ -3700,11 +3700,6 @@ wxGridWindow::wxGridWindow( wxGrid *parent,
} }
wxGridWindow::~wxGridWindow()
{
}
void wxGridWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) void wxGridWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
{ {
wxPaintDC dc( this ); wxPaintDC dc( this );