Warning fixes.

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

diff --git a/samples/docvwmdi/doc.cpp b/samples/docvwmdi/doc.cpp
index d55b80a34ea0f0cfb3f5b9a49b46885c54e2e070..1da72d5f13fd7156ee269084c287966b57b4cfa7 100644 (file)
--- a/samples/docvwmdi/doc.cpp
+++ b/samples/docvwmdi/doc.cpp
@@ -122,6 +122,7 @@ wxInputStream& DrawingDocument::LoadObject(wxInputStream& stream)
 #endif
 
 DoodleSegment::DoodleSegment(DoodleSegment& seg)
 #endif
 
 DoodleSegment::DoodleSegment(DoodleSegment& seg)

+              :wxObject()

 {
   wxList::compatibility_iterator node = seg.lines.GetFirst();
   while (node)
 {
   wxList::compatibility_iterator node = seg.lines.GetFirst();
   while (node)

diff --git a/samples/popup/popup.cpp b/samples/popup/popup.cpp
index 7fd0d7adc2250e9dc097c0be683bfbb284a69efc..d18a040b6db0b360123ebce046ef1d5a602e7df4 100644 (file)
--- a/samples/popup/popup.cpp
+++ b/samples/popup/popup.cpp
@@ -127,7 +127,7 @@ SimpleTransientPopup::SimpleTransientPopup( wxWindow *parent ) :
     size.y = m_button->GetRect().GetBottom();
     m_spinCtrl = new wxSpinCtrl(m_panel, Minimal_PopupSpinctrl, wxT("Hello"), wxPoint(0, size.y + 5));
     size.y = m_spinCtrl->GetRect().GetBottom();
     size.y = m_button->GetRect().GetBottom();
     m_spinCtrl = new wxSpinCtrl(m_panel, Minimal_PopupSpinctrl, wxT("Hello"), wxPoint(0, size.y + 5));
     size.y = m_spinCtrl->GetRect().GetBottom();

-    
+

     m_panel->SetSize( size.x+20, size.y+20 );
     SetClientSize( size.x+20, size.y+20 );
 }
     m_panel->SetSize( size.x+20, size.y+20 );
     SetClientSize( size.x+20, size.y+20 );
 }


