#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"
-#ifndef WX_PRECOMP
- #include "wx/icon.h"
+#if defined(__WXMAC__) && wxUSE_TOOLBAR && wxUSE_BMPBUTTON
+#include "wx/generic/buttonbar.h"
#endif
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
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)
void wxToolbook::Init()
{
- m_selection = wxNOT_FOUND;
m_needsRealizing = false;
}
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;
}
// wxToolbook geometry management
// ----------------------------------------------------------------------------
-wxSize wxToolbook::GetControllerSize() const
-{
- const wxSize sizeClient = GetClientSize(),
- sizeBorder = m_bookctrl->GetSize() - m_bookctrl->GetClientSize(),
- sizeToolBar = GetToolBar()->GetSize() + sizeBorder;
-
- wxSize size;
-
- if ( IsVertical() )
- {
- size.x = sizeClient.x;
- size.y = sizeToolBar.y;
- }
- else // left/right aligned
- {
- size.x = sizeToolBar.x;
- size.y = sizeClient.y;
- }
-
- return size;
-}
-
void wxToolbook::OnSize(wxSizeEvent& event)
{
if (m_needsRealizing)
wxBookCtrlBase::OnSize(event);
}
-wxSize wxToolbook::CalcSizeFromPage(const wxSize& sizePage) const
-{
- // we need to add the size of the list control and the border between
- const wxSize sizeToolBar = GetControllerSize();
-
- wxSize size = sizePage;
- if ( IsVertical() )
- {
- size.y += sizeToolBar.y + GetInternalBorder();
- }
- else // left/right aligned
- {
- size.x += sizeToolBar.x + GetInternalBorder();
- }
-
- return size;
-}
-
// ----------------------------------------------------------------------------
// accessing the pages
// ----------------------------------------------------------------------------
int wxToolbook::GetPageImage(size_t WXUNUSED(n)) const
{
- wxFAIL_MSG( _T("wxToolbook::GetPageImage() not implemented") );
+ wxFAIL_MSG( wxT("wxToolbook::GetPageImage() not implemented") );
return wxNOT_FOUND;
}
// selection
// ----------------------------------------------------------------------------
-int wxToolbook::GetSelection() const
+wxBookCtrlEvent* wxToolbook::CreatePageChangingEvent() const
{
- return m_selection;
+ return new wxBookCtrlEvent(wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING, m_windowId);
}
-int wxToolbook::SetSelection(size_t n)
+void wxToolbook::MakeChangedEvent(wxBookCtrlEvent &event)
{
- 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);
-
- // program allows the page change
- event.SetEventType(wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED);
- (void)GetEventHandler()->ProcessEvent(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
{
if (m_needsRealizing)
{
+ m_needsRealizing = false;
+
GetToolBar()->SetToolBitmapSize(m_maxBitmapSize);
- int remap = wxSystemOptions::GetOptionInt(wxT("msw.remap"));
- wxSystemOptions::SetOption(wxT("msw.remap"), 0);
GetToolBar()->Realize();
- wxSystemOptions::SetOption(wxT("msw.remap"), remap);
}
- m_needsRealizing = false;
-
- if (m_selection == -1)
+ if (m_selection == wxNOT_FOUND)
m_selection = 0;
if (GetPageCount() > 0)
{
int sel = m_selection;
- m_selection = -1;
+ m_selection = wxNOT_FOUND;
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)
if (bSelect)
{
- // GetToolBar()->ToggleTool(n, true);
+ GetToolBar()->ToggleTool(n, true);
m_selection = n;
}
else
int sel = m_selection - 1;
if (page_count == 1)
sel = wxNOT_FOUND;
- else if ((page_count == 2) || (sel == -1))
+ else if ((page_count == 2) || (sel == wxNOT_FOUND))
sel = 0;
// force sel invalid if deleting current page - don't try to hide it
projects / wxWidgets.git / blobdiff