// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#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
const wxEventType wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING = wxNewEventType();
const wxEventType wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED = wxNewEventType();
-const int wxID_TOOLBOOKTOOLBAR = wxNewId();
BEGIN_EVENT_TABLE(wxToolbook, wxBookCtrlBase)
EVT_SIZE(wxToolbook::OnSize)
m_needsRealizing = false;
}
-bool
-wxToolbook::Create(wxWindow *parent,
+bool wxToolbook::Create(wxWindow *parent,
wxWindowID id,
const wxPoint& pos,
const wxSize& size,
const wxString& name)
{
if ( (style & wxBK_ALIGN_MASK) == wxBK_DEFAULT )
- {
style |= wxBK_TOP;
- }
// no border for this control
style &= ~wxBORDER_MASK;
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;
}
{
if (m_needsRealizing)
Realize();
-
+
wxBookCtrlBase::OnSize(event);
}
return size;
}
-
// ----------------------------------------------------------------------------
// accessing the pages
// ----------------------------------------------------------------------------
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);
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;
}
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
return m_selection;
}
-int wxToolbook::SetSelection(size_t n)
+wxBookCtrlBaseEvent* 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 wxToolbookEvent(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(wxBookCtrlBaseEvent &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)
{
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;
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)
// adding/removing the pages
// ----------------------------------------------------------------------------
-bool
-wxToolbook::InsertPage(size_t n,
+bool wxToolbook::InsertPage(size_t n,
wxWindow *page,
const wxString& text,
bool bSelect,
return false;
m_needsRealizing = true;
-
+
wxASSERT(GetImageList() != NULL);
-
+
if (!GetImageList())
return false;
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
if ( win )
{
- GetToolBar()->DeleteTool(page+1);
+ GetToolBar()->DeleteTool(page + 1);
if (m_selection >= (int)page)
{
void wxToolbook::OnToolSelected(wxCommandEvent& event)
{
- const int selNew = event.GetId() -1;
+ const int selNew = event.GetId() - 1;
if ( selNew == m_selection )
{
projects / wxWidgets.git / blobdiff