Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Patch [ 584078 ] Misc samples fixes from Dimitri Schoolwerth

Browse Source 
Addresses:
  printf-format warinigs
  indentation/style
  unused variable warnings
  used wxID_ABOUT for about menu entry
  removed references to "minimal sample" in other samples
  some other misc warinigs


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16339 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2002-08-01 19:12:24 +00:00
parent fd2807075d
commit aec18ff785
20 changed files with 477 additions and 514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/widgets/combobox.cpp
View File

@@ -494,10 +494,10 @@ void ComboboxWidgetsPage::OnComboText(wxCommandEvent& event)
void ComboboxWidgetsPage::OnComboBox(wxCommandEvent& event)
{
int sel = event.GetInt();
long sel = event.GetInt();
m_textDelete->SetValue(wxString::Format(_T("%ld"), sel));
wxLogMessage(_T("Combobox item %d selected"), sel);
wxLogMessage(_T("Combobox item %ld selected"), sel);
}
void ComboboxWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& event)

4
samples/widgets/gauge.cpp
View File

@@ -209,7 +209,7 @@ GaugeWidgetsPage::GaugeWidgetsPage(wxNotebook *notebook,
_T("Set &range"),
GaugePage_RangeText,
&m_textRange);
m_textRange->SetValue(wxString::Format(_T("%lu"), m_range));
m_textRange->SetValue( wxString::Format(_T("%lu"), m_range) );
sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
btn = new wxButton(this, GaugePage_Progress, _T("Simulate &progress"));
@@ -400,4 +400,4 @@ void GaugeWidgetsPage::StopTimer()
wxLogMessage(_T("Progress finished."));
}
#endif
#endif

10
samples/widgets/listbox.cpp
View File

@@ -491,20 +491,20 @@ void ListboxWidgetsPage::OnUpdateUIAddSeveral(wxUpdateUIEvent& event)
void ListboxWidgetsPage::OnListbox(wxCommandEvent& event)
{
int sel = event.GetInt();
long sel = event.GetInt();
m_textDelete->SetValue(wxString::Format(_T("%ld"), sel));
wxLogMessage(_T("Listbox item %d selected"), sel);
wxLogMessage(_T("Listbox item %ld selected"), sel);
}
void ListboxWidgetsPage::OnListboxDClick(wxCommandEvent& event)
{
wxLogMessage(_T("Listbox item %d double clicked"), event.GetInt());
wxLogMessage( _T("Listbox item %ld double clicked"), event.GetInt() );
}
void ListboxWidgetsPage::OnCheckListbox(wxCommandEvent& event)
{
wxLogMessage(_T("Listbox item %d toggled"), event.GetInt());
wxLogMessage( _T("Listbox item %ld toggled"), event.GetInt() );
}
void ListboxWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& event)
@@ -512,4 +512,4 @@ void ListboxWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& event)
CreateLbox();
}
#endif
#endif

2
samples/widgets/radiobox.cpp
View File

@@ -454,4 +454,4 @@ void RadioWidgetsPage::OnUpdateUIReset(wxUpdateUIEvent& event)
event.Enable(enable);
}
#endif
#endif

10
samples/widgets/slider.cpp
View File

@@ -231,8 +231,8 @@ SliderWidgetsPage::SliderWidgetsPage(wxNotebook *notebook,
m_textMax = new wxTextCtrl(this, SliderPage_MaxText, _T(""));
sizerRow->Add(m_textMax, 1, wxLEFT | wxALIGN_CENTRE_VERTICAL, 5);
m_textMin->SetValue(wxString::Format(_T("%lu"), m_min));
m_textMax->SetValue(wxString::Format(_T("%lu"), m_max));
m_textMin->SetValue( wxString::Format(_T("%d"), m_min) );
m_textMax->SetValue( wxString::Format(_T("%d"), m_max) );
sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
@@ -449,7 +449,7 @@ void SliderWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& event)
void SliderWidgetsPage::OnUpdateUICurValueText(wxUpdateUIEvent& event)
{
event.SetText( wxString::Format(_T("%d"), m_slider->GetValue()));
event.SetText( wxString::Format(_T("%d"), m_slider->GetValue()) );
}
void SliderWidgetsPage::OnUpdateUIOtherSide(wxUpdateUIEvent& event)
@@ -459,10 +459,10 @@ void SliderWidgetsPage::OnUpdateUIOtherSide(wxUpdateUIEvent& event)
void SliderWidgetsPage::OnSlider(wxScrollEvent& event)
{
int value = event.GetInt();
long value = event.GetInt();
wxASSERT_MSG( value == m_slider->GetValue(),
wxT("slider value should be the same") );
wxT("slider value should be the same") );
wxEventType eventType = event.GetEventType();

12
samples/widgets/spinbtn.cpp
View File

@@ -224,8 +224,8 @@ SpinBtnWidgetsPage::SpinBtnWidgetsPage(wxNotebook *notebook,
m_textMax = new wxTextCtrl(this, SpinBtnPage_MaxText, _T(""));
sizerRow->Add(m_textMax, 1, wxLEFT | wxALIGN_CENTRE_VERTICAL, 5);
m_textMin->SetValue(wxString::Format(_T("%lu"), m_min));
m_textMax->SetValue(wxString::Format(_T("%lu"), m_max));
m_textMin->SetValue( wxString::Format(_T("%d"), m_min) );
m_textMax->SetValue( wxString::Format(_T("%d"), m_max) );
sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
@@ -405,14 +405,14 @@ void SpinBtnWidgetsPage::OnSpinBtn(wxCommandEvent& event)
void SpinBtnWidgetsPage::OnSpinBtnUp(wxCommandEvent& event)
{
wxLogMessage(_T("Spin button value incremented, will be %d (was %d)"),
event.GetInt(), m_spinbtn->GetValue());
wxLogMessage( _T("Spin button value incremented, will be %ld (was %d)"),
event.GetInt(), m_spinbtn->GetValue() );
}
void SpinBtnWidgetsPage::OnSpinBtnDown(wxCommandEvent& event)
{
wxLogMessage(_T("Spin button value decremented, will be %d (was %d)"),
event.GetInt(), m_spinbtn->GetValue());
wxLogMessage( _T("Spin button value decremented, will be %ld (was %d)"),
event.GetInt(), m_spinbtn->GetValue() );
}
void SpinBtnWidgetsPage::OnSpinCtrl(wxCommandEvent& event)

4
samples/widgets/textctrl.cpp
View File

@@ -604,7 +604,7 @@ void TextWidgetsPage::OnIdle(wxIdleEvent& WXUNUSED(event))
if ( m_textLineLast )
{
m_textLineLast->SetValue(
wxString::Format(_T("%ld"), m_text->GetNumberOfLines()));
wxString::Format(_T("%d"), m_text->GetNumberOfLines()) );
}
if ( m_textSelFrom && m_textSelTo )
@@ -699,7 +699,7 @@ void TextWidgetsPage::OnButtonLoad(wxCommandEvent& WXUNUSED(event))
else
{
long elapsed = sw.Time();
wxLogMessage(_T("Loaded file '%s' in %u.%us"),
wxLogMessage(_T("Loaded file '%s' in %lu.%us"),
filename.c_str(), elapsed / 1000, elapsed % 1000);
}
}