[ 1509599 ] 'Split pickers page in widgets sample' with more icons and rebaking.

[wxWidgets.git] / src / generic / toolbkg.cpp

diff --git a/src/generic/toolbkg.cpp b/src/generic/toolbkg.cpp
index b2536e57aefdedd4eed96780fdaa8d5f4d8e0967..0822ab0ae89d157fc23640c68bc58554d583ed54 100644 (file)
--- a/src/generic/toolbkg.cpp
+++ b/src/generic/toolbkg.cpp
@@ -27,7 +27,10 @@
 #include "wx/imaglist.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
@@ -43,8 +46,10 @@
 IMPLEMENT_DYNAMIC_CLASS(wxToolbook, wxBookCtrlBase)
 IMPLEMENT_DYNAMIC_CLASS(wxToolbookEvent, wxNotifyEvent)
 
+#if !WXWIN_COMPATIBILITY_EVENT_TYPES
 const wxEventType wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING = wxNewEventType();
 const wxEventType wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED = wxNewEventType();
+#endif
 const int wxID_TOOLBOOKTOOLBAR = wxNewId();
 
 BEGIN_EVENT_TABLE(wxToolbook, wxBookCtrlBase)
@@ -91,6 +96,7 @@ bool wxToolbook::Create(wxWindow *parent,
 
     // TODO: make more configurable
     
+#if defined(__WXMAC__) && wxUSE_TOOLBAR && wxUSE_BMPBUTTON
     if (style & wxBK_BUTTONBAR)
     {
         m_bookctrl = new wxButtonToolBar
@@ -99,10 +105,11 @@ bool wxToolbook::Create(wxWindow *parent,
                     wxID_TOOLBOOKTOOLBAR,
                     wxDefaultPosition,
                     wxDefaultSize,
-                    orient|wxTB_TEXT|wxTB_FLAT|wxTB_NODIVIDER|wxNO_BORDER
+                    orient|wxTB_TEXT|wxTB_FLAT|wxNO_BORDER
                  );
     }
     else
+#endif
     {
         m_bookctrl = new wxToolBar
                  (
@@ -110,7 +117,7 @@ bool wxToolbook::Create(wxWindow *parent,
                     wxID_TOOLBOOKTOOLBAR,
                     wxDefaultPosition,
                     wxDefaultSize,
-                    orient | wxTB_TEXT|wxTB_FLAT|wxTB_NODIVIDER
+                    orient|wxTB_TEXT|wxTB_FLAT|wxTB_NODIVIDER|wxNO_BORDER
                  );
     }
 
@@ -302,6 +309,39 @@ void wxToolbook::Realize()
     DoSize();
 }
 
+int wxToolbook::HitTest(const wxPoint& pt, long *flags) const
+{
+    int pagePos = wxNOT_FOUND;
+
+    if ( flags )
+        *flags = wxNB_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()).Inside(tbarPt) )
+    {
+        const wxToolBarToolBase * const
+            tool = tbar->FindToolForPosition(tbarPt.x, tbarPt.y);
+
+        if ( tool )
+        {
+            pagePos = tbar->GetToolPos(tool->GetId());
+            if ( flags )
+                *flags = wxNB_HITTEST_ONICON | wxNB_HITTEST_ONLABEL;
+        }
+    }
+    else // not over the toolbar
+    {
+        if ( flags && GetPageRect().Inside(pt) )
+            *flags |= wxNB_HITTEST_ONPAGE;
+    }
+
+    return pagePos;
+}
+
 void wxToolbook::OnIdle(wxIdleEvent& event)
 {
     if (m_needsRealizing)
@@ -348,7 +388,7 @@ bool wxToolbook::InsertPage(size_t n,
 
     if (bSelect)
     {
-        // GetToolBar()->ToggleTool(n, true);
+        GetToolBar()->ToggleTool(n, true);
         m_selection = n;
     }
     else