Corrected some things in, and some thing revealed by
the Life! sample. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5197 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -236,8 +236,8 @@ enum
|
||||
ID_CLEAR,
|
||||
ID_START,
|
||||
ID_STOP,
|
||||
ID_ABOUT,
|
||||
ID_EXIT,
|
||||
ID_ABOUT,
|
||||
|
||||
// slider
|
||||
ID_SLIDER
|
||||
@@ -351,7 +351,7 @@ LifeFrame::LifeFrame() : wxFrame((wxFrame *)0, -1, _("Life!"), wxPoint(50, 50))
|
||||
|
||||
// slider
|
||||
wxSlider *slider = new wxSlider(panel, ID_SLIDER, 5, 1, 10,
|
||||
wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL | wxSL_AUTOTICKS);
|
||||
wxDefaultPosition, wxSize(150,-1), wxSL_HORIZONTAL | wxSL_AUTOTICKS);
|
||||
|
||||
// component layout
|
||||
wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
|
||||
@@ -455,6 +455,7 @@ void LifeFrame::OnNewGame()
|
||||
m_canvas->Reset();
|
||||
m_tics = 0;
|
||||
UpdateInfoText();
|
||||
m_canvas->Refresh();
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@@ -206,7 +206,7 @@ void wxSizerItem::SetDimension( wxPoint pos, wxSize size )
|
||||
m_sizer->SetDimension( pos.x, pos.y, size.x, size.y );
|
||||
|
||||
if (IsWindow())
|
||||
m_window->SetSize( pos.x, pos.y, size.x, size.y );
|
||||
m_window->SetSize( pos.x, pos.y, size.x, size.y, wxSIZE_ALLOW_MINUS_ONE );
|
||||
|
||||
m_size = size;
|
||||
}
|
||||
|
Reference in New Issue
Block a user