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

1. regenerated makefiles

Browse Source 
2. wxNewSizer compiles under MSW


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3321 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-08-08 21:56:43 +00:00
parent 61d514bb2f
commit 77671fd2d6
10 changed files with 61 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/common/sizer.cpp
View File

@@ -9,13 +9,17 @@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __WXSIZERS_H__
#define __WXSIZERS_H__
#ifdef __GNUG__
#pragma implementation "sizer.h"
#endif
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#include "wx/sizer.h"
#include "wx/utils.h"
@@ -143,10 +147,11 @@ void wxNewSizer::SetSizeHints( wxWindow *window )
wxSize wxNewSizer::GetMinWindowSize( wxWindow *window )
{
wxSize min( GetMinSize() );
wxSize minSize( GetMinSize() );
wxSize size( window->GetSize() );
wxSize client_size( window->GetClientSize() );
return wxSize( min.x+size.x-client_size.x, min.y+size.y-client_size.y );
return wxSize( minSize.x+size.x-client_size.x,
minSize.y+size.y-client_size.y );
}
void wxNewSizer::SetDimension( int x, int y, int width, int height )
@@ -380,6 +385,3 @@ wxSize wxBoxNewSizer::CalcMin()
return wxSize( m_minWidth, m_minHeight );
}
#endif
// __SIZERS_H__