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

Let's see where this commit will end up :-)

Browse Source 
Corrected reported wxSizer bug (wrong minimal size
    when option flag > 1)
  Updated changes.txt and wxGTK spec.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@8184 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2000-08-25 15:00:50 +00:00
parent 3e223a8a1e
commit 5101dc00ca
3 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
docs/gtk/changes.txt
View File

@@ -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. 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 Corrected guffow-scrolling so that no surplus expose
events are generated. events are generated.
@@ -12,13 +31,12 @@ Minor correction to wxDC::DrawRoundedRectangle.
Added support for <INSERT> and <DELETE> menu accelerators. Added support for <INSERT> and <DELETE> menu accelerators.
Use the wxCommmandEvent::IsChecked() function for checkable
menu items.
Made wxComboBox case-sensitive. Made wxComboBox case-sensitive.
Minor correction to doc-view architecture. Minor correction to doc-view architecture.
Minor wxCommandLineParser changes.
10th July 2000: wxWindows 2.2.0 released 10th July 2000: wxWindows 2.2.0 released
Added code for writing BMP images. Added code for writing BMP images.

18
src/common/sizer.cpp
View File

@@ -897,28 +897,22 @@ wxSize wxBoxSizer::CalcMin()
{ {
wxSizerItem *item = (wxSizerItem*) node->Data(); wxSizerItem *item = (wxSizerItem*) node->Data();
int weight = 1; m_stretchable += item->GetOption();
if (item->GetOption())
weight = item->GetOption();
wxSize size( item->CalcMin() ); wxSize size( item->CalcMin() );
if (m_orient == wxHORIZONTAL) if (m_orient == wxHORIZONTAL)
{ {
m_minWidth += (size.x * weight); m_minWidth += size.x;
m_minHeight = wxMax( m_minHeight, size.y ); m_minHeight = wxMax( m_minHeight, size.y );
} }
else else
{ {
m_minHeight += (size.y * weight); m_minHeight += size.y;
m_minWidth = wxMax( m_minWidth, size.x ); m_minWidth = wxMax( m_minWidth, size.x );
} }
if (item->GetOption()) if (item->GetOption() == 0)
{
m_stretchable += weight;
}
else
{ {
if (m_orient == wxVERTICAL) if (m_orient == wxVERTICAL)
{ {
@@ -926,7 +920,7 @@ wxSize wxBoxSizer::CalcMin()
m_fixedWidth = wxMax( m_fixedWidth, size.x ); m_fixedWidth = wxMax( m_fixedWidth, size.x );
} }
else else
{ {
m_fixedWidth += size.x; m_fixedWidth += size.x;
m_fixedHeight = wxMax( m_fixedHeight, size.y ); m_fixedHeight = wxMax( m_fixedHeight, size.y );
} }

2
wxGTK.spec
View File

@@ -9,7 +9,7 @@ Version: %{ver}
Release: %{rel} Release: %{rel}
Copyright: wxWindows Licence Copyright: wxWindows Licence
Group: X11/Libraries Group: X11/Libraries
Source: wxGTK-%{ver}.tgz Source: wxGTK-%{ver}.tar.gz
URL: http://wxwindows.org URL: http://wxwindows.org
Packager: Robert Roebling <robert@roebling.de> Packager: Robert Roebling <robert@roebling.de>