Warning fixes to most detailed warning output of OpenWatcom. Tested under Borland, DigitalMars and MinGW.

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

samples/dialogs/dialogs.cpp

@@ -388,7 +388,14 @@ MyFrame::MyFrame(wxWindow *parent,
     m_clrData.SetChooseFull(true);
     for (int i = 0; i < 16; i++)
     {
-        m_clrData.SetCustomColour(i, wxColour(i*16, i*16, i*16));
+        m_clrData.SetCustomColour(
+          i,
+          wxColour(
+            (unsigned char)(i*16),
+            (unsigned char)(i*16),
+            (unsigned char)(i*16)
+          )
+        );
     }
 #endif // wxUSE_COLOURDLG
 
@@ -446,7 +453,11 @@ void MyFrame::ChooseColourGeneric(wxCommandEvent& WXUNUSED(event))
     data.SetChooseFull(true);
     for (int i = 0; i < 16; i++)
     {
-        wxColour colour(i*16, i*16, i*16);
+        wxColour colour(
+            (unsigned char)(i*16),
+            (unsigned char)(i*16),
+            (unsigned char)(i*16)
+        );
         data.SetCustomColour(i, colour);
     }
 

samples/widgets/button.cpp

@@ -78,7 +78,7 @@ class ButtonWidgetsPage : public WidgetsPage
 {
 public:
     ButtonWidgetsPage(wxNotebook *notebook, wxImageList *imaglist);
-    virtual ~ButtonWidgetsPage();
+    virtual ~ButtonWidgetsPage(){};
 
 protected:
     // event handlers
@@ -237,10 +237,6 @@ ButtonWidgetsPage::ButtonWidgetsPage(wxNotebook *notebook,
     sizerTop->Fit(this);
 }
 
-ButtonWidgetsPage::~ButtonWidgetsPage()
-{
-}
-
 // ----------------------------------------------------------------------------
 // operations
 // ----------------------------------------------------------------------------

samples/widgets/checkbox.cpp

@@ -74,7 +74,7 @@ class CheckBoxWidgetsPage : public WidgetsPage
 {
 public:
     CheckBoxWidgetsPage(wxNotebook *notebook, wxImageList *imaglist);
-    virtual ~CheckBoxWidgetsPage();
+    virtual ~CheckBoxWidgetsPage(){};
 
 protected:
     // event handlers
@@ -223,10 +223,6 @@ CheckBoxWidgetsPage::CheckBoxWidgetsPage(wxNotebook *notebook,
     sizerTop->Fit(this);
 }
 
-CheckBoxWidgetsPage::~CheckBoxWidgetsPage()
-{
-}
-
 void CheckBoxWidgetsPage::Reset()
 {
     m_chkRight->SetValue(false);

samples/widgets/radiobox.cpp

@@ -77,7 +77,7 @@ class RadioWidgetsPage : public WidgetsPage
 {
 public:
     RadioWidgetsPage(wxNotebook *notebook, wxImageList *imaglist);
-    virtual ~RadioWidgetsPage();
+    virtual ~RadioWidgetsPage(){};
 
 protected:
     // event handlers
@@ -262,10 +262,6 @@ RadioWidgetsPage::RadioWidgetsPage(wxNotebook *notebook,
     sizerTop->Fit(this);
 }
 
-RadioWidgetsPage::~RadioWidgetsPage()
-{
-}
-
 // ----------------------------------------------------------------------------
 // operations
 // ----------------------------------------------------------------------------

samples/widgets/slider.cpp

@@ -88,7 +88,7 @@ class SliderWidgetsPage : public WidgetsPage
 {
 public:
     SliderWidgetsPage(wxNotebook *notebook, wxImageList *imaglist);
-    virtual ~SliderWidgetsPage();
+    virtual ~SliderWidgetsPage(){};
 
 protected:
     // event handlers
@@ -313,10 +313,6 @@ SliderWidgetsPage::SliderWidgetsPage(wxNotebook *notebook,
     sizerTop->Fit(this);
 }
 
-SliderWidgetsPage::~SliderWidgetsPage()
-{
-}
-
 // ----------------------------------------------------------------------------
 // operations
 // ----------------------------------------------------------------------------

samples/widgets/spinbtn.cpp

@@ -72,7 +72,7 @@ class SpinBtnWidgetsPage : public WidgetsPage
 {
 public:
     SpinBtnWidgetsPage(wxNotebook *notebook, wxImageList *imaglist);
-    virtual ~SpinBtnWidgetsPage();
+    virtual ~SpinBtnWidgetsPage(){};
 
 protected:
     // event handlers
@@ -251,10 +251,6 @@ SpinBtnWidgetsPage::SpinBtnWidgetsPage(wxNotebook *notebook,
     sizerTop->Fit(this);
 }
 
-SpinBtnWidgetsPage::~SpinBtnWidgetsPage()
-{
-}
-
 // ----------------------------------------------------------------------------
 // operations
 // ----------------------------------------------------------------------------

samples/widgets/static.cpp

@@ -140,7 +140,7 @@ class StaticWidgetsPage : public WidgetsPage
 {
 public:
     StaticWidgetsPage(wxNotebook *notebook, wxImageList *imaglist);
-    virtual ~StaticWidgetsPage();
+    virtual ~StaticWidgetsPage(){};
 
 protected:
     // event handlers
@@ -302,10 +302,6 @@ StaticWidgetsPage::StaticWidgetsPage(wxNotebook *notebook,
     sizerTop->Fit(this);
 }
 
-StaticWidgetsPage::~StaticWidgetsPage()
-{
-}
-
 // ----------------------------------------------------------------------------
 // operations
 // ----------------------------------------------------------------------------

samples/widgets/textctrl.cpp

@@ -114,7 +114,7 @@ class TextWidgetsPage : public WidgetsPage
 public:
     // ctor(s) and dtor
     TextWidgetsPage(wxNotebook *notebook, wxImageList *imaglist);
-    virtual ~TextWidgetsPage();
+    virtual ~TextWidgetsPage(){};
 
 protected:
     // create an info text contorl
@@ -499,10 +499,6 @@ TextWidgetsPage::TextWidgetsPage(wxNotebook *notebook, wxImageList *imaglist)
     sizerTop->Fit(this);
 }
 
-TextWidgetsPage::~TextWidgetsPage()
-{
-}
-
 // ----------------------------------------------------------------------------
 // creation helpers
 // ----------------------------------------------------------------------------