#pragma hdrstop
#endif
+#ifndef WX_PRECOMP
+ #include "wx/string.h"
+ #include "wx/intl.h"
+#endif // WX_PRECOMP
+
#include "wx/sizer.h"
#include "wx/utils.h"
#include "wx/statbox.h"
-#include "wx/notebook.h"
+#include "wx/settings.h"
#include "wx/listimpl.cpp"
-
-#ifdef __WXMAC__
-# include "wx/mac/uma.h"
+#include "wx/intl.h"
+#if WXWIN_COMPATIBILITY_2_4
+ #include "wx/notebook.h"
#endif
//---------------------------------------------------------------------------
#if wxUSE_STATBOX
IMPLEMENT_CLASS(wxStaticBoxSizer, wxBoxSizer)
#endif
-#if wxUSE_BOOKCTRL
-IMPLEMENT_CLASS(wxBookCtrlSizer, wxSizer)
-#if wxUSE_NOTEBOOK
-IMPLEMENT_CLASS(wxNotebookSizer, wxBookCtrlSizer)
-#endif // wxUSE_NOTEBOOK
-#endif // wxUSE_BOOKCTRL
+#if wxUSE_BUTTON
+IMPLEMENT_CLASS(wxStdDialogButtonSizer, wxBoxSizer)
+#endif
WX_DEFINE_EXPORTED_LIST( wxSizerItemList );
/*
- TODO PROPERTIES
- sizeritem
- object
- object_ref
- minsize
- option
- flag
- border
+ TODO PROPERTIES
+ sizeritem
+ object
+ object_ref
+ minsize
+ option
+ flag
+ border
spacer
- option
- flag
- borfder
- boxsizer
- orient
+ option
+ flag
+ borfder
+ boxsizer
+ orient
staticboxsizer
- orient
- label
- gridsizer
- rows
- cols
- vgap
- hgap
- flexgridsizer
- rows
- cols
- vgap
- hgap
- growablerows
- growablecols
+ orient
+ label
+ gridsizer
+ rows
+ cols
+ vgap
+ hgap
+ flexgridsizer
+ rows
+ cols
+ vgap
+ hgap
+ growablerows
+ growablecols
minsize
*/
+
//---------------------------------------------------------------------------
// wxSizerItem
//---------------------------------------------------------------------------
+void wxSizerItem::Init()
+{
+ m_window = NULL;
+ m_sizer = NULL;
+ m_show = true;
+ m_userData = NULL;
+ m_zoneRect = wxRect(0,0,0,0);
+}
+
+void wxSizerItem::Init(const wxSizerFlags& flags)
+{
+ Init();
+
+ m_proportion = flags.GetProportion();
+ m_flag = flags.GetFlags();
+ m_border = flags.GetBorderInPixels();
+}
+
wxSizerItem::wxSizerItem( int width, int height, int proportion, int flag, int border, wxObject* userData )
: m_window( NULL )
, m_sizer( NULL )
, m_proportion( proportion )
, m_border( border )
, m_flag( flag )
+ , m_zoneRect()
, m_show( true )
, m_userData( userData )
{
wxSizerItem::wxSizerItem( wxWindow *window, int proportion, int flag, int border, wxObject* userData )
: m_window( window )
, m_sizer( NULL )
- , m_minSize( window->GetSize() ) // minimal size is the initial size
, m_proportion( proportion )
, m_border( border )
, m_flag( flag )
+ , m_zoneRect()
, m_show( true )
, m_userData( userData )
{
+ if (flag & wxFIXED_MINSIZE)
+ window->SetMinSize(window->GetSize());
+ m_minSize = window->GetSize();
+
// aspect ratio calculated from initial size
SetRatio( m_minSize );
, m_proportion( proportion )
, m_border( border )
, m_flag( flag )
+ , m_zoneRect()
, m_show( true )
, m_ratio( 0.0 )
, m_userData( userData )
}
wxSizerItem::wxSizerItem()
- : m_window( NULL )
- , m_sizer( NULL )
- , m_proportion( 0 )
- , m_border( 0 )
- , m_flag( 0 )
- , m_show( true )
- , m_ratio( 0.0 )
- , m_userData( NULL )
{
+ Init();
+
+ m_proportion = 0;
+ m_border = 0;
+ m_flag = 0;
}
wxSizerItem::~wxSizerItem()
wxSize wxSizerItem::CalcMin()
{
- wxSize ret;
if (IsSizer())
{
- ret = m_sizer->GetMinSize();
+ m_minSize = m_sizer->GetMinSize();
// if we have to preserve aspect ratio _AND_ this is
// the first-time calculation, consider ret to be initial size
if ((m_flag & wxSHAPED) && !m_ratio)
- SetRatio(ret);
+ SetRatio(m_minSize);
}
- else
+ else if ( IsWindow() )
{
- if ( IsWindow() && !(m_flag & wxFIXED_SIZE) )
- {
- // the size of the window may change during run-time, we should
- // use the current minimal size
- m_minSize = m_window->GetAdjustedBestSize();
- }
-
- ret = m_minSize;
+ // Since the size of the window may change during runtime, we
+ // should use the current minimal/best size.
+ m_minSize = m_window->GetBestFittingSize();
}
+ return GetMinSizeWithBorder();
+}
+
+wxSize wxSizerItem::GetMinSizeWithBorder() const
+{
+ wxSize ret = m_minSize;
+
if (m_flag & wxWEST)
ret.x += m_border;
if (m_flag & wxEAST)
return ret;
}
+
void wxSizerItem::SetDimension( wxPoint pos, wxSize size )
{
if (m_flag & wxSHAPED)
if (IsSizer())
m_sizer->SetDimension( pos.x, pos.y, size.x, size.y );
+ m_zoneRect = wxRect(pos, size);
if (IsWindow())
m_window->SetSize( pos.x, pos.y, size.x, size.y, wxSIZE_ALLOW_MINUS_ONE );
void wxSizerItem::DeleteWindows()
{
if (m_window)
+ {
m_window->Destroy();
+ m_window = NULL;
+ }
if (m_sizer)
m_sizer->DeleteWindows();
//---------------------------------------------------------------------------
wxSizer::wxSizer()
- : m_minSize( wxSize( 0, 0 ) )
+ :m_minSize()
{
}
WX_CLEAR_LIST(wxSizerItemList, m_children);
}
-void wxSizer::Add( wxWindow *window, int proportion, int flag, int border, wxObject* userData )
-{
- m_children.Append( new wxSizerItem( window, proportion, flag, border, userData ) );
- window->SetContainingSizer( this );
-}
-
-void wxSizer::Add( wxSizer *sizer, int proportion, int flag, int border, wxObject* userData )
-{
- m_children.Append( new wxSizerItem( sizer, proportion, flag, border, userData ) );
-}
-
-void wxSizer::Add( int width, int height, int proportion, int flag, int border, wxObject* userData )
-{
- m_children.Append( new wxSizerItem( width, height, proportion, flag, border, userData ) );
-}
-
-void wxSizer::Add( wxSizerItem *item )
-{
- m_children.Append( item );
-
- if( item->GetWindow() )
- item->GetWindow()->SetContainingSizer( this );
-}
-
-void wxSizer::Prepend( wxWindow *window, int proportion, int flag, int border, wxObject* userData )
-{
- m_children.Insert( new wxSizerItem( window, proportion, flag, border, userData ) );
- window->SetContainingSizer( this );
-}
-
-void wxSizer::Prepend( wxSizer *sizer, int proportion, int flag, int border, wxObject* userData )
-{
- m_children.Insert( new wxSizerItem( sizer, proportion, flag, border, userData ) );
-}
-
-void wxSizer::Prepend( int width, int height, int proportion, int flag, int border, wxObject* userData )
-{
- m_children.Insert( new wxSizerItem( width, height, proportion, flag, border, userData ) );
-}
-
-void wxSizer::Prepend( wxSizerItem *item )
-{
- m_children.Insert( item );
-
- if( item->GetWindow() )
- item->GetWindow()->SetContainingSizer( this );
-}
-
-void wxSizer::Insert( size_t index,
- wxWindow *window,
- int proportion,
- int flag,
- int border,
- wxObject* userData )
-{
- m_children.Insert( index,
- new wxSizerItem( window, proportion, flag, border, userData ) );
- window->SetContainingSizer( this );
-}
-
-void wxSizer::Insert( size_t index,
- wxSizer *sizer,
- int proportion,
- int flag,
- int border,
- wxObject* userData )
-{
- m_children.Insert( index,
- new wxSizerItem( sizer, proportion, flag, border, userData ) );
-}
-
-void wxSizer::Insert( size_t index,
- int width,
- int height,
- int proportion,
- int flag,
- int border,
- wxObject* userData )
-{
- m_children.Insert( index,
- new wxSizerItem( width, height, proportion, flag, border, userData ) );
-}
-
-void wxSizer::Insert( size_t index, wxSizerItem *item )
+wxSizerItem* wxSizer::Insert( size_t index, wxSizerItem *item )
{
m_children.Insert( index, item );
if( item->GetWindow() )
item->GetWindow()->SetContainingSizer( this );
+
+ return item;
}
bool wxSizer::Remove( wxWindow *window )
void wxSizer::Layout()
{
+ // (re)calculates minimums needed for each item and other preparations
+ // for layout
CalcMin();
+
+ // Applies the layout and repositions/resizes the items
RecalcSizes();
}
// Limit the size if sizeMax != wxDefaultSize
- if ( size.x > sizeMax.x && sizeMax.x != -1 )
+ if ( size.x > sizeMax.x && sizeMax.x != wxDefaultCoord )
size.x = sizeMax.x;
- if ( size.y > sizeMax.y && sizeMax.y != -1 )
+ if ( size.y > sizeMax.y && sizeMax.y != wxDefaultCoord )
size.y = sizeMax.y;
return size;
// Limit the size if sizeMax != wxDefaultSize
- if ( size.x > sizeMax.x && sizeMax.x != -1 )
+ if ( size.x > sizeMax.x && sizeMax.x != wxDefaultCoord )
size.x = sizeMax.x;
- if ( size.y > sizeMax.y && sizeMax.y != -1 )
+ if ( size.y > sizeMax.y && sizeMax.y != wxDefaultCoord )
size.y = sizeMax.y;
return size;
if (item->GetWindow() == window)
{
- item->SetInitSize( width, height );
- item->GetWindow()->SetSizeHints(width, height);
+ item->SetMinSize( width, height );
return true;
}
node = node->GetNext();
}
else
{
- // ... but the minimal size of spacers and windows in stored in them
- item->SetInitSize( width, height );
- if (item->GetWindow())
- item->GetWindow()->SetSizeHints(width, height);
+ // ... but the minimal size of spacers and windows is stored via the item
+ item->SetMinSize( width, height );
}
return true;
}
-void wxSizer::Show( wxWindow *window, bool show )
+wxSizerItem* wxSizer::GetItem( wxWindow *window, bool recursive )
{
- wxASSERT_MSG( window, _T("Show for NULL window") );
+ wxASSERT_MSG( window, _T("GetItem for NULL window") );
wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
while (node)
if (item->GetWindow() == window)
{
- item->Show( show );
- break;
+ return item;
}
+ else if (recursive && item->IsSizer())
+ {
+ wxSizerItem *subitem = item->GetSizer()->GetItem( window, true );
+ if (subitem)
+ return subitem;
+ }
+
node = node->GetNext();
}
+
+ return NULL;
}
-void wxSizer::Show( wxSizer *sizer, bool show )
+wxSizerItem* wxSizer::GetItem( wxSizer *sizer, bool recursive )
{
- wxASSERT_MSG( sizer, _T("Show for NULL sizer") );
+ wxASSERT_MSG( sizer, _T("GetItem for NULL sizer") );
wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
while (node)
{
- wxSizerItem *item = node->GetData();
+ wxSizerItem *item = node->GetData();
if (item->GetSizer() == sizer)
{
- item->Show( show );
- break;
+ return item;
}
+ else if (recursive && item->IsSizer())
+ {
+ wxSizerItem *subitem = item->GetSizer()->GetItem( sizer, true );
+ if (subitem)
+ return subitem;
+ }
+
node = node->GetNext();
}
+
+ return NULL;
+}
+
+wxSizerItem* wxSizer::GetItem( size_t index )
+{
+ wxCHECK_MSG( index < m_children.GetCount(),
+ NULL,
+ _T("GetItem index is out of range") );
+
+ return m_children.Item( index )->GetData();
}
-void wxSizer::Show( size_t index, bool show )
+bool wxSizer::Show( wxWindow *window, bool show, bool recursive )
{
- wxCHECK_RET( index < m_children.GetCount(),
- _T("Show index is out of range") );
+ wxSizerItem *item = GetItem( window, recursive );
- m_children.Item( index )->GetData()->Show( show );
+ if ( item )
+ {
+ item->Show( show );
+ return true;
+ }
+
+ return false;
+}
+
+bool wxSizer::Show( wxSizer *sizer, bool show, bool recursive )
+{
+ wxSizerItem *item = GetItem( sizer, recursive );
+
+ if ( item )
+ {
+ item->Show( show );
+ return true;
+ }
+
+ return false;
+}
+
+bool wxSizer::Show( size_t index, bool show)
+{
+ wxSizerItem *item = GetItem( index );
+
+ if ( item )
+ {
+ item->Show( show );
+ return true;
+ }
+
+ return false;
}
void wxSizer::ShowItems( bool show )
void wxGridSizer::SetItemBounds( wxSizerItem *item, int x, int y, int w, int h )
{
wxPoint pt( x,y );
- wxSize sz( item->CalcMin() );
+ wxSize sz( item->GetMinSizeWithBorder() );
int flag = item->GetFlag();
if ((flag & wxEXPAND) || (flag & wxSHAPED))
wxPoint pt( GetPosition() );
wxSize sz( GetSize() );
- wxSize minsz( CalcMin() );
- AdjustForGrowables(sz, minsz, nrows, ncols);
+ AdjustForGrowables(sz, m_calculatedMinSize, nrows, ncols);
sz = wxSize( pt.x + sz.x, pt.y + sz.y );
SetItemBounds( node->GetData(), x, y, w, h);
}
- y = y + m_rowHeights[r] + m_vgap;
+ if (m_rowHeights[r] != -1)
+ y = y + m_rowHeights[r] + m_vgap;
}
- x = x + m_colWidths[c] + m_hgap;
+ if (m_colWidths[c] != -1)
+ x = x + m_colWidths[c] + m_hgap;
}
}
}
AdjustForFlexDirection();
-
+
// Sum total minimum size, including gaps between rows/columns.
// -1 is used as a magic number meaning empty column.
int width = 0;
for (int col = 0; col < ncols; col++)
if ( m_colWidths[ col ] != -1 )
- width += m_colWidths[ col ] + ( col == ncols-1 ? 0 : m_hgap );
+ width += m_colWidths[ col ] + m_hgap;
+ if (width > 0)
+ width -= m_hgap;
int height = 0;
for (int row = 0; row < nrows; row++)
if ( m_rowHeights[ row ] != -1 )
- height += m_rowHeights[ row ] + ( row == nrows-1 ? 0 : m_vgap );
+ height += m_rowHeights[ row ] + m_vgap;
+ if (height > 0)
+ height -= m_vgap;
- return wxSize( width, height );
+ m_calculatedMinSize = wxSize( width, height );
+ return m_calculatedMinSize;
}
void wxFlexGridSizer::AdjustForFlexDirection()
array[n] = largest;
}
}
-}
+}
void wxFlexGridSizer::AdjustForGrowables(const wxSize& sz, const wxSize& minsz,
// requested growable rows/columns are still valid.
if (m_growableRows[idx] >= nrows)
continue;
-
+
// If all items in a row/column are hidden, that row/column will
// have a dimension of -1. This causes the row/column to be
// hidden completely.
// requested growable rows/columns are still valid.
if (m_growableCols[idx] >= ncols)
continue;
-
+
// If all items in a row/column are hidden, that row/column will
// have a dimension of -1. This causes the column to be hidden
// completely.
if (item->IsShown())
{
- wxSize size( item->CalcMin() );
+ wxSize size( item->GetMinSizeWithBorder() );
if (m_orient == wxVERTICAL)
{
}
wxPoint child_pos( pt );
- wxSize child_size( wxSize( size.x, height) );
+ wxSize child_size( size.x, height );
if (item->GetFlag() & (wxEXPAND | wxSHAPED))
child_size.x = m_size.x;
}
wxPoint child_pos( pt );
- wxSize child_size( wxSize(width, size.y) );
+ wxSize child_size( width, size.y );
if (item->GetFlag() & (wxEXPAND | wxSHAPED))
child_size.y = m_size.y;
m_fixedWidth = 0;
m_fixedHeight = 0;
+ // precalc item minsizes and count proportions
wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
while (node)
{
wxSizerItem *item = node->GetData();
+ if (item->IsShown())
+ item->CalcMin(); // result is stored in the item
+
if (item->IsShown() && item->GetProportion() != 0)
m_stretchable += item->GetProportion();
if (item->IsShown() && item->GetProportion() != 0)
{
int stretch = item->GetProportion();
- wxSize size( item->CalcMin() );
+ wxSize size( item->GetMinSizeWithBorder() );
int minSize;
-
+
// Integer division rounded up is (a + b - 1) / b
// Round up needed in order to guarantee that all
// all items will have size not less then their min size
minSize = ( size.x*m_stretchable + stretch - 1)/stretch;
else
minSize = ( size.y*m_stretchable + stretch - 1)/stretch;
-
+
if (minSize > maxMinSize)
maxMinSize = minSize;
}
if (item->IsShown())
{
- wxSize size( item->CalcMin() );
+ wxSize size( item->GetMinSizeWithBorder() );
if (item->GetProportion() != 0)
{
if (m_orient == wxHORIZONTAL)
wxASSERT_MSG( box, wxT("wxStaticBoxSizer needs a static box") );
}
+wxStaticBoxSizer::wxStaticBoxSizer(int orient, wxWindow *win, const wxString& s)
+ : wxBoxSizer(orient),
+ m_staticBox(new wxStaticBox(win, wxID_ANY, s))
+{
+}
+
static void GetStaticBoxBorders( wxStaticBox *box,
int *borderTop,
int *borderOther)
{
// this has to be done platform by platform as there is no way to
// guess the thickness of a wxStaticBox border
-#ifdef __WXCOCOA__
- box->GetBordersForSizer(borderTop,borderOther);
-#elif defined(__WXMAC__)
-
- static int extraTop = -1; // Uninitted
- static int other = 5;
-
- if ( extraTop == -1 )
- {
- // The minimal border used for the top. Later on the staticbox'
- // font height is added to this.
- extraTop = 0;
-
- if ( UMAGetSystemVersion() >= 0x1030 /*Panther*/ )
- {
- // As indicated by the HIG, Panther needs an extra border of 11
- // pixels (otherwise overlapping occurs at the top). The "other"
- // border has to be 11.
- extraTop = 11;
- other = 11;
- }
-
- }
-
- *borderTop = extraTop + box->GetCharHeight();
- *borderOther = other;
-
-#else
-#ifdef __WXGTK__
- if ( box->GetLabel().IsEmpty() )
- *borderTop = 5;
- else
-#endif // __WXGTK__
- *borderTop = box->GetCharHeight();
-
- *borderOther = 5;
-#endif // __WXCOCOA__
+ box->GetBordersForSizer(borderTop, borderOther);
}
void wxStaticBoxSizer::RecalcSizes()
return ret;
}
+void wxStaticBoxSizer::ShowItems( bool show )
+{
+ m_staticBox->Show( show );
+ wxBoxSizer::ShowItems( show );
+}
+
#endif // wxUSE_STATBOX
+#if wxUSE_BUTTON
+
+wxStdDialogButtonSizer::wxStdDialogButtonSizer()
+ : wxBoxSizer(wxHORIZONTAL)
+{
+ // Vertical buttons with lots of space on either side
+ // looks rubbish on WinCE, so let's not do this for now.
+ // If we are going to use vertical buttons, we should
+ // put the sizer to the right of other controls in the dialog,
+ // and that's beyond the scope of this sizer.
+#ifndef __WXWINCE__
+ bool is_pda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
+ // If we have a PDA screen, put yes/no button over
+ // all other buttons, otherwise on the left side.
+ if (is_pda)
+ m_orient = wxVERTICAL;
+#endif
+
+ m_buttonAffirmative = NULL;
+ m_buttonApply = NULL;
+ m_buttonNegative = NULL;
+ m_buttonCancel = NULL;
+ m_buttonHelp = NULL;
+}
+
+void wxStdDialogButtonSizer::AddButton(wxButton *mybutton)
+{
+ switch (mybutton->GetId())
+ {
+ case wxID_OK:
+ case wxID_YES:
+ case wxID_SAVE:
+ m_buttonAffirmative = mybutton;
+ break;
+ case wxID_APPLY:
+ m_buttonApply = mybutton;
+ break;
+ case wxID_NO:
+ m_buttonNegative = mybutton;
+ break;
+ case wxID_CANCEL:
+ m_buttonCancel = mybutton;
+ break;
+ case wxID_HELP:
+ case wxID_CONTEXT_HELP:
+ m_buttonHelp = mybutton;
+ break;
+ default:
+ break;
+ }
+}
+
+void wxStdDialogButtonSizer::SetAffirmativeButton( wxButton *button )
+{
+ m_buttonAffirmative = button;
+}
+
+void wxStdDialogButtonSizer::SetNegativeButton( wxButton *button )
+{
+ m_buttonNegative = button;
+}
+
+void wxStdDialogButtonSizer::SetCancelButton( wxButton *button )
+{
+ m_buttonCancel = button;
+}
+
+void wxStdDialogButtonSizer::Realize()
+{
+#ifdef __WXMAC__
+ Add(0, 0, 0, wxLEFT, 6);
+ if (m_buttonHelp)
+ Add((wxWindow*)m_buttonHelp, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 6);
+
+ if (m_buttonNegative){
+ // HIG POLICE BULLETIN - destructive buttons need extra padding
+ // 24 pixels on either side
+ Add((wxWindow*)m_buttonNegative, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 12);
+ }
+
+ // extra whitespace between help/negative and cancel/ok buttons
+ Add(0, 0, 1, wxEXPAND, 0);
+
+ if (m_buttonCancel){
+ Add((wxWindow*)m_buttonCancel, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 6);
+ // Cancel or help should be default
+ // m_buttonCancel->SetDefaultButton();
+ }
+
+ // Ugh, Mac doesn't really have apply dialogs, so I'll just
+ // figure the best place is between Cancel and OK
+ if (m_buttonApply)
+ Add((wxWindow*)m_buttonApply, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 6);
+
+ if (m_buttonAffirmative){
+ Add((wxWindow*)m_buttonAffirmative, 0, wxALIGN_CENTRE | wxLEFT, 6);
+
+ if (m_buttonAffirmative->GetId() == wxID_SAVE){
+ // these buttons have set labels under Mac so we should use them
+ m_buttonAffirmative->SetLabel(_("Save"));
+ m_buttonNegative->SetLabel(_("Don't Save"));
+ }
+ }
+
+ // Extra space around and at the right
+ Add(12, 24);
+#elif defined(__WXGTK20__)
+ Add(0, 0, 0, wxLEFT, 9);
+ if (m_buttonHelp)
+ Add((wxWindow*)m_buttonHelp, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3);
+
+ // extra whitespace between help and cancel/ok buttons
+ Add(0, 0, 1, wxEXPAND, 0);
+
+ if (m_buttonNegative){
+ Add((wxWindow*)m_buttonNegative, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3);
+ }
+
+ if (m_buttonCancel){
+ Add((wxWindow*)m_buttonCancel, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3);
+ // Cancel or help should be default
+ // m_buttonCancel->SetDefaultButton();
+ }
+
+ if (m_buttonApply)
+ Add((wxWindow*)m_buttonApply, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3);
+
+ if (m_buttonAffirmative)
+ Add((wxWindow*)m_buttonAffirmative, 0, wxALIGN_CENTRE | wxLEFT, 6);
+#else
+ // do the same thing for GTK1 and Windows platforms
+ // and assume any platform not accounted for here will use
+ // Windows style
+ Add(0, 0, 0, wxLEFT, 9);
+ if (m_buttonHelp)
+ Add((wxWindow*)m_buttonHelp, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonHelp->ConvertDialogToPixels(wxSize(4, 0)).x);
+
+ // extra whitespace between help and cancel/ok buttons
+ Add(0, 0, 1, wxEXPAND, 0);
+
+ if (m_buttonApply)
+ Add((wxWindow*)m_buttonApply, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonApply->ConvertDialogToPixels(wxSize(4, 0)).x);
+
+ if (m_buttonAffirmative){
+ Add((wxWindow*)m_buttonAffirmative, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonAffirmative->ConvertDialogToPixels(wxSize(4, 0)).x);
+ }
+
+ if (m_buttonNegative){
+ Add((wxWindow*)m_buttonNegative, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonNegative->ConvertDialogToPixels(wxSize(4, 0)).x);
+ }
+
+ if (m_buttonCancel){
+ Add((wxWindow*)m_buttonCancel, 0, wxALIGN_CENTRE | wxLEFT, m_buttonCancel->ConvertDialogToPixels(wxSize(4, 0)).x);
+ // Cancel or help should be default
+ // m_buttonCancel->SetDefaultButton();
+ }
+
+#endif
+}
+
+#endif // wxUSE_BUTTON
+
+#if WXWIN_COMPATIBILITY_2_4
+
// ----------------------------------------------------------------------------
// wxNotebookSizer
// ----------------------------------------------------------------------------
+#if wxUSE_BOOKCTRL
+IMPLEMENT_CLASS(wxBookCtrlSizer, wxSizer)
+#if wxUSE_NOTEBOOK
+IMPLEMENT_CLASS(wxNotebookSizer, wxBookCtrlSizer)
+#endif // wxUSE_NOTEBOOK
+#endif // wxUSE_BOOKCTRL
+
#if wxUSE_BOOKCTRL
-wxBookCtrlSizer::wxBookCtrlSizer(wxBookCtrl *bookctrl)
+wxBookCtrlSizer::wxBookCtrlSizer(wxBookCtrlBase *bookctrl)
: m_bookctrl(bookctrl)
{
wxASSERT_MSG( bookctrl, wxT("wxBookCtrlSizer needs a control") );
wxSize wxBookCtrlSizer::CalcMin()
{
- wxSize sizeBorder = m_bookctrl->CalcSizeFromPage(wxSize(0, 0));
+ wxSize sizeBorder = m_bookctrl->CalcSizeFromPage(wxSize(0,0));
sizeBorder.x += 5;
sizeBorder.y += 5;
return wxSize( maxX, maxY ) + sizeBorder;
}
-
#if wxUSE_NOTEBOOK
wxNotebookSizer::wxNotebookSizer(wxNotebook *nb)
- : wxBookCtrlSizer(nb)
{
+ wxASSERT_MSG( nb, wxT("wxNotebookSizer needs a control") );
+ m_bookctrl = nb;
}
#endif // wxUSE_NOTEBOOOK
#endif // wxUSE_BOOKCTRL
+#endif // WXWIN_COMPATIBILITY_2_4
projects / wxWidgets.git / blobdiff