Warning fixes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32536 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-03-01 16:53:22 +00:00
parent b0f3dd44e4
commit 21fe01e299
3 changed files with 15 additions and 14 deletions

View File

@@ -122,6 +122,7 @@ wxInputStream& DrawingDocument::LoadObject(wxInputStream& stream)
#endif #endif
DoodleSegment::DoodleSegment(DoodleSegment& seg) DoodleSegment::DoodleSegment(DoodleSegment& seg)
:wxObject()
{ {
wxList::compatibility_iterator node = seg.lines.GetFirst(); wxList::compatibility_iterator node = seg.lines.GetFirst();
while (node) while (node)

View File

@@ -127,7 +127,7 @@ SimpleTransientPopup::SimpleTransientPopup( wxWindow *parent ) :
size.y = m_button->GetRect().GetBottom(); size.y = m_button->GetRect().GetBottom();
m_spinCtrl = new wxSpinCtrl(m_panel, Minimal_PopupSpinctrl, wxT("Hello"), wxPoint(0, size.y + 5)); m_spinCtrl = new wxSpinCtrl(m_panel, Minimal_PopupSpinctrl, wxT("Hello"), wxPoint(0, size.y + 5));
size.y = m_spinCtrl->GetRect().GetBottom(); size.y = m_spinCtrl->GetRect().GetBottom();
m_panel->SetSize( size.x+20, size.y+20 ); m_panel->SetSize( size.x+20, size.y+20 );
SetClientSize( 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); wxPopupTransientWindow::Popup(focus);
} }
void SimpleTransientPopup::OnDismiss() void SimpleTransientPopup::OnDismiss()
{ {
wxLogMessage( wxT("0x%x SimpleTransientPopup::OnDismiss"), long(this) ); wxLogMessage( wxT("0x%x SimpleTransientPopup::OnDismiss"), int(this) );
wxPopupTransientWindow::OnDismiss(); wxPopupTransientWindow::OnDismiss();
} }
bool SimpleTransientPopup::ProcessLeftDown(wxMouseEvent& event) 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); return wxPopupTransientWindow::ProcessLeftDown(event);
} }
bool SimpleTransientPopup::Show( bool show ) 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); return wxPopupTransientWindow::Show(show);
} }
void SimpleTransientPopup::OnSize(wxSizeEvent &event) void SimpleTransientPopup::OnSize(wxSizeEvent &event)
{ {
wxLogMessage( wxT("0x%x SimpleTransientPopup::OnSize"), long(this) ); wxLogMessage( wxT("0x%x SimpleTransientPopup::OnSize"), int(this) );
event.Skip(); event.Skip();
} }
void SimpleTransientPopup::OnSetFocus(wxFocusEvent &event) void SimpleTransientPopup::OnSetFocus(wxFocusEvent &event)
{ {
wxLogMessage( wxT("0x%x SimpleTransientPopup::OnSetFocus"), long(this) ); wxLogMessage( wxT("0x%x SimpleTransientPopup::OnSetFocus"), int(this) );
event.Skip(); event.Skip();
} }
void SimpleTransientPopup::OnKillFocus(wxFocusEvent &event) void SimpleTransientPopup::OnKillFocus(wxFocusEvent &event)
{ {
wxLogMessage( wxT("0x%x SimpleTransientPopup::OnKillFocus"), long(this) ); wxLogMessage( wxT("0x%x SimpleTransientPopup::OnKillFocus"), int(this) );
event.Skip(); event.Skip();
} }
void SimpleTransientPopup::OnMouse(wxMouseEvent &event) 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(); event.Skip();
} }
void SimpleTransientPopup::OnButton(wxCommandEvent& event) 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); wxButton *button = wxDynamicCast(event.GetEventObject(), wxButton);
if (button->GetLabel() == wxT("Press Me")) 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();
} }

View File

@@ -1028,9 +1028,9 @@ void MyApp::DoVariantDemo(wxCommandEvent& WXUNUSED(event) )
wxUnusedVar(l); wxUnusedVar(l);
wxUnusedVar(v); wxUnusedVar(v);
wxStringList stringList; wxArrayString stringArray;
stringList.Add(_T("one")); stringList.Add(_T("two")); stringList.Add(_T("three")); stringArray.Add(_T("one")); stringArray.Add(_T("two")); stringArray.Add(_T("three"));
var1 = stringList; var1 = stringArray;
textCtrl << _T("var1 = ") << var1.MakeString() << _T("\n"); textCtrl << _T("var1 = ") << var1.MakeString() << _T("\n");
var1.ClearList(); var1.ClearList();