From b919f007af55c6bcba975ead6177c80a317e1a4a Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Mon, 3 Jan 2000 13:45:20 +0000 Subject: [PATCH] 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 --- samples/life/life.cpp | 5 +- src/common/sizer.cpp | 202 +++++++++++++++++++++--------------------- src/gtk/menu.cpp | 2 +- src/gtk1/menu.cpp | 2 +- 4 files changed, 106 insertions(+), 105 deletions(-) diff --git a/samples/life/life.cpp b/samples/life/life.cpp index 89c513f840..b573c09f7f 100644 --- a/samples/life/life.cpp +++ b/samples/life/life.cpp @@ -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 { diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp index 6280097628..1acfd70e61 100644 --- a/src/common/sizer.cpp +++ b/src/common/sizer.cpp @@ -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; } @@ -292,11 +292,11 @@ bool wxSizer::Remove( wxWindow *window ) while (node) { wxSizerItem *item = (wxSizerItem*)node->Data(); - if (item->GetWindow() == window) - { + if (item->GetWindow() == window) + { m_children.DeleteNode( node ); - return TRUE; - } + return TRUE; + } node = node->Next(); } @@ -311,11 +311,11 @@ bool wxSizer::Remove( wxSizer *sizer ) while (node) { wxSizerItem *item = (wxSizerItem*)node->Data(); - if (item->GetSizer() == sizer) - { + if (item->GetSizer() == sizer) + { m_children.DeleteNode( node ); - return TRUE; - } + return TRUE; + } node = node->Next(); } @@ -390,12 +390,12 @@ void wxBoxSizer::RecalcSizes() { delta = (m_size.x - m_fixedWidth) / m_stretchable; extra = (m_size.x - m_fixedWidth) % m_stretchable; - } - else - { + } + else + { delta = (m_size.y - m_fixedHeight) / m_stretchable; extra = (m_size.y - m_fixedHeight) % m_stretchable; - } + } } wxPoint pt( m_position ); @@ -405,64 +405,64 @@ void wxBoxSizer::RecalcSizes() { wxSizerItem *item = (wxSizerItem*) node->Data(); - int weight = 1; - if (item->GetOption()) - weight = item->GetOption(); + int weight = 1; + if (item->GetOption()) + weight = item->GetOption(); - wxSize size( item->CalcMin() ); + wxSize size( item->CalcMin() ); - if (m_orient == wxVERTICAL) - { - wxCoord height = size.y; - if (item->GetOption()) + if (m_orient == wxVERTICAL) { - height = (delta * weight) + extra; - extra = 0; // only the first item will get the remainder as extra size + wxCoord height = size.y; + if (item->GetOption()) + { + height = (delta * weight) + extra; + extra = 0; // only the first item will get the remainder as extra size + } + + wxPoint child_pos( pt ); + wxSize child_size( wxSize( size.x, height) ); + + if (item->GetFlag() & (wxEXPAND | wxSHAPED)) + child_size.x = m_size.x; + else if (item->GetFlag() & wxALIGN_RIGHT) + child_pos.x += m_size.x - size.x; + else if (item->GetFlag() & (wxCENTER | wxALIGN_CENTER_HORIZONTAL)) + // XXX wxCENTER is added for backward compatibility; + // wxALIGN_CENTER should be used in new code + child_pos.x += (m_size.x - size.x) / 2; + + item->SetDimension( child_pos, child_size ); + + pt.y += height; } - - wxPoint child_pos( pt ); - wxSize child_size( wxSize( size.x, height) ); - - if (item->GetFlag() & (wxEXPAND | wxSHAPED)) - child_size.x = m_size.x; - else if (item->GetFlag() & wxALIGN_RIGHT) - child_pos.x += m_size.x - size.x; - else if (item->GetFlag() & (wxCENTER | wxALIGN_CENTER_HORIZONTAL)) - // XXX wxCENTER is added for backward compatibility; - // wxALIGN_CENTER should be used in new code - child_pos.x += (m_size.x - size.x) / 2; - - item->SetDimension( child_pos, child_size ); - - pt.y += height; - } - else - { - wxCoord width = size.x; - if (item->GetOption()) + else { - width = (delta * weight) + extra; - extra = 0; // only the first item will get the remainder as extra size + wxCoord width = size.x; + if (item->GetOption()) + { + width = (delta * weight) + extra; + extra = 0; // only the first item will get the remainder as extra size + } + + wxPoint child_pos( pt ); + wxSize child_size( wxSize(width, size.y) ); + + if (item->GetFlag() & (wxEXPAND | wxSHAPED)) + child_size.y = m_size.y; + else if (item->GetFlag() & wxALIGN_BOTTOM) + child_pos.y += m_size.y - size.y; + else if (item->GetFlag() & (wxCENTER | wxALIGN_CENTER_VERTICAL)) + // XXX wxCENTER is added for backward compatibility; + // wxALIGN_CENTER should be used in new code + child_pos.y += (m_size.y - size.y) / 2; + + item->SetDimension( child_pos, child_size ); + + pt.x += width; } - wxPoint child_pos( pt ); - wxSize child_size( wxSize(width, size.y) ); - - if (item->GetFlag() & (wxEXPAND | wxSHAPED)) - child_size.y = m_size.y; - else if (item->GetFlag() & wxALIGN_BOTTOM) - child_pos.y += m_size.y - size.y; - else if (item->GetFlag() & (wxCENTER | wxALIGN_CENTER_VERTICAL)) - // XXX wxCENTER is added for backward compatibility; - // wxALIGN_CENTER should be used in new code - child_pos.y += (m_size.y - size.y) / 2; - - item->SetDimension( child_pos, child_size ); - - pt.x += width; - } - - node = node->Next(); + node = node->Next(); } } @@ -482,42 +482,42 @@ wxSize wxBoxSizer::CalcMin() { wxSizerItem *item = (wxSizerItem*) node->Data(); - int weight = 1; - if (item->GetOption()) - weight = item->GetOption(); - - wxSize size( item->CalcMin() ); - - if (m_orient == wxHORIZONTAL) - { - m_minWidth += (size.x * weight); - m_minHeight = wxMax( m_minHeight, size.y ); - } - else - { - m_minHeight += (size.y * weight); - m_minWidth = wxMax( m_minWidth, size.x ); - } - - if (item->GetOption()) - { - m_stretchable += weight; - } - else - { - if (m_orient == wxVERTICAL) + int weight = 1; + if (item->GetOption()) + weight = item->GetOption(); + + wxSize size( item->CalcMin() ); + + if (m_orient == wxHORIZONTAL) { - m_fixedHeight += size.y; - m_fixedWidth = wxMax( m_fixedWidth, size.x ); + m_minWidth += (size.x * weight); + m_minHeight = wxMax( m_minHeight, size.y ); } else { - m_fixedWidth += size.x; - m_fixedHeight = wxMax( m_fixedHeight, size.y ); + m_minHeight += (size.y * weight); + m_minWidth = wxMax( m_minWidth, size.x ); } - } - node = node->Next(); + if (item->GetOption()) + { + m_stretchable += weight; + } + else + { + if (m_orient == wxVERTICAL) + { + m_fixedHeight += size.y; + m_fixedWidth = wxMax( m_fixedWidth, size.x ); + } + else + { + m_fixedWidth += size.x; + m_fixedHeight = wxMax( m_fixedHeight, size.y ); + } + } + + node = node->Next(); } return wxSize( m_minWidth, m_minHeight ); @@ -622,17 +622,17 @@ wxSize wxNotebookSizer::CalcMin() while (node) { wxWindow *item = node->GetData(); - wxSizer *itemsizer = item->GetSizer(); + wxSizer *itemsizer = item->GetSizer(); - if (itemsizer) - { + if (itemsizer) + { wxSize subsize( itemsizer->CalcMin() ); - if (subsize.x > maxX) maxX = subsize.x; - if (subsize.y > maxY) maxY = subsize.y; - } + if (subsize.x > maxX) maxX = subsize.x; + if (subsize.y > maxY) maxY = subsize.y; + } - node = node->GetNext(); + node = node->GetNext(); } return wxSize( borderX + maxX, borderY + maxY ); diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp index 20fce15bf0..094b02165a 100644 --- a/src/gtk/menu.cpp +++ b/src/gtk/menu.cpp @@ -480,7 +480,7 @@ void wxMenuBar::SetLabelTop( size_t pos, const wxString& label ) static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu ) { if (g_isIdle) wxapp_install_idle_handler(); - + int id = menu->FindMenuIdByMenuItem(widget); /* should find it for normal (not popup) menu */ diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp index 20fce15bf0..094b02165a 100644 --- a/src/gtk1/menu.cpp +++ b/src/gtk1/menu.cpp @@ -480,7 +480,7 @@ void wxMenuBar::SetLabelTop( size_t pos, const wxString& label ) static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu ) { if (g_isIdle) wxapp_install_idle_handler(); - + int id = menu->FindMenuIdByMenuItem(widget); /* should find it for normal (not popup) menu */ -- 2.45.2