X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53701799b4f51179f9d1ebdc9afc0a1922a36974..368bb6629314982118d25b79aeeddd4a82a36d44:/src/common/sizer.cpp diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp index 98086b6804..a91079626d 100644 --- a/src/common/sizer.cpp +++ b/src/common/sizer.cpp @@ -36,10 +36,6 @@ #include "wx/notebook.h" #endif -#ifdef __WXMAC__ -# include "wx/mac/uma.h" -#endif - //--------------------------------------------------------------------------- IMPLEMENT_CLASS(wxSizerItem, wxObject) @@ -89,18 +85,9 @@ WX_DEFINE_EXPORTED_LIST( wxSizerItemList ); 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) { @@ -111,89 +98,156 @@ void wxSizerItem::Init(const wxSizerFlags& flags) 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_size( wxSize( width, height ) ) // size is set directly - , m_minSize( m_size ) // minimal size is the initial size - , m_proportion( proportion ) - , m_border( border ) - , m_flag( flag ) - , m_zoneRect( 0, 0, 0, 0 ) - , m_show( true ) - , m_userData( userData ) -{ - SetRatio( m_size ); -} - -wxSizerItem::wxSizerItem( wxWindow *window, int proportion, int flag, int border, wxObject* userData ) - : m_window( window ) - , m_sizer( NULL ) - , m_proportion( proportion ) - , m_border( border ) - , m_flag( flag ) - , m_zoneRect( 0, 0, 0, 0 ) - , m_show( true ) - , m_userData( userData ) -{ - if (flag & wxFIXED_MINSIZE) - window->SetMinSize(window->GetSize()); +wxSizerItem::wxSizerItem() +{ + Init(); + + m_proportion = 0; + m_border = 0; + m_flag = 0; + + m_kind = Item_None; +} + +// window item +void wxSizerItem::SetWindow(wxWindow *window) +{ + wxCHECK_RET( window, _T("NULL window in wxSizerItem::SetWindow()") ); + + m_kind = Item_Window; + m_window = window; + + // window doesn't become smaller than its initial size, whatever happens m_minSize = window->GetSize(); + if ( m_flag & wxFIXED_MINSIZE ) + window->SetMinSize(m_minSize); + // aspect ratio calculated from initial size - SetRatio( m_minSize ); + SetRatio(m_minSize); +} - // m_size is calculated later +wxSizerItem::wxSizerItem(wxWindow *window, + int proportion, + int flag, + int border, + wxObject* userData) + : m_proportion(proportion), + m_border(border), + m_flag(flag), + m_userData(userData) +{ + SetWindow(window); } -wxSizerItem::wxSizerItem( wxSizer *sizer, int proportion, int flag, int border, wxObject* userData ) - : m_window( NULL ) - , m_sizer( sizer ) - , m_proportion( proportion ) - , m_border( border ) - , m_flag( flag ) - , m_zoneRect( 0, 0, 0, 0 ) - , m_show( true ) - , m_ratio( 0.0 ) - , m_userData( userData ) +// sizer item +void wxSizerItem::SetSizer(wxSizer *sizer) { - // m_minSize is calculated later - // m_size is calculated later + m_kind = Item_Sizer; + m_sizer = sizer; } -wxSizerItem::wxSizerItem() +wxSizerItem::wxSizerItem(wxSizer *sizer, + int proportion, + int flag, + int border, + wxObject* userData) + : m_proportion(proportion), + m_border(border), + m_flag(flag), + m_ratio(0.0), + m_userData(userData) { - Init(); + SetSizer(sizer); - m_proportion = 0; - m_border = 0; - m_flag = 0; + // m_minSize is set later +} + +// spacer item +void wxSizerItem::SetSpacer(const wxSize& size) +{ + m_kind = Item_Spacer; + m_spacer = new wxSizerSpacer(size); + m_minSize = size; + SetRatio(size); +} + +wxSizerItem::wxSizerItem(int width, + int height, + int proportion, + int flag, + int border, + wxObject* userData) + : m_minSize(width, height), // minimal size is the initial size + m_proportion(proportion), + m_border(border), + m_flag(flag), + m_userData(userData) +{ + SetSpacer(width, height); } wxSizerItem::~wxSizerItem() { delete m_userData; - if ( m_window ) + switch ( m_kind ) { - m_window->SetContainingSizer(NULL); - } - else // we must be a sizer - { - delete m_sizer; + case Item_None: + break; + + case Item_Window: + m_window->SetContainingSizer(NULL); + break; + + case Item_Sizer: + delete m_sizer; + break; + + case Item_Spacer: + delete m_spacer; + break; + + case Item_Max: + default: + wxFAIL_MSG( _T("unexpected wxSizerItem::m_kind") ); } } +wxSize wxSizerItem::GetSpacer() const +{ + wxSize size; + if ( m_kind == Item_Spacer ) + size = m_spacer->GetSize(); + + return size; +} + wxSize wxSizerItem::GetSize() const { wxSize ret; - if (IsSizer()) - ret = m_sizer->GetSize(); - else - if (IsWindow()) - ret = m_window->GetSize(); - else ret = m_size; + switch ( m_kind ) + { + case Item_None: + break; + + case Item_Window: + ret = m_window->GetSize(); + break; + + case Item_Sizer: + ret = m_sizer->GetSize(); + break; + + case Item_Spacer: + ret = m_spacer->GetSize(); + break; + + case Item_Max: + default: + wxFAIL_MSG( _T("unexpected wxSizerItem::m_kind") ); + } if (m_flag & wxWEST) ret.x += m_border; @@ -298,53 +352,112 @@ void wxSizerItem::SetDimension( wxPoint pos, wxSize size ) size.y -= m_border; } - if (IsSizer()) - m_sizer->SetDimension( pos.x, pos.y, size.x, size.y ); + m_rect = wxRect(pos, size); + + switch ( m_kind ) + { + case Item_None: + wxFAIL_MSG( _T("can't set size of uninitialized sizer item") ); + break; + + case Item_Window: + m_window->SetSize(pos.x, pos.y, size.x, size.y, + wxSIZE_ALLOW_MINUS_ONE); + break; - m_zoneRect = wxRect(pos, size); - if (IsWindow()) - m_window->SetSize( pos.x, pos.y, size.x, size.y, wxSIZE_ALLOW_MINUS_ONE ); + case Item_Sizer: + m_sizer->SetDimension(pos.x, pos.y, size.x, size.y); + break; + + case Item_Spacer: + m_spacer->SetSize(size); + break; - m_size = size; + case Item_Max: + default: + wxFAIL_MSG( _T("unexpected wxSizerItem::m_kind") ); + } } void wxSizerItem::DeleteWindows() { - if (m_window) + switch ( m_kind ) { - m_window->Destroy(); - m_window = NULL; + case Item_None: + case Item_Spacer: + break; + + case Item_Window: + //We are deleting the window from this sizer - normally + //the window destroys the sizer associated with it, + //which might destroy this, which we don't want + m_window->SetContainingSizer(NULL); + m_window->Destroy(); + //Putting this after the switch will result in a spacer + //not being deleted properly on destruction + m_kind = Item_None; + break; + + case Item_Sizer: + m_sizer->DeleteWindows(); + break; + + case Item_Max: + default: + wxFAIL_MSG( _T("unexpected wxSizerItem::m_kind") ); } - if (m_sizer) - m_sizer->DeleteWindows(); } -bool wxSizerItem::IsWindow() const +void wxSizerItem::Show( bool show ) { - return (m_window != NULL); -} + switch ( m_kind ) + { + case Item_None: + wxFAIL_MSG( _T("can't show uninitialized sizer item") ); + break; -bool wxSizerItem::IsSizer() const -{ - return (m_sizer != NULL); -} + case Item_Window: + m_window->Show(show); + break; -bool wxSizerItem::IsSpacer() const -{ - return (m_window == NULL) && (m_sizer == NULL); + case Item_Sizer: + m_sizer->Show(show); + break; + + case Item_Spacer: + m_spacer->Show(show); + break; + + case Item_Max: + default: + wxFAIL_MSG( _T("unexpected wxSizerItem::m_kind") ); + } } -void wxSizerItem::Show( bool show ) +bool wxSizerItem::IsShown() const { - m_show = show; + switch ( m_kind ) + { + case Item_None: + wxFAIL_MSG( _T("uninitialized sizer item") ); + break; + + case Item_Window: + return m_window->IsShown(); + + case Item_Sizer: + return m_sizer->IsShown(); - if( IsWindow() ) - m_window->Show( show ); - else if( IsSizer() ) - m_sizer->ShowItems( show ); + case Item_Spacer: + return m_spacer->IsShown(); - // ... nothing else to do to hide/show spacers + case Item_Max: + default: + wxFAIL_MSG( _T("unexpected wxSizerItem::m_kind") ); + } + + return false; } void wxSizerItem::SetOption( int option ) @@ -363,8 +476,8 @@ int wxSizerItem::GetOption() const //--------------------------------------------------------------------------- wxSizer::wxSizer() - : m_minSize( wxSize( 0, 0 ) ) { + m_isShown = true; } wxSizer::~wxSizer() @@ -376,7 +489,7 @@ wxSizerItem* wxSizer::Insert( size_t index, wxSizerItem *item ) { m_children.Insert( index, item ); - if( item->GetWindow() ) + if ( item->GetWindow() ) item->GetWindow()->SetContainingSizer( this ); return item; @@ -421,7 +534,7 @@ bool wxSizer::Remove( int index ) wxSizerItem *item = node->GetData(); - if( item->IsWindow() ) + if ( item->IsWindow() ) item->GetWindow()->SetContainingSizer( NULL ); delete item; @@ -485,9 +598,9 @@ bool wxSizer::Detach( int index ) wxSizerItem *item = node->GetData(); - if( item->IsSizer() ) + if ( item->IsSizer() ) item->DetachSizer(); - else if( item->IsWindow() ) + else if ( item->IsWindow() ) item->GetWindow()->SetContainingSizer( NULL ); delete item; @@ -624,7 +737,7 @@ wxSize wxSizer::GetMaxClientSize( wxWindow *window ) const { wxSize maxSize( window->GetMaxSize() ); - if( maxSize != wxDefaultSize ) + if ( maxSize != wxDefaultSize ) { wxSize size( window->GetSize() ); wxSize client_size( window->GetClientSize() ); @@ -1473,11 +1586,12 @@ wxSize wxBoxSizer::CalcMin() { wxSizerItem *item = node->GetData(); - if (item->IsShown()) + if ( item->IsShown() ) + { item->CalcMin(); // result is stored in the item - if (item->IsShown() && item->GetProportion() != 0) m_stretchable += item->GetProportion(); + } node = node->GetNext(); } @@ -1570,49 +1684,19 @@ wxStaticBoxSizer::wxStaticBoxSizer( wxStaticBox *box, int orient ) 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().empty() ) - *borderTop = 5; - else -#endif // __WXGTK__ - *borderTop = box->GetCharHeight(); - - *borderOther = 5; -#endif // __WXCOCOA__ + box->GetBordersForSizer(borderTop, borderOther); } void wxStaticBoxSizer::RecalcSizes() @@ -1660,12 +1744,18 @@ void wxStaticBoxSizer::ShowItems( bool show ) 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; @@ -1693,6 +1783,7 @@ void wxStdDialogButtonSizer::AddButton(wxButton *mybutton) m_buttonCancel = mybutton; break; case wxID_HELP: + case wxID_CONTEXT_HELP: m_buttonHelp = mybutton; break; default: @@ -1715,7 +1806,7 @@ void wxStdDialogButtonSizer::SetCancelButton( wxButton *button ) m_buttonCancel = button; } -void wxStdDialogButtonSizer::Finalise() +void wxStdDialogButtonSizer::Realize() { #ifdef __WXMAC__ Add(0, 0, 0, wxLEFT, 6); @@ -1777,11 +1868,32 @@ void wxStdDialogButtonSizer::Finalise() if (m_buttonAffirmative) Add((wxWindow*)m_buttonAffirmative, 0, wxALIGN_CENTRE | wxLEFT, 6); +#elif defined(__WXMSW__) + // Windows + + // right-justify buttons + Add(0, 0, 1, wxEXPAND, 0); + + if (m_buttonAffirmative){ + Add((wxWindow*)m_buttonAffirmative, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonAffirmative->ConvertDialogToPixels(wxSize(2, 0)).x); + } + + if (m_buttonNegative){ + Add((wxWindow*)m_buttonNegative, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonNegative->ConvertDialogToPixels(wxSize(2, 0)).x); + } + + if (m_buttonCancel){ + Add((wxWindow*)m_buttonCancel, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonCancel->ConvertDialogToPixels(wxSize(2, 0)).x); + } + if (m_buttonApply) + Add((wxWindow*)m_buttonApply, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonApply->ConvertDialogToPixels(wxSize(2, 0)).x); + + if (m_buttonHelp) + Add((wxWindow*)m_buttonHelp, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonHelp->ConvertDialogToPixels(wxSize(2, 0)).x); #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); + // GTK+1 and any other platform + + // Add(0, 0, 0, wxLEFT, 5); // Not sure what this was for but it unbalances the dialog if (m_buttonHelp) Add((wxWindow*)m_buttonHelp, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonHelp->ConvertDialogToPixels(wxSize(4, 0)).x); @@ -1800,7 +1912,7 @@ void wxStdDialogButtonSizer::Finalise() } if (m_buttonCancel){ - Add((wxWindow*)m_buttonCancel, 0, wxALIGN_CENTRE | wxLEFT, m_buttonCancel->ConvertDialogToPixels(wxSize(4, 0)).x); + Add((wxWindow*)m_buttonCancel, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonCancel->ConvertDialogToPixels(wxSize(4, 0)).x); // Cancel or help should be default // m_buttonCancel->SetDefaultButton(); } @@ -1838,7 +1950,7 @@ void wxBookCtrlSizer::RecalcSizes() 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;