diff --git a/docs/gtk/changes.txt b/docs/gtk/changes.txt index fe1eb4f1fb..f37d66dc3d 100644 --- a/docs/gtk/changes.txt +++ b/docs/gtk/changes.txt @@ -1,8 +1,27 @@ -22nd July 2000: wxWindows 2.2.1 released +XXth September: wxWindows 2.2.2 released + +Fixed wxSizer bug that made items with option +flags greater than 1 report a wrongn size. + +20th August 2000: wxWindows 2.2.1 released Minor build fixes. +Use the wxCommmandEvent::IsChecked() function for checkable +menu items. This mean that the m_int parameter no longer +contains the ID of the menu! + +Fixed major problems in ODBC logging code. This change is +binary backward incompatible. + +Fixed reentry problems in DnD code. + +Changed PostScript code so that it can handle a higher +resolution (720dpi). + +Minor improvements to wxGrid code. + Corrected guffow-scrolling so that no surplus expose events are generated. @@ -12,13 +31,12 @@ Minor correction to wxDC::DrawRoundedRectangle. Added support for and menu accelerators. -Use the wxCommmandEvent::IsChecked() function for checkable -menu items. - Made wxComboBox case-sensitive. Minor correction to doc-view architecture. +Minor wxCommandLineParser changes. + 10th July 2000: wxWindows 2.2.0 released Added code for writing BMP images. diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp index 0802fea039..a412637448 100644 --- a/src/common/sizer.cpp +++ b/src/common/sizer.cpp @@ -897,28 +897,22 @@ wxSize wxBoxSizer::CalcMin() { wxSizerItem *item = (wxSizerItem*) node->Data(); - int weight = 1; - if (item->GetOption()) - weight = item->GetOption(); - + m_stretchable += item->GetOption(); + wxSize size( item->CalcMin() ); if (m_orient == wxHORIZONTAL) { - m_minWidth += (size.x * weight); + m_minWidth += size.x; m_minHeight = wxMax( m_minHeight, size.y ); } else { - m_minHeight += (size.y * weight); + m_minHeight += size.y; m_minWidth = wxMax( m_minWidth, size.x ); } - if (item->GetOption()) - { - m_stretchable += weight; - } - else + if (item->GetOption() == 0) { if (m_orient == wxVERTICAL) { @@ -926,7 +920,7 @@ wxSize wxBoxSizer::CalcMin() m_fixedWidth = wxMax( m_fixedWidth, size.x ); } else - { + { m_fixedWidth += size.x; m_fixedHeight = wxMax( m_fixedHeight, size.y ); } diff --git a/wxGTK.spec b/wxGTK.spec index bc8734c2ae..cfefdae9c1 100644 --- a/wxGTK.spec +++ b/wxGTK.spec @@ -9,7 +9,7 @@ Version: %{ver} Release: %{rel} Copyright: wxWindows Licence Group: X11/Libraries -Source: wxGTK-%{ver}.tgz +Source: wxGTK-%{ver}.tar.gz URL: http://wxwindows.org Packager: Robert Roebling