Fix history in wxWebViewIE when using a custom file scheme.

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

diff --git a/src/generic/toolbkg.cpp b/src/generic/toolbkg.cpp
index 20b36fb46240068549e4c1dbdccfbbba0d7d70ea..8ba3ac932501135a4da2b3228ad54615ff9d826c 100644 (file)
--- a/src/generic/toolbkg.cpp
+++ b/src/generic/toolbkg.cpp
@@ -64,7 +64,6 @@ END_EVENT_TABLE()
 
 void wxToolbook::Init()
 {
 
 void wxToolbook::Init()
 {

-    m_selection = wxNOT_FOUND;

     m_needsRealizing = false;
 }
 
     m_needsRealizing = false;
 }
 


@@ -129,28 +128,6 @@ bool wxToolbook::Create(wxWindow *parent,
 // wxToolbook geometry management
 // ----------------------------------------------------------------------------
 
 // 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)
 void wxToolbook::OnSize(wxSizeEvent& event)
 {
     if (m_needsRealizing)


@@ -159,24 +136,6 @@ void wxToolbook::OnSize(wxSizeEvent& event)
     wxBookCtrlBase::OnSize(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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // accessing the pages
 // ----------------------------------------------------------------------------


@@ -241,11 +200,6 @@ void wxToolbook::SetImageList(wxImageList *imageList)
 // selection
 // ----------------------------------------------------------------------------
 
 // selection
 // ----------------------------------------------------------------------------
 

-int wxToolbook::GetSelection() const
-{
-    return m_selection;
-}
-

 wxBookCtrlEvent* wxToolbook::CreatePageChangingEvent() const
 {
     return new wxBookCtrlEvent(wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING, m_windowId);
 wxBookCtrlEvent* wxToolbook::CreatePageChangingEvent() const
 {
     return new wxBookCtrlEvent(wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING, m_windowId);


@@ -275,13 +229,13 @@ void wxToolbook::Realize()
         GetToolBar()->Realize();
     }
 
         GetToolBar()->Realize();
     }
 

-    if (m_selection == -1)
+    if (m_selection == wxNOT_FOUND)

         m_selection = 0;
 
     if (GetPageCount() > 0)
     {
         int sel = m_selection;
         m_selection = 0;
 
     if (GetPageCount() > 0)
     {
         int sel = m_selection;

-        m_selection = -1;
+        m_selection = wxNOT_FOUND;

         SetSelection(sel);
     }
 
         SetSelection(sel);
     }
 


@@ -392,7 +346,7 @@ wxWindow *wxToolbook::DoRemovePage(size_t page)
             int sel = m_selection - 1;
             if (page_count == 1)
                 sel = wxNOT_FOUND;
             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
                 sel = 0;
 
             // force sel invalid if deleting current page - don't try to hide it