X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9cf0f6ae4f20919ec35834109914f825f10a4363..1bab36277c418507195638ace24ea9cedc78391c:/src/generic/toolbkg.cpp

diff --git a/src/generic/toolbkg.cpp b/src/generic/toolbkg.cpp
index e0cbd98b81..b88e45b9cd 100644
--- a/src/generic/toolbkg.cpp
+++ b/src/generic/toolbkg.cpp
@@ -44,13 +44,9 @@
 // ----------------------------------------------------------------------------
 
 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();
+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)
@@ -90,22 +86,27 @@ bool 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
-    
+
 #if defined(__WXMAC__) && wxUSE_TOOLBAR && wxUSE_BMPBUTTON
-    if (style & wxBK_BUTTONBAR)
+    if (style & wxTBK_BUTTONBAR)
     {
         m_bookctrl = new wxButtonToolBar
                  (
                     this,
-                    wxID_TOOLBOOKTOOLBAR,
+                    wxID_ANY,
                     wxDefaultPosition,
                     wxDefaultSize,
-                    orient|wxTB_TEXT|wxTB_FLAT|wxNO_BORDER
+                    tbFlags
                  );
     }
     else
@@ -114,10 +115,10 @@ bool wxToolbook::Create(wxWindow *parent,
         m_bookctrl = new wxToolBar
                  (
                     this,
-                    wxID_TOOLBOOKTOOLBAR,
+                    wxID_ANY,
                     wxDefaultPosition,
                     wxDefaultSize,
-                    orient|wxTB_TEXT|wxTB_FLAT|wxTB_NODIVIDER|wxNO_BORDER
+                    tbFlags | wxTB_NODIVIDER
                  );
     }
 
@@ -128,28 +129,6 @@ bool wxToolbook::Create(wxWindow *parent,
 // 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)
@@ -158,24 +137,6 @@ void wxToolbook::OnSize(wxSizeEvent& event)
     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
 // ----------------------------------------------------------------------------
@@ -204,7 +165,7 @@ wxString wxToolbook::GetPageText(size_t n) const
 
 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;
 }
@@ -245,39 +206,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
@@ -286,16 +228,13 @@ void wxToolbook::Realize()
 {
     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)
         m_selection = 0;
 
@@ -309,6 +248,39 @@ void wxToolbook::Realize()
     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)