X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/917cd965fac6cca874e3fa777013433c598d8c8f..5fab0c8d86f7bd7015db8d0ece8ce02ba1b602d8:/src/generic/toolbkg.cpp?ds=sidebyside diff --git a/src/generic/toolbkg.cpp b/src/generic/toolbkg.cpp index 9de9582f5e..638fe2f86a 100644 --- a/src/generic/toolbkg.cpp +++ b/src/generic/toolbkg.cpp @@ -9,14 +9,6 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -26,11 +18,19 @@ #if wxUSE_TOOLBOOK +#ifndef WX_PRECOMP + #include "wx/icon.h" + #include "wx/settings.h" + #include "wx/toolbar.h" +#endif + #include "wx/imaglist.h" -#include "wx/toolbar.h" -#include "wx/toolbook.h" -#include "wx/settings.h" #include "wx/sysopt.h" +#include "wx/toolbook.h" + +#if defined(__WXMAC__) && wxUSE_TOOLBAR && wxUSE_BMPBUTTON +#include "wx/generic/buttonbar.h" +#endif // ---------------------------------------------------------------------------- // various wxWidgets macros @@ -44,11 +44,9 @@ // ---------------------------------------------------------------------------- IMPLEMENT_DYNAMIC_CLASS(wxToolbook, wxBookCtrlBase) -IMPLEMENT_DYNAMIC_CLASS(wxToolbookEvent, wxNotifyEvent) -const wxEventType wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING = wxNewEventType(); -const wxEventType wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED = wxNewEventType(); -const int wxID_TOOLBOOKTOOLBAR = wxNewId(); +wxDEFINE_EVENT( wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING, wxBookCtrlEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED, wxBookCtrlEvent ); BEGIN_EVENT_TABLE(wxToolbook, wxBookCtrlBase) EVT_SIZE(wxToolbook::OnSize) @@ -70,8 +68,7 @@ void wxToolbook::Init() m_needsRealizing = false; } -bool -wxToolbook::Create(wxWindow *parent, +bool wxToolbook::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, @@ -79,9 +76,7 @@ wxToolbook::Create(wxWindow *parent, const wxString& name) { if ( (style & wxBK_ALIGN_MASK) == wxBK_DEFAULT ) - { style |= wxBK_TOP; - } // no border for this control style &= ~wxBORDER_MASK; @@ -91,20 +86,41 @@ wxToolbook::Create(wxWindow *parent, wxDefaultValidator, name) ) return false; - - int orient = wxTB_HORIZONTAL; - if ( (style & (wxBK_LEFT | wxBK_RIGHT)) != 0) - orient = wxTB_VERTICAL; - + int tbFlags = wxTB_TEXT | wxTB_FLAT | wxBORDER_NONE; + if ( (style & (wxBK_LEFT | wxBK_RIGHT)) != 0 ) + tbFlags |= wxTB_VERTICAL; + else + tbFlags |= wxTB_HORIZONTAL; + + if ( style & wxTBK_HORZ_LAYOUT ) + tbFlags |= wxTB_HORZ_LAYOUT; + // TODO: make more configurable - m_bookctrl = new wxToolBar + +#if defined(__WXMAC__) && wxUSE_TOOLBAR && wxUSE_BMPBUTTON + if (style & wxTBK_BUTTONBAR) + { + m_bookctrl = new wxButtonToolBar ( this, - wxID_TOOLBOOKTOOLBAR, + wxID_ANY, wxDefaultPosition, wxDefaultSize, - orient | wxTB_TEXT|wxTB_FLAT|wxTB_NODIVIDER + tbFlags ); + } + else +#endif + { + m_bookctrl = new wxToolBar + ( + this, + wxID_ANY, + wxDefaultPosition, + wxDefaultSize, + tbFlags | wxTB_NODIVIDER + ); + } return true; } @@ -139,7 +155,7 @@ void wxToolbook::OnSize(wxSizeEvent& event) { if (m_needsRealizing) Realize(); - + wxBookCtrlBase::OnSize(event); } @@ -161,7 +177,6 @@ wxSize wxToolbook::CalcSizeFromPage(const wxSize& sizePage) const return size; } - // ---------------------------------------------------------------------------- // accessing the pages // ---------------------------------------------------------------------------- @@ -169,7 +184,7 @@ wxSize wxToolbook::CalcSizeFromPage(const wxSize& sizePage) const bool wxToolbook::SetPageText(size_t n, const wxString& strText) { // Assume tool ids start from 1 - wxToolBarToolBase* tool = GetToolBar()->FindById(n+1); + wxToolBarToolBase* tool = GetToolBar()->FindById(n + 1); if (tool) { tool->SetLabel(strText); @@ -181,11 +196,9 @@ bool wxToolbook::SetPageText(size_t n, const wxString& strText) wxString wxToolbook::GetPageText(size_t n) const { - wxToolBarToolBase* tool = GetToolBar()->FindById(n+1); + wxToolBarToolBase* tool = GetToolBar()->FindById(n + 1); if (tool) - { return tool->GetLabel(); - } else return wxEmptyString; } @@ -202,8 +215,8 @@ bool wxToolbook::SetPageImage(size_t n, int imageId) wxASSERT( GetImageList() != NULL ); if (!GetImageList()) return false; - - wxToolBarToolBase* tool = GetToolBar()->FindById(n+1); + + wxToolBarToolBase* tool = GetToolBar()->FindById(n + 1); if (tool) { // Find the image list index for this tool @@ -233,39 +246,20 @@ int wxToolbook::GetSelection() const return m_selection; } -int wxToolbook::SetSelection(size_t n) +wxBookCtrlEvent* wxToolbook::CreatePageChangingEvent() const { - wxCHECK_MSG( IS_VALID_PAGE(n), wxNOT_FOUND, - wxT("invalid page index in wxToolbook::SetSelection()") ); - - const int oldSel = m_selection; - - if ( int(n) != m_selection ) - { - wxToolbookEvent event(wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING, m_windowId); - event.SetSelection(n); - event.SetOldSelection(m_selection); - event.SetEventObject(this); - if ( !GetEventHandler()->ProcessEvent(event) || event.IsAllowed() ) - { - if ( m_selection != wxNOT_FOUND ) - m_pages[m_selection]->Hide(); - - wxWindow *page = m_pages[n]; - page->SetSize(GetPageRect()); - page->Show(); - - // change m_selection now to ignore the selection change event - m_selection = n; - GetToolBar()->ToggleTool(n+1, true); + return new wxBookCtrlEvent(wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING, m_windowId); +} - // program allows the page change - event.SetEventType(wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED); - (void)GetEventHandler()->ProcessEvent(event); - } - } +void wxToolbook::MakeChangedEvent(wxBookCtrlEvent &event) +{ + event.SetEventType(wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED); +} - return oldSel; +void wxToolbook::UpdateSelectedPage(size_t newsel) +{ + m_selection = newsel; + GetToolBar()->ToggleTool(newsel + 1, true); } // Not part of the wxBookctrl API, but must be called in OnIdle or @@ -275,14 +269,15 @@ void wxToolbook::Realize() if (m_needsRealizing) { GetToolBar()->SetToolBitmapSize(m_maxBitmapSize); - + + int remap = wxSystemOptions::GetOptionInt(wxT("msw.remap")); wxSystemOptions::SetOption(wxT("msw.remap"), 0); GetToolBar()->Realize(); - wxSystemOptions::SetOption(wxT("msw.remap"), 1); + wxSystemOptions::SetOption(wxT("msw.remap"), remap); } - + m_needsRealizing = false; - + if (m_selection == -1) m_selection = 0; @@ -292,10 +287,43 @@ void wxToolbook::Realize() m_selection = -1; SetSelection(sel); } - + DoSize(); } +int wxToolbook::HitTest(const wxPoint& pt, long *flags) const +{ + int pagePos = wxNOT_FOUND; + + if ( flags ) + *flags = wxBK_HITTEST_NOWHERE; + + // convert from wxToolbook coordinates to wxToolBar ones + const wxToolBarBase * const tbar = GetToolBar(); + const wxPoint tbarPt = tbar->ScreenToClient(ClientToScreen(pt)); + + // is the point over the toolbar? + if ( wxRect(tbar->GetSize()).Contains(tbarPt) ) + { + const wxToolBarToolBase * const + tool = tbar->FindToolForPosition(tbarPt.x, tbarPt.y); + + if ( tool ) + { + pagePos = tbar->GetToolPos(tool->GetId()); + if ( flags ) + *flags = wxBK_HITTEST_ONICON | wxBK_HITTEST_ONLABEL; + } + } + else // not over the toolbar + { + if ( flags && GetPageRect().Contains(pt) ) + *flags |= wxBK_HITTEST_ONPAGE; + } + + return pagePos; +} + void wxToolbook::OnIdle(wxIdleEvent& event) { if (m_needsRealizing) @@ -307,8 +335,7 @@ void wxToolbook::OnIdle(wxIdleEvent& event) // adding/removing the pages // ---------------------------------------------------------------------------- -bool -wxToolbook::InsertPage(size_t n, +bool wxToolbook::InsertPage(size_t n, wxWindow *page, const wxString& text, bool bSelect, @@ -318,9 +345,9 @@ wxToolbook::InsertPage(size_t n, return false; m_needsRealizing = true; - + wxASSERT(GetImageList() != NULL); - + if (!GetImageList()) return false; @@ -334,16 +361,16 @@ wxToolbook::InsertPage(size_t n, wxBitmap bitmap; bitmap.CopyFromIcon(icon); #endif - + m_maxBitmapSize.x = wxMax(bitmap.GetWidth(), m_maxBitmapSize.x); m_maxBitmapSize.y = wxMax(bitmap.GetHeight(), m_maxBitmapSize.y); - + GetToolBar()->SetToolBitmapSize(m_maxBitmapSize); - GetToolBar()->AddRadioTool(n+1, text, bitmap, wxNullBitmap, text); + GetToolBar()->AddRadioTool(n + 1, text, bitmap, wxNullBitmap, text); if (bSelect) { - // GetToolBar()->ToggleTool(n, true); + GetToolBar()->ToggleTool(n, true); m_selection = n; } else @@ -360,7 +387,7 @@ wxWindow *wxToolbook::DoRemovePage(size_t page) if ( win ) { - GetToolBar()->DeleteTool(page+1); + GetToolBar()->DeleteTool(page + 1); if (m_selection >= (int)page) { @@ -395,7 +422,7 @@ bool wxToolbook::DeleteAllPages() void wxToolbook::OnToolSelected(wxCommandEvent& event) { - const int selNew = event.GetId() -1; + const int selNew = event.GetId() - 1; if ( selNew == m_selection ) {