X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/436ae7cf35de57fbd4aa05076d8ded82df814f35..5a969262e1de36b191f1e4b6c3de1b2c39ac1fb0:/src/common/sizer.cpp diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp index e7e8c80901..58c57cee2d 100644 --- a/src/common/sizer.cpp +++ b/src/common/sizer.cpp @@ -24,6 +24,7 @@ #include "wx/sizer.h" #include "wx/utils.h" #include "wx/statbox.h" +#include "wx/settings.h" #include "wx/listimpl.cpp" #if WXWIN_COMPATIBILITY_2_4 #include "wx/notebook.h" @@ -43,6 +44,9 @@ IMPLEMENT_CLASS(wxBoxSizer, wxSizer) #if wxUSE_STATBOX IMPLEMENT_CLASS(wxStaticBoxSizer, wxBoxSizer) #endif +#if wxUSE_BUTTON +IMPLEMENT_CLASS(wxStdDialogButtonSizer, wxBoxSizer) +#endif WX_DEFINE_EXPORTED_LIST( wxSizerItemList ); @@ -78,10 +82,29 @@ WX_DEFINE_EXPORTED_LIST( wxSizerItemList ); 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 ) @@ -90,6 +113,7 @@ wxSizerItem::wxSizerItem( int width, int height, int proportion, int flag, int b , m_proportion( proportion ) , m_border( border ) , m_flag( flag ) + , m_zoneRect( 0, 0, 0, 0 ) , m_show( true ) , m_userData( userData ) { @@ -102,6 +126,7 @@ wxSizerItem::wxSizerItem( wxWindow *window, int proportion, int flag, int border , m_proportion( proportion ) , m_border( border ) , m_flag( flag ) + , m_zoneRect( 0, 0, 0, 0 ) , m_show( true ) , m_userData( userData ) { @@ -121,6 +146,7 @@ wxSizerItem::wxSizerItem( wxSizer *sizer, int proportion, int flag, int border, , 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 ) @@ -130,15 +156,12 @@ wxSizerItem::wxSizerItem( wxSizer *sizer, int proportion, int flag, int border, } 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() @@ -272,6 +295,7 @@ void wxSizerItem::SetDimension( wxPoint pos, wxSize size ) 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 ); @@ -342,113 +366,14 @@ wxSizer::~wxSizer() WX_CLEAR_LIST(wxSizerItemList, m_children); } -void wxSizer::Add( wxWindow *window, int proportion, int flag, int border, wxObject* userData ) -{ - Add( new wxSizerItem( window, proportion, flag, border, userData ) ); -} - -void wxSizer::Add( wxSizer *sizer, int proportion, int flag, int border, wxObject* userData ) -{ - Add( new wxSizerItem( sizer, proportion, flag, border, userData ) ); -} - -void wxSizer::Add( int width, int height, int proportion, int flag, int border, wxObject* userData ) -{ - Add( new wxSizerItem( width, height, proportion, flag, border, userData ) ); -} - -void wxSizer::Add( wxSizerItem *item ) -{ - Insert( m_children.GetCount(), item ); -} - -void wxSizer::AddSpacer(int size) -{ - Add(size, size); -} - -void wxSizer::AddStretchSpacer(int prop) -{ - Add(0, 0, prop); -} - -void wxSizer::Prepend( wxWindow *window, int proportion, int flag, int border, wxObject* userData ) -{ - Prepend( new wxSizerItem( window, proportion, flag, border, userData ) ); -} - -void wxSizer::Prepend( wxSizer *sizer, int proportion, int flag, int border, wxObject* userData ) -{ - Prepend( new wxSizerItem( sizer, proportion, flag, border, userData ) ); -} - -void wxSizer::Prepend( int width, int height, int proportion, int flag, int border, wxObject* userData ) -{ - Prepend( new wxSizerItem( width, height, proportion, flag, border, userData ) ); -} - -void wxSizer::Prepend( wxSizerItem *item ) -{ - Insert( 0, item ); -} - -void wxSizer::PrependSpacer(int size) -{ - Prepend(size, size); -} - -void wxSizer::PrependStretchSpacer(int prop) -{ - Prepend(0, 0, prop); -} - -void wxSizer::Insert( size_t index, - wxWindow *window, - int proportion, - int flag, - int border, - wxObject* userData ) -{ - Insert( index, new wxSizerItem( window, proportion, flag, border, userData ) ); -} - -void wxSizer::Insert( size_t index, - wxSizer *sizer, - int proportion, - int flag, - int border, - wxObject* userData ) -{ - 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 ) -{ - 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 ); -} - -void wxSizer::InsertSpacer(size_t index, int size) -{ - Insert(index, size, size); -} -void wxSizer::InsertStretchSpacer(size_t index, int prop) -{ - Insert(index, 0, 0, prop); + return item; } bool wxSizer::Remove( wxWindow *window ) @@ -681,9 +606,9 @@ wxSize wxSizer::FitSize( wxWindow *window ) // 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; @@ -717,9 +642,9 @@ wxSize wxSizer::VirtualFitSize( wxWindow *window ) // 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; @@ -846,9 +771,9 @@ bool wxSizer::DoSetItemMinSize( size_t index, int width, int height ) return true; } -bool wxSizer::Show( wxWindow *window, bool show, bool recursive ) +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) @@ -857,58 +782,93 @@ bool wxSizer::Show( wxWindow *window, bool show, bool recursive ) if (item->GetWindow() == window) { - item->Show( show ); - - return true; + return item; } else if (recursive && item->IsSizer()) { - if (item->GetSizer()->Show(window, show, recursive)) - return true; + wxSizerItem *subitem = item->GetSizer()->GetItem( window, true ); + if (subitem) + return subitem; } node = node->GetNext(); } - return false; + return NULL; } -bool wxSizer::Show( wxSizer *sizer, bool show, bool recursive ) +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 ); - - return true; + return item; } else if (recursive && item->IsSizer()) { - if (item->GetSizer()->Show(sizer, show, recursive)) - return true; + 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(); +} + +bool wxSizer::Show( wxWindow *window, bool show, bool recursive ) +{ + wxSizerItem *item = GetItem( window, recursive ); + + 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) { - wxCHECK_MSG( index < m_children.GetCount(), - false, - _T("Show index is out of range") ); + wxSizerItem *item = GetItem( index ); - m_children.Item( index )->GetData()->Show( show ); + if ( item ) + { + item->Show( show ); + return true; + } - return true; + return false; } void wxSizer::ShowItems( bool show ) @@ -1437,7 +1397,7 @@ void wxBoxSizer::RecalcSizes() } 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; @@ -1463,7 +1423,7 @@ void wxBoxSizer::RecalcSizes() } 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; @@ -1633,7 +1593,7 @@ static void GetStaticBoxBorders( wxStaticBox *box, #else #ifdef __WXGTK__ - if ( box->GetLabel().IsEmpty() ) + if ( box->GetLabel().empty() ) *borderTop = 5; else #endif // __WXGTK__ @@ -1683,6 +1643,160 @@ void wxStaticBoxSizer::ShowItems( bool show ) #endif // wxUSE_STATBOX +#if wxUSE_BUTTON + +wxStdDialogButtonSizer::wxStdDialogButtonSizer() + : wxBoxSizer(wxHORIZONTAL) +{ + 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; + + 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: + 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::Finalise() +{ +#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 @@ -1699,7 +1813,7 @@ IMPLEMENT_CLASS(wxNotebookSizer, wxBookCtrlSizer) #if wxUSE_BOOKCTRL -wxBookCtrlSizer::wxBookCtrlSizer(wxBookCtrl *bookctrl) +wxBookCtrlSizer::wxBookCtrlSizer(wxBookCtrlBase *bookctrl) : m_bookctrl(bookctrl) { wxASSERT_MSG( bookctrl, wxT("wxBookCtrlSizer needs a control") );