Warning fixes for OpenWatcom.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/db.h b/include/wx/db.h
index 1db41bad87af4361881824cb9aacb274c10dc9e8..ba591bd6b8801c8b7a17c473d13caa46c2c4849a 100644 (file)
--- 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 96eeeb8b83a1ed8439797c8a9e873f11407b19eb..853772c7b84eca02ebbed8026b4a4e936ed2f1de 100644 (file)
--- 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 7d01528e70a31c737022ba5366d76eda3d3d1e5f..83858f5c855a56eac71d56a8883386037c001854 100644 (file)
--- 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 4edf3f18ccc8beb495c10082c04f6178de90e6ed..0c7249257b77434d52483f88f79ddf4bb8ac3d73 100644 (file)
--- 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 4c635d3fd86081c091eead105e54d5a0d4f28ecb..42e0c2ce422bfffbd6fa1aa5e77bf48b6c6a8f33 100644 (file)
--- 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 3bbc77a9d1445693b2d44b6f5533b9400f12fcb3..aa3070e60d983306f571c56c7c1f181e1eae0c33 100644 (file)
--- 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 d3212877201ba4a8cb6c6c3e5abf86526c5b1b2c..d6ffed803e6352169ea6494ee996e798c2d4b90d 100644 (file)
--- 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 74430da1adea87dc2c56791e6ace97dd3feb2334..604785aeeffa6fe56f613c76d3b17d4be8fea61b 100644 (file)
--- 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 1af64850c2de36411a882ea81f74df59ec69c478..5701847e563befc3bbf66d2110b86eda4f6808de 100644 (file)
--- 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 4b165afab43ce42f8eecc78c163a908c79d34ebe..395f06a7c012aa224d57e2dc23c923250831c853 100644 (file)
--- 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 39f20b8a99107641cf7e507c233fdef7c6e607af..84afe2601e2178ba28a89f690a221e4a4ae248fa 100644 (file)
--- 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 09da2b70c847a5775885b3b1c4207aef17aaf55b..88c26cf08f222b560e85ca041ebc6962826f69d0 100644 (file)
--- 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 ed5f74fa68eb44f4f659b382cb78d2da8efb41a9..4ce23095e889cb9f45e802afb65debff59311095 100644 (file)
--- 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 b9c743a87a6b071bafec137891cf80a6dd613b35..19223f77f70eb8b0a14a0f4e55a0565ddb936005 100644 (file)
--- 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 e009bad1033de6f35b062939b1e49ef7b8690719..c699ae596f19a9e428babcd2756f58c225fc41c2 100644 (file)
--- 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 73dde3ecafcfa5216e5183acaa8df5a4f9b0adc8..784a016b94210942efce04a431dab95838df4a97 100644 (file)
--- 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 adadfe0be554a8cf6c167419d7fe3c4a73f3659b..85dcafbb11fc0d6f0daf20380f478bfb805d0620 100644 (file)
--- 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 0bd33adcafb9e289f214803f6e626c7dbd16204e..2d250e20d5b672f29428e5bb42fc6029b4e7d791 100644 (file)
--- 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 541c5732da5ec23ffb1543c3e766688563762006..b10efe0e78a089fd122f27dd32cf51cef9ef39f0 100644 (file)
--- a/src/common/textcmn.cpp
+++ b/src/common/textcmn.cpp
@@ -53,18 +53,6 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_ENTER)
 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 f7daf5556d3c09526aa4e83c7a6d79dd01a60f29..f6dc6d5202a9f6323160d74672ddef84b20e4758 100644 (file)
--- 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 430ca9b7727cc582e5efe624b71cb4b8e5d8e9c0..bd3d8a0c7524ace20e0c2f1129206a7ffbd51fe2 100644 (file)
--- 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 6f050c806d8a726151569f71ca11da7ab9594e2d..7a5d5a8d369d950febf2f131ac1ce8a8719c7346 100644 (file)
--- 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 b21a13d44b48797fc0cd02566648551d88baf750..d6d183b2044e228a8b2404837ba86ae1ccf83a44 100644 (file)
--- 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 );