fixed typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18233 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -4,7 +4,7 @@
|
|||||||
// Author: Jonathan Bayer
|
// Author: Jonathan Bayer
|
||||||
// Modified by:
|
// Modified by:
|
||||||
// Created:
|
// Created:
|
||||||
// RCS-ID: $Id:
|
// RCS-ID: $Id$
|
||||||
// Copyright: (c) Jonathan Bayer
|
// Copyright: (c) Jonathan Bayer
|
||||||
// Licence: wxWindows licence
|
// Licence: wxWindows licence
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
@@ -40,7 +40,7 @@
|
|||||||
enum wxResizable
|
enum wxResizable
|
||||||
{
|
{
|
||||||
wxNOT_RESIZABLE = 0x00,
|
wxNOT_RESIZABLE = 0x00,
|
||||||
wxHORIZENTAL_RESIZABLE = 0x01,
|
wxHORIZONTAL_RESIZABLE = 0x01,
|
||||||
wxVERTICAL_RESIZABLE = 0x10,
|
wxVERTICAL_RESIZABLE = 0x10,
|
||||||
wxRESIZABLE = 0x11
|
wxRESIZABLE = 0x11
|
||||||
};
|
};
|
||||||
|
@@ -79,7 +79,7 @@ wxFrame(frame, -1, title, pos, size, wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCRO
|
|||||||
// add first row
|
// add first row
|
||||||
sizer->Add(
|
sizer->Add(
|
||||||
new wxButton( this, -1, "B1 - 0,0, horizontal resizable" ),
|
new wxButton( this, -1, "B1 - 0,0, horizontal resizable" ),
|
||||||
0, 0, 0, new wxMultiCellItemHandle(0,0,1,1, wxDefaultSize, wxHORIZENTAL_RESIZABLE, wxSize(2,2)));
|
0, 0, 0, new wxMultiCellItemHandle(0,0,1,1, wxDefaultSize, wxHORIZONTAL_RESIZABLE, wxSize(2,2)));
|
||||||
sizer->Add(
|
sizer->Add(
|
||||||
new wxButton( this, -1, "B2 - 0,1, vertical resizable" ),
|
new wxButton( this, -1, "B2 - 0,1, vertical resizable" ),
|
||||||
0, 0, 0, new wxMultiCellItemHandle(0,1,1,1, wxDefaultSize, wxVERTICAL_RESIZABLE, wxSize(2, 2)));
|
0, 0, 0, new wxMultiCellItemHandle(0,1,1,1, wxDefaultSize, wxVERTICAL_RESIZABLE, wxSize(2, 2)));
|
||||||
|
@@ -321,7 +321,7 @@ void wxMultiCellSizer::RecalcSizes()
|
|||||||
minSize.SetHeight(wxMax(minSize.GetHeight(), c_size.GetHeight()));
|
minSize.SetHeight(wxMax(minSize.GetHeight(), c_size.GetHeight()));
|
||||||
minSize.SetWidth(wxMax(minSize.GetWidth(), c_size.GetWidth()));
|
minSize.SetWidth(wxMax(minSize.GetWidth(), c_size.GetWidth()));
|
||||||
}
|
}
|
||||||
if (rect->GetStyle() & wxHORIZENTAL_RESIZABLE ||
|
if (rect->GetStyle() & wxHORIZONTAL_RESIZABLE ||
|
||||||
rect->GetWidth() > 1
|
rect->GetWidth() > 1
|
||||||
|| m_minSizes[rect->GetColumn()]->GetWidth() < 0)
|
|| m_minSizes[rect->GetColumn()]->GetWidth() < 0)
|
||||||
{
|
{
|
||||||
@@ -489,7 +489,7 @@ void wxMultiCellSizer :: GetMinimums()
|
|||||||
// For each column, calculate the max width for those fields which are not
|
// For each column, calculate the max width for those fields which are not
|
||||||
// resizable in the horizontal pane
|
// resizable in the horizontal pane
|
||||||
|
|
||||||
if (!(rect->GetStyle() & wxHORIZENTAL_RESIZABLE || m_minSizes[col]->GetWidth() < 0))
|
if (!(rect->GetStyle() & wxHORIZONTAL_RESIZABLE || m_minSizes[col]->GetWidth() < 0))
|
||||||
{
|
{
|
||||||
if (m_minSizes[col]->GetWidth())
|
if (m_minSizes[col]->GetWidth())
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user