(Open Watcom but not only) compilation warning fixes

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

diff --git a/samples/exec/exec.cpp b/samples/exec/exec.cpp
index 13cfdc28e9a68b353d25ff5f0634f78fe3cc80ad..d09f94e5c383d81e3aed07d01d5b999de16f54ce 100644 (file)
--- a/samples/exec/exec.cpp
+++ b/samples/exec/exec.cpp
@@ -83,7 +83,7 @@ public:
 
 // Define an array of process pointers used by MyFrame
 class MyPipedProcess;
-WX_DEFINE_ARRAY(MyPipedProcess *, MyProcessesArray);
+WX_DEFINE_ARRAY_NO_PTR(MyPipedProcess *, MyProcessesArray);
 
 // Define a new frame type: this is going to be our main frame
 class MyFrame : public wxFrame

diff --git a/samples/regtest/regtest.cpp b/samples/regtest/regtest.cpp
index 9e4c080e48307a7a5d451b0f9009e8d9ea10a60e..d9fdca92ef0fdaaac1ecf5c97c81285e46f4b1f8 100644 (file)
--- a/samples/regtest/regtest.cpp
+++ b/samples/regtest/regtest.cpp
@@ -104,7 +104,7 @@ private:
   // structure describing a registry key/value
   class TreeNode : public wxTreeItemData
   {
-  WX_DEFINE_ARRAY(TreeNode *, TreeChildren);
+  WX_DEFINE_ARRAY_NO_PTR(TreeNode *, TreeChildren);
   public:
       RegTreeCtrl  *m_pTree;     // must be !NULL
       TreeNode     *m_pParent;    // NULL only for the root node
@@ -1071,7 +1071,7 @@ void RegTreeCtrl::GoTo(const wxString& location)
 void RegTreeCtrl::DeleteSelected()
 {
   long lCurrent = GetSelection(),
-       lParent  = GetParent(lCurrent);
+       lParent  = GetItemParent(lCurrent);
 
   if ( lParent == 0 ) {
     wxLogError(wxT("Can't delete root key."));

diff --git a/samples/sockets/client.cpp b/samples/sockets/client.cpp
index 3ba76e9bf276ac112d581ccab46e6f628632aa3b..17781498d8ff6b65b204bef2bdcac4713e5359cd 100644 (file)
--- a/samples/sockets/client.cpp
+++ b/samples/sockets/client.cpp
@@ -571,7 +571,8 @@ void MyFrame::OnTestURL(wxCommandEvent& WXUNUSED(event))
   wxYield();
 
   // Get the data
-  wxFileOutputStream sout( wxT("test.url") );
+  wxFile fileTest(wxT("test.url"));
+  wxFileOutputStream sout(fileTest);
   if (!sout.Ok())
   {
     m_text->AppendText(_("Error: couldn't open file for output\n"));

diff --git a/samples/thread/thread.cpp b/samples/thread/thread.cpp
index 1fc119359c0b8dd1abac5115b14d962b4ab78aad..1040e283d047e0c47aa02e1f8ac814d7ff552710 100644 (file)
--- a/samples/thread/thread.cpp
+++ b/samples/thread/thread.cpp
@@ -39,7 +39,7 @@
 #endif
 
 class MyThread;
-WX_DEFINE_ARRAY(wxThread *, wxArrayThread);
+WX_DEFINE_ARRAY_NO_PTR(wxThread *, wxArrayThread);
 
 // Define a new application type
 class MyApp : public wxApp

diff --git a/samples/widgets/spinbtn.cpp b/samples/widgets/spinbtn.cpp
index 089bfb4fb202cfe44b0ca8a1b32bc29cd1e2b804..1082559a93a6390cd94cbd0f74709132fe73b570 100644 (file)
--- a/samples/widgets/spinbtn.cpp
+++ b/samples/widgets/spinbtn.cpp
@@ -83,10 +83,10 @@ protected:
 
     void OnCheckOrRadioBox(wxCommandEvent& event);
 
-    void OnSpinBtn(wxCommandEvent& event);
-    void OnSpinBtnUp(wxCommandEvent& event);
-    void OnSpinBtnDown(wxCommandEvent& event);
-    void OnSpinCtrl(wxCommandEvent& event);
+    void OnSpinBtn(wxSpinEvent& event);
+    void OnSpinBtnUp(wxSpinEvent& event);
+    void OnSpinBtnDown(wxSpinEvent& event);
+    void OnSpinCtrl(wxSpinEvent& event);
 
     void OnUpdateUIValueButton(wxUpdateUIEvent& event);
     void OnUpdateUIMinMaxButton(wxUpdateUIEvent& event);
@@ -394,7 +394,7 @@ void SpinBtnWidgetsPage::OnUpdateUICurValueText(wxUpdateUIEvent& event)
     event.SetText( wxString::Format(_T("%d"), m_spinbtn->GetValue()));
 }
 
-void SpinBtnWidgetsPage::OnSpinBtn(wxCommandEvent& event)
+void SpinBtnWidgetsPage::OnSpinBtn(wxSpinEvent& event)
 {
     int value = event.GetInt();
 
@@ -404,19 +404,19 @@ void SpinBtnWidgetsPage::OnSpinBtn(wxCommandEvent& event)
     wxLogMessage(_T("Spin button value changed, now %d"), value);
 }
 
-void SpinBtnWidgetsPage::OnSpinBtnUp(wxCommandEvent& event)
+void SpinBtnWidgetsPage::OnSpinBtnUp(wxSpinEvent& event)
 {
     wxLogMessage( _T("Spin button value incremented, will be %ld (was %d)"),
                   event.GetInt(), m_spinbtn->GetValue() );
 }
 
-void SpinBtnWidgetsPage::OnSpinBtnDown(wxCommandEvent& event)
+void SpinBtnWidgetsPage::OnSpinBtnDown(wxSpinEvent& event)
 {
     wxLogMessage( _T("Spin button value decremented, will be %ld (was %d)"),
                   event.GetInt(), m_spinbtn->GetValue() );
 }
 
-void SpinBtnWidgetsPage::OnSpinCtrl(wxCommandEvent& event)
+void SpinBtnWidgetsPage::OnSpinCtrl(wxSpinEvent& event)
 {
     if (!m_spinctrl)
         return;

diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp
index 494d77bd0096161ef8cfdca754aa2c09d3510244..793f15b039dd9285c18f678a66685e6a0f3fd088 100644 (file)
--- a/samples/widgets/widgets.cpp
+++ b/samples/widgets/widgets.cpp
@@ -164,7 +164,7 @@ private:
 };
 
 // array of pages
-WX_DEFINE_ARRAY(WidgetsPage *, ArrayWidgetsPage);
+WX_DEFINE_ARRAY_NO_PTR(WidgetsPage *, ArrayWidgetsPage);
 
 // ----------------------------------------------------------------------------
 // misc macros