From 1b941f2d3143c1205fc7c5b01bd254781db728b3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Mon, 18 Oct 2004 05:56:07 +0000 Subject: [PATCH] Warning fixes for OpenWatcom. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/db.h | 2 +- include/wx/docview.h | 2 +- include/wx/gdicmn.h | 2 +- include/wx/generic/dirctrlg.h | 2 +- include/wx/imagbmp.h | 2 +- include/wx/image.h | 2 +- include/wx/layout.h | 4 ++-- include/wx/tbarbase.h | 2 +- include/wx/textctrl.h | 4 ++-- include/wx/valgen.h | 2 +- include/wx/valtext.h | 2 +- src/common/db.cpp | 5 ----- src/common/docview.cpp | 4 ---- src/common/gdicmn.cpp | 4 ---- src/common/imagbmp.cpp | 6 +++--- src/common/image.cpp | 4 ---- src/common/layout.cpp | 8 -------- src/common/tbarbase.cpp | 4 ---- src/common/textcmn.cpp | 12 ------------ src/common/valgen.cpp | 4 ---- src/common/valtext.cpp | 4 ---- src/generic/dirctrlg.cpp | 4 ---- src/generic/grid.cpp | 7 +------ 23 files changed, 17 insertions(+), 75 deletions(-) diff --git a/include/wx/db.h b/include/wx/db.h index 1db41ba..ba591bd 100644 --- a/include/wx/db.h +++ b/include/wx/db.h @@ -362,7 +362,7 @@ public: SWORD i_sqlDataType; wxDbColFor(); - ~wxDbColFor(); + ~wxDbColFor(){} void Initialize(); int Format(int Nation, int dbDataType, SWORD sqlDataType, short columnSize, short decimalDigits); diff --git a/include/wx/docview.h b/include/wx/docview.h index 96eeeb8..853772c 100644 --- a/include/wx/docview.h +++ b/include/wx/docview.h @@ -469,7 +469,7 @@ public: const wxSize& size = wxDefaultSize, long type = wxDEFAULT_FRAME_STYLE, const wxString& name = wxT("frame")); - ~wxDocChildFrame(); + ~wxDocChildFrame(){} // Extend event processing to search the view's event table virtual bool ProcessEvent(wxEvent& event); diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h index 7d01528..83858f5 100644 --- a/include/wx/gdicmn.h +++ b/include/wx/gdicmn.h @@ -481,7 +481,7 @@ private: class WXDLLEXPORT wxBitmapList : public wxList { public: - wxBitmapList(); + wxBitmapList(){} ~wxBitmapList(); void AddBitmap(wxBitmap *bitmap); diff --git a/include/wx/generic/dirctrlg.h b/include/wx/generic/dirctrlg.h index 4edf3f1..0c72492 100644 --- a/include/wx/generic/dirctrlg.h +++ b/include/wx/generic/dirctrlg.h @@ -64,7 +64,7 @@ class WXDLLEXPORT wxDirItemData : public wxTreeItemData { public: wxDirItemData(const wxString& path, const wxString& name, bool isDir); - ~wxDirItemData(); + ~wxDirItemData(){} void SetNewDirName(const wxString& path); bool HasSubDirs() const; diff --git a/include/wx/imagbmp.h b/include/wx/imagbmp.h index 4c635d3..42e0c2c 100644 --- a/include/wx/imagbmp.h +++ b/include/wx/imagbmp.h @@ -71,7 +71,7 @@ protected: bool SaveDib(wxImage *image, wxOutputStream& stream, bool verbose, bool IsBmp, bool IsMask); 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 LoadDib(wxImage *image, wxInputStream& stream, bool verbose, bool IsBmp); #endif // wxUSE_STREAMS diff --git a/include/wx/image.h b/include/wx/image.h index 3bbc77a..aa3070e 100644 --- a/include/wx/image.h +++ b/include/wx/image.h @@ -136,7 +136,7 @@ public: class WXDLLEXPORT wxImage: public wxObject { public: - wxImage(); + wxImage(){} wxImage( int width, int height, bool clear = true ); wxImage( int width, int height, unsigned char* data, bool static_data = false ); wxImage( const wxString& name, long type = wxBITMAP_TYPE_ANY, int index = -1 ); diff --git a/include/wx/layout.h b/include/wx/layout.h index d321287..d6ffed8 100644 --- a/include/wx/layout.h +++ b/include/wx/layout.h @@ -73,7 +73,7 @@ public: // 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); @@ -176,7 +176,7 @@ public: // note that default copy ctor and assignment operators are ok - ~wxLayoutConstraints(); + ~wxLayoutConstraints(){} bool SatisfyConstraints(wxWindowBase *win, int *noChanges); bool AreSatisfied() const diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h index 74430da..604785a 100644 --- a/include/wx/tbarbase.h +++ b/include/wx/tbarbase.h @@ -109,7 +109,7 @@ public: m_toolStyle = wxTOOL_STYLE_CONTROL; } - ~wxToolBarToolBase(); + ~wxToolBarToolBase(){} // accessors // --------- diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h index 1af6485..5701847 100644 --- a/include/wx/textctrl.h +++ b/include/wx/textctrl.h @@ -254,8 +254,8 @@ public: // creation // -------- - wxTextCtrlBase(); - ~wxTextCtrlBase(); + wxTextCtrlBase(){} + ~wxTextCtrlBase(){} // accessors // --------- diff --git a/include/wx/valgen.h b/include/wx/valgen.h index 4b165af..395f06a 100644 --- a/include/wx/valgen.h +++ b/include/wx/valgen.h @@ -30,7 +30,7 @@ public: wxGenericValidator(wxArrayInt* val); wxGenericValidator(const wxGenericValidator& copyFrom); - ~wxGenericValidator(); + ~wxGenericValidator(){} // Make a clone of this validator (or return NULL) - currently necessary // if you're passing a reference to a validator. diff --git a/include/wx/valtext.h b/include/wx/valtext.h index 39f20b8..84afe26 100644 --- a/include/wx/valtext.h +++ b/include/wx/valtext.h @@ -41,7 +41,7 @@ public: wxTextValidator(long style = wxFILTER_NONE, wxString *val = 0); wxTextValidator(const wxTextValidator& val); - ~wxTextValidator(); + ~wxTextValidator(){} // Make a clone of this validator (or return NULL) - currently necessary // if you're passing a reference to a validator. diff --git a/src/common/db.cpp b/src/common/db.cpp index 09da2b7..88c26cf 100644 --- a/src/common/db.cpp +++ b/src/common/db.cpp @@ -241,11 +241,6 @@ wxDbColFor::wxDbColFor() } // wxDbColFor::wxDbColFor() -wxDbColFor::~wxDbColFor() -{ -} // wxDbColFor::~wxDbColFor() - - /********** wxDbColFor::Initialize() **********/ void wxDbColFor::Initialize() { diff --git a/src/common/docview.cpp b/src/common/docview.cpp index ed5f74f..4ce2309 100644 --- a/src/common/docview.cpp +++ b/src/common/docview.cpp @@ -1839,10 +1839,6 @@ wxDocChildFrame::wxDocChildFrame(wxDocument *doc, view->SetFrame(this); } -wxDocChildFrame::~wxDocChildFrame() -{ -} - // Extend event processing to search the view's event table bool wxDocChildFrame::ProcessEvent(wxEvent& event) { diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp index b9c743a..19223f7 100644 --- a/src/common/gdicmn.cpp +++ b/src/common/gdicmn.cpp @@ -665,10 +665,6 @@ void wxDeleteStockLists() // wxTheXXXList stuff (semi-obsolete) // ============================================================================ -wxBitmapList::wxBitmapList() -{ -} - wxBitmapList::~wxBitmapList () { wxList::compatibility_iterator node = GetFirst (); diff --git a/src/common/imagbmp.cpp b/src/common/imagbmp.cpp index e009bad..c699ae5 100644 --- a/src/common/imagbmp.cpp +++ b/src/common/imagbmp.cpp @@ -453,7 +453,7 @@ typedef struct bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height, int bpp, int ncolors, int comp, - off_t bmpOffset, wxInputStream& stream, + wxFileOffset bmpOffset, wxInputStream& stream, bool verbose, bool IsBmp, bool hasPalette) { wxInt32 aDword, rmask = 0, gmask = 0, bmask = 0; @@ -1210,7 +1210,7 @@ bool wxICOHandler::DoLoadFile(wxImage *image, wxInputStream& stream, ICONDIR IconDir; - off_t iPos = stream.TellI(); + wxFileOffset iPos = stream.TellI(); stream.Read(&IconDir, sizeof(IconDir)); wxUint16 nIcons = wxUINT16_SWAP_ON_BE(IconDir.idCount); // nType is 1 for Icons, 2 for Cursors: @@ -1275,7 +1275,7 @@ bool wxICOHandler::DoLoadFile(wxImage *image, wxInputStream& stream, int wxICOHandler::GetImageCount(wxInputStream& stream) { ICONDIR IconDir; - off_t iPos = stream.TellI(); + wxFileOffset iPos = stream.TellI(); stream.SeekI(0); stream.Read(&IconDir, sizeof(IconDir)); wxUint16 nIcons = wxUINT16_SWAP_ON_BE(IconDir.idCount); diff --git a/src/common/image.cpp b/src/common/image.cpp index 73dde3e..784a016 100644 --- a/src/common/image.cpp +++ b/src/common/image.cpp @@ -110,10 +110,6 @@ wxImage wxNullImage; IMPLEMENT_DYNAMIC_CLASS(wxImage, wxObject) -wxImage::wxImage() -{ -} - wxImage::wxImage( int width, int height, bool clear ) { Create( width, height, clear ); diff --git a/src/common/layout.cpp b/src/common/layout.cpp index adadfe0..85dcafb 100644 --- a/src/common/layout.cpp +++ b/src/common/layout.cpp @@ -60,10 +60,6 @@ wxIndividualLayoutConstraint::wxIndividualLayoutConstraint() otherWin = (wxWindowBase *) NULL; } -wxIndividualLayoutConstraint::~wxIndividualLayoutConstraint() -{ -} - void wxIndividualLayoutConstraint::Set(wxRelationship rel, wxWindowBase *otherW, wxEdge otherE, int val, int marg) { if (rel == wxSameAs) @@ -960,10 +956,6 @@ wxLayoutConstraints::wxLayoutConstraints() height.SetEdge(wxHeight); } -wxLayoutConstraints::~wxLayoutConstraints() -{ -} - bool wxLayoutConstraints::SatisfyConstraints(wxWindowBase *win, int *nChanges) { int noChanges = 0; diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp index 0bd33ad..2d250e2 100644 --- a/src/common/tbarbase.cpp +++ b/src/common/tbarbase.cpp @@ -114,10 +114,6 @@ bool wxToolBarToolBase::SetLongHelp(const wxString& help) return true; } -wxToolBarToolBase::~wxToolBarToolBase() -{ -} - // ---------------------------------------------------------------------------- // wxToolBarBase adding/deleting items // ---------------------------------------------------------------------------- diff --git a/src/common/textcmn.cpp b/src/common/textcmn.cpp index 541c573..b10efe0 100644 --- a/src/common/textcmn.cpp +++ b/src/common/textcmn.cpp @@ -54,18 +54,6 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_URL) DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_MAXLEN) // ---------------------------------------------------------------------------- -// ctor -// ---------------------------------------------------------------------------- - -wxTextCtrlBase::wxTextCtrlBase() -{ -} - -wxTextCtrlBase::~wxTextCtrlBase() -{ -} - -// ---------------------------------------------------------------------------- // style functions - not implemented here // ---------------------------------------------------------------------------- diff --git a/src/common/valgen.cpp b/src/common/valgen.cpp index f7daf55..f6dc6d5 100644 --- a/src/common/valgen.cpp +++ b/src/common/valgen.cpp @@ -100,10 +100,6 @@ bool wxGenericValidator::Copy(const wxGenericValidator& val) return true; } -wxGenericValidator::~wxGenericValidator() -{ -} - // Called to transfer data to the window bool wxGenericValidator::TransferToWindow(void) { diff --git a/src/common/valtext.cpp b/src/common/valtext.cpp index 430ca9b..bd3d8a0 100644 --- a/src/common/valtext.cpp +++ b/src/common/valtext.cpp @@ -79,10 +79,6 @@ bool wxTextValidator::Copy(const wxTextValidator& val) return true; } -wxTextValidator::~wxTextValidator() -{ -} - static bool wxIsAlpha(const wxString& val) { int i; diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp index 6f050c8..7a5d5a8 100644 --- a/src/generic/dirctrlg.cpp +++ b/src/generic/dirctrlg.cpp @@ -375,10 +375,6 @@ wxDirItemData::wxDirItemData(const wxString& path, const wxString& name, m_isDir = isDir; } -wxDirItemData::~wxDirItemData() -{ -} - void wxDirItemData::SetNewDirName(const wxString& path) { m_path = path; diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp index b21a13d..d6d183b 100644 --- a/src/generic/grid.cpp +++ b/src/generic/grid.cpp @@ -206,7 +206,7 @@ public: wxGridRowLabelWindow *rowLblWin, wxGridColLabelWindow *colLblWin, wxWindowID id, const wxPoint &pos, const wxSize &size ); - ~wxGridWindow(); + ~wxGridWindow(){} 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) ) { wxPaintDC dc( this ); -- 2.7.4