Warning fixes to most detailed warning output of OpenWatcom. Tested under Borland...

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

diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp
index 7264b345c56157ddbf676d23c13e6a3412d77764..db21fc0c5c6bcb9908260d29776ac9a87358863e 100644 (file)
--- a/samples/dialogs/dialogs.cpp
+++ b/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);
     }
 

diff --git a/samples/widgets/button.cpp b/samples/widgets/button.cpp
index 3c5c9c9b3e4a8caa55dfbfb55915d0004de77970..ebe6d458878e6053d6b75a84bd44eebfcf317907 100644 (file)
--- a/samples/widgets/button.cpp
+++ b/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
 // ----------------------------------------------------------------------------

diff --git a/samples/widgets/checkbox.cpp b/samples/widgets/checkbox.cpp
index 77136e673cd0e126687c5e9f0b61314e3336f340..e336b162213d6c5802faa4c6864e929fa2fbc4d4 100644 (file)
--- a/samples/widgets/checkbox.cpp
+++ b/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);

diff --git a/samples/widgets/radiobox.cpp b/samples/widgets/radiobox.cpp
index 3dbd14cb538106944ec863cdacc7c89a20c7e10e..d2f710cab5ba354e1076accf35145082fd45bc44 100644 (file)
--- a/samples/widgets/radiobox.cpp
+++ b/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
 // ----------------------------------------------------------------------------

diff --git a/samples/widgets/slider.cpp b/samples/widgets/slider.cpp
index 3dec8c559c9dd9f0de5394b4f292aedea3e1589d..87b03c1f9bf140a376a05bdb60a2b85c02d33008 100644 (file)
--- a/samples/widgets/slider.cpp
+++ b/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
 // ----------------------------------------------------------------------------

diff --git a/samples/widgets/spinbtn.cpp b/samples/widgets/spinbtn.cpp
index 10a3ae1904ce86e1a67d8295b292fa0073b0cbd6..281fab9bd7eb6ede8cc26369ac455cebe42d669c 100644 (file)
--- a/samples/widgets/spinbtn.cpp
+++ b/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
 // ----------------------------------------------------------------------------

diff --git a/samples/widgets/static.cpp b/samples/widgets/static.cpp
index 8680c07da7cd06254eae08df10bb1c32f8b3dcd5..8905378377e2c1462344d58af4eb3ff8c3936dc2 100644 (file)
--- a/samples/widgets/static.cpp
+++ b/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
 // ----------------------------------------------------------------------------

diff --git a/samples/widgets/textctrl.cpp b/samples/widgets/textctrl.cpp
index 31e3c9c15a6e55657678e2c80cc09136bb507e8e..6ad3bb6a2c6976ba6cdde2a54a3c168b54dbc97e 100644 (file)
--- a/samples/widgets/textctrl.cpp
+++ b/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
 // ----------------------------------------------------------------------------