@@ -138,54 +138,54 @@ SimpleTransientPopup::~SimpleTransientPopup()
 
 void SimpleTransientPopup::Popup(wxWindow *focus)
 {
 
 void SimpleTransientPopup::Popup(wxWindow *focus)
 {

-    wxLogMessage( wxT("0x%x SimpleTransientPopup::Popup"), long(this) );
+    wxLogMessage( wxT("0x%x SimpleTransientPopup::Popup"), int(this) );

     wxPopupTransientWindow::Popup(focus);
 }
 
 void SimpleTransientPopup::OnDismiss()
 {
     wxPopupTransientWindow::Popup(focus);
 }
 
 void SimpleTransientPopup::OnDismiss()
 {

-    wxLogMessage( wxT("0x%x SimpleTransientPopup::OnDismiss"), long(this) );
+    wxLogMessage( wxT("0x%x SimpleTransientPopup::OnDismiss"), int(this) );

     wxPopupTransientWindow::OnDismiss();
 }
 
 bool SimpleTransientPopup::ProcessLeftDown(wxMouseEvent& event)
 {
     wxPopupTransientWindow::OnDismiss();
 }
 
 bool SimpleTransientPopup::ProcessLeftDown(wxMouseEvent& event)
 {

-    wxLogMessage( wxT("0x%x SimpleTransientPopup::ProcessLeftDown pos(%d, %d)"), long(this), event.GetX(), event.GetY());
+    wxLogMessage( wxT("0x%x SimpleTransientPopup::ProcessLeftDown pos(%d, %d)"), int(this), event.GetX(), event.GetY());

     return wxPopupTransientWindow::ProcessLeftDown(event);
 }
 bool SimpleTransientPopup::Show( bool show )
 {
     return wxPopupTransientWindow::ProcessLeftDown(event);
 }
 bool SimpleTransientPopup::Show( bool show )
 {

-    wxLogMessage( wxT("0x%x SimpleTransientPopup::Show %d"), long(this), int(show));
+    wxLogMessage( wxT("0x%x SimpleTransientPopup::Show %d"), int(this), int(show));

     return wxPopupTransientWindow::Show(show);
 }
 
 void SimpleTransientPopup::OnSize(wxSizeEvent &event)
 {
     return wxPopupTransientWindow::Show(show);
 }
 
 void SimpleTransientPopup::OnSize(wxSizeEvent &event)
 {

-    wxLogMessage( wxT("0x%x SimpleTransientPopup::OnSize"), long(this) );
+    wxLogMessage( wxT("0x%x SimpleTransientPopup::OnSize"), int(this) );

     event.Skip();
 }
 
 void SimpleTransientPopup::OnSetFocus(wxFocusEvent &event)
 {
     event.Skip();
 }
 
 void SimpleTransientPopup::OnSetFocus(wxFocusEvent &event)
 {

-    wxLogMessage( wxT("0x%x SimpleTransientPopup::OnSetFocus"), long(this) );
+    wxLogMessage( wxT("0x%x SimpleTransientPopup::OnSetFocus"), int(this) );

     event.Skip();
 }
 
 void SimpleTransientPopup::OnKillFocus(wxFocusEvent &event)
 {
     event.Skip();
 }
 
 void SimpleTransientPopup::OnKillFocus(wxFocusEvent &event)
 {

-    wxLogMessage( wxT("0x%x SimpleTransientPopup::OnKillFocus"), long(this) );
+    wxLogMessage( wxT("0x%x SimpleTransientPopup::OnKillFocus"), int(this) );

     event.Skip();
 }
 
 void SimpleTransientPopup::OnMouse(wxMouseEvent &event)
 {
     event.Skip();
 }
 
 void SimpleTransientPopup::OnMouse(wxMouseEvent &event)
 {

-    wxLogMessage( wxT("0x%x SimpleTransientPopup::OnMouse pos(%d, %d)"), long(this), event.GetX(), event.GetY());
+    wxLogMessage( wxT("0x%x SimpleTransientPopup::OnMouse pos(%d, %d)"), int(this), event.GetX(), event.GetY());

     event.Skip();
 }
 
 void SimpleTransientPopup::OnButton(wxCommandEvent& event)
 {
     event.Skip();
 }
 
 void SimpleTransientPopup::OnButton(wxCommandEvent& event)
 {

-    wxLogMessage( wxT("0x%x SimpleTransientPopup::OnButton ID %d"), long(this), event.GetId());
+    wxLogMessage( wxT("0x%x SimpleTransientPopup::OnButton ID %d"), int(this), event.GetId());

 
     wxButton *button = wxDynamicCast(event.GetEventObject(), wxButton);
     if (button->GetLabel() == wxT("Press Me"))
 
     wxButton *button = wxDynamicCast(event.GetEventObject(), wxButton);
     if (button->GetLabel() == wxT("Press Me"))


@@ -198,7 +198,7 @@ void SimpleTransientPopup::OnButton(wxCommandEvent& event)
 
 void SimpleTransientPopup::OnSpinCtrl(wxSpinEvent& event)
 {
 
 void SimpleTransientPopup::OnSpinCtrl(wxSpinEvent& event)
 {

-    wxLogMessage( wxT("0x%x SimpleTransientPopup::OnSpinCtrl ID %d Value %d"), long(this), event.GetId(), event.GetInt());
+    wxLogMessage( wxT("0x%x SimpleTransientPopup::OnSpinCtrl ID %d Value %d"), int(this), event.GetId(), event.GetInt());

     event.Skip();
 }
 
     event.Skip();
 }
 

diff --git a/samples/typetest/typetest.cpp b/samples/typetest/typetest.cpp
index 983961312d6be4a778f64c6746bb768dc9055a6f..49aaa75753cd0cfda98195043538d914668d72e2 100644 (file)
--- a/samples/typetest/typetest.cpp
+++ b/samples/typetest/typetest.cpp
@@ -1028,9 +1028,9 @@ void MyApp::DoVariantDemo(wxCommandEvent& WXUNUSED(event) )
     wxUnusedVar(l);
     wxUnusedVar(v);
 
     wxUnusedVar(l);
     wxUnusedVar(v);
 

-    wxStringList stringList;
-    stringList.Add(_T("one")); stringList.Add(_T("two")); stringList.Add(_T("three"));
-    var1 = stringList;
+    wxArrayString stringArray;
+    stringArray.Add(_T("one")); stringArray.Add(_T("two")); stringArray.Add(_T("three"));
+    var1 = stringArray;

     textCtrl << _T("var1 = ") << var1.MakeString() << _T("\n");
 
     var1.ClearList();
     textCtrl << _T("var1 = ") << var1.MakeString() << _T("\n");
 
     var1.ClearList();