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

Warning fix.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35201 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-08-16 20:50:02 +00:00
parent ebeb1b6ad1
commit 0d29fecd2e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
samples/controls/controls.cpp
View File

@@ -327,7 +327,7 @@ public:
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxChoiceNameStr ) const wxString& name = wxChoiceNameStr )
: wxChoice(parent, id, pos, size, n, choices, : wxChoice(parent, id, pos, size, n, choices,
style, validator, name) { } style, validator, name) { }
protected: protected:
@@ -833,10 +833,10 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
#if wxUSE_SLIDER && wxUSE_GAUGE #if wxUSE_SLIDER && wxUSE_GAUGE
panel = new wxPanel(m_book); panel = new wxPanel(m_book);
wxBoxSizer *main_sizer = new wxBoxSizer( wxHORIZONTAL ); wxBoxSizer *main_sizer = new wxBoxSizer( wxHORIZONTAL );
panel->SetSizer( main_sizer ); panel->SetSizer( main_sizer );
wxStaticBoxSizer *gauge_sizer = new wxStaticBoxSizer( wxHORIZONTAL, panel, _T("&wxGauge and wxSlider") ); wxStaticBoxSizer *gauge_sizer = new wxStaticBoxSizer( wxHORIZONTAL, panel, _T("&wxGauge and wxSlider") );
main_sizer->Add( gauge_sizer, 0, wxALL, 5 ); main_sizer->Add( gauge_sizer, 0, wxALL, 5 );
wxBoxSizer *sz = new wxBoxSizer( wxVERTICAL ); wxBoxSizer *sz = new wxBoxSizer( wxVERTICAL );
@@ -853,7 +853,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
m_slider->SetToolTip(_T("This is a sliding slider")); m_slider->SetToolTip(_T("This is a sliding slider"));
#endif // wxUSE_TOOLTIPS #endif // wxUSE_TOOLTIPS
sz->Add( m_slider, 0, wxALL, 10 ); sz->Add( m_slider, 0, wxALL, 10 );
m_gaugeVert = new wxGauge( panel, wxID_ANY, 100, m_gaugeVert = new wxGauge( panel, wxID_ANY, 100,
wxDefaultPosition, wxSize(wxDefaultCoord, 90), wxDefaultPosition, wxSize(wxDefaultCoord, 90),
wxGA_VERTICAL | wxGA_SMOOTH | wxNO_BORDER ); wxGA_VERTICAL | wxGA_SMOOTH | wxNO_BORDER );
@@ -1349,7 +1349,7 @@ void MyPanel::OnChoiceButtons( wxCommandEvent &event )
void MyPanel::OnCombo( wxCommandEvent &event ) void MyPanel::OnCombo( wxCommandEvent &event )
{ {
wxLogMessage(_T("EVT_COMBOBOX: item %d/%d (event/control), string \"%s\"/\"%s\""), wxLogMessage(_T("EVT_COMBOBOX: item %d/%d (event/control), string \"%s\"/\"%s\""),
event.GetInt(), (int)event.GetInt(),
m_combo->GetSelection(), m_combo->GetSelection(),
event.GetString().c_str(), event.GetString().c_str(),
m_combo->GetStringSelection().c_str()); m_combo->GetStringSelection().c_str());