update frm Ivan Masar

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

diff --git a/src/generic/notebook.cpp b/src/generic/notebook.cpp
index 8eab2fc19df7ab70182595680fa211cbaebe5939..fd5c9f05ea3d8a5c6dc02c9b656a1a9b7b11c1cf 100644 (file)
--- a/src/generic/notebook.cpp
+++ b/src/generic/notebook.cpp
@@ -30,12 +30,12 @@
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"
+    #include "wx/log.h"
+    #include  "wx/dcclient.h"
+    #include  "wx/settings.h"
 #endif
 
-#include  "wx/log.h"
-#include  "wx/settings.h"
-#include  "wx/generic/imaglist.h"
-#include  "wx/dcclient.h"
+#include  "wx/imaglist.h"
 #include  "wx/generic/tabg.h"
 
 // ----------------------------------------------------------------------------
@@ -72,23 +72,43 @@ IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent)
 // Private class
 // ============================================================================
 
+WX_DECLARE_HASH_MAP(int, wxNotebookPage*, wxIntegerHash, wxIntegerEqual,
+                    wxIntToNotebookPageHashMap);
+
+WX_DECLARE_HASH_MAP(wxNotebookPage*, int, wxPointerHash, wxPointerEqual,
+                    wxNotebookPageToIntHashMap);
+
 // This reuses wxTabView to draw the tabs.
 class WXDLLEXPORT wxNotebookTabView: public wxTabView
 {
 DECLARE_DYNAMIC_CLASS(wxNotebookTabView)
 public:
     wxNotebookTabView(wxNotebook* notebook, long style = wxTAB_STYLE_DRAW_BOX | wxTAB_STYLE_COLOUR_INTERIOR);
-    ~wxNotebookTabView(void);
+    virtual ~wxNotebookTabView(void);
 
     // Called when a tab is activated
     virtual void OnTabActivate(int activateId, int deactivateId);
     // Allows vetoing
     virtual bool OnTabPreActivate(int activateId, int deactivateId);
 
+    // map integer ids used by wxTabView to wxNotebookPage pointers
+    int GetId(wxNotebookPage *page);
+    wxNotebookPage *GetPage(int id) { return m_idToPage[id]; }
+
 protected:
-    wxNotebook*      m_notebook;
+    wxNotebook* m_notebook;
+
+private:
+    wxIntToNotebookPageHashMap m_idToPage;
+    wxNotebookPageToIntHashMap m_pageToId;
+    int m_nextid;
 };
 
+static int GetPageId(wxTabView *tabview, wxNotebookPage *page)
+{
+    return wx_static_cast(wxNotebookTabView*, tabview)->GetId(page);
+}
+
 // ----------------------------------------------------------------------------
 // wxNotebook construction
 // ----------------------------------------------------------------------------
@@ -130,13 +150,14 @@ bool wxNotebook::Create(wxWindow *parent,
     // base init
     SetName(name);
 
+    if ( (style & wxBK_ALIGN_MASK) == wxBK_DEFAULT )
+        style |= wxBK_TOP;
+
     m_windowId = id == wxID_ANY ? NewControlId() : id;
 
     if (!wxControl::Create(parent, id, pos, size, style|wxNO_BORDER, wxDefaultValidator, name))
         return false;
 
-    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
-
     SetTabView(new wxNotebookTabView(this));
 
     return true;
@@ -163,12 +184,18 @@ int wxNotebook::SetSelection(size_t nPage)
 
     wxNotebookPage* pPage = GetPage(nPage);
 
-    m_tabView->SetTabSelection((int) (long) pPage);
+    m_tabView->SetTabSelection(GetPageId(m_tabView, pPage));
 
     // TODO
     return 0;
 }
 
+int wxNotebook::ChangeSelection(size_t nPage)
+{
+    // FIXME: currently it does generate events too
+    return SetSelection(nPage);
+}
+
 #if 0
 void wxNotebook::AdvanceSelection(bool bForward)
 {
@@ -188,7 +215,7 @@ bool wxNotebook::SetPageText(size_t nPage, const wxString& strText)
     wxNotebookPage* page = GetPage(nPage);
     if (page)
     {
-        m_tabView->SetTabText((int) (long) page, strText);
+        m_tabView->SetTabText(GetPageId(m_tabView, page), strText);
         Refresh();
         return true;
     }
@@ -202,7 +229,7 @@ wxString wxNotebook::GetPageText(size_t nPage) const
 
     wxNotebookPage* page = ((wxNotebook*)this)->GetPage(nPage);
     if (page)
-        return m_tabView->GetTabText((int) (long) page);
+        return m_tabView->GetTabText(GetPageId(m_tabView, page));
     else
         return wxEmptyString;
 }
@@ -259,7 +286,7 @@ bool wxNotebook::DeletePage(size_t nPage)
 
     wxNotebookPage* pPage = GetPage(nPage);
 
-    m_tabView->RemoveTab((int) (long) pPage);
+    m_tabView->RemoveTab(GetPageId(m_tabView, pPage));
 
     m_pages.Remove(pPage);
     delete pPage;
@@ -273,7 +300,7 @@ bool wxNotebook::DeletePage(size_t nPage)
     {
         m_nSelection = -1;
 
-        m_tabView->SetTabSelection((int) (long) GetPage(0), false);
+        m_tabView->SetTabSelection(GetPageId(m_tabView, GetPage(0)), false);
 
         if (m_nSelection != 0)
             ChangePage(-1, 0);
@@ -308,7 +335,7 @@ wxWindow* wxNotebook::DoRemovePage(size_t nPage)
 
     wxNotebookPage* pPage = GetPage(nPage);
 
-    m_tabView->RemoveTab((int) (long) pPage);
+    m_tabView->RemoveTab(GetPageId(m_tabView, pPage));
 
     m_pages.Remove(pPage);
 
@@ -387,7 +414,7 @@ bool wxNotebook::InsertPage(size_t nPage,
     wxASSERT( pPage != NULL );
     wxCHECK( IS_VALID_PAGE(nPage) || nPage == GetPageCount(), false );
 
-    m_tabView->AddTab((int) (long) pPage, strText);
+    m_tabView->AddTab(GetPageId(m_tabView, pPage), strText);
 
     if (!bSelect)
       pPage->Show(false);
@@ -399,7 +426,7 @@ bool wxNotebook::InsertPage(size_t nPage,
     {
         // This will cause ChangePage to be called, via OnSelPage
 
-        m_tabView->SetTabSelection((int) (long) pPage, true);
+        m_tabView->SetTabSelection(GetPageId(m_tabView, pPage), true);
     }
 
     // some page must be selected: either this one or the first one if there is
@@ -653,7 +680,8 @@ wxRect wxNotebook::GetAvailableClientSize()
 
 IMPLEMENT_CLASS(wxNotebookTabView, wxTabView)
 
-wxNotebookTabView::wxNotebookTabView(wxNotebook *notebook, long style): wxTabView(style)
+wxNotebookTabView::wxNotebookTabView(wxNotebook *notebook, long style)
+    : wxTabView(style), m_nextid(1)
 {
   m_notebook = notebook;
 
@@ -666,6 +694,19 @@ wxNotebookTabView::~wxNotebookTabView(void)
 {
 }
 
+int wxNotebookTabView::GetId(wxNotebookPage *page)
+{
+    int& id = m_pageToId[page];
+
+    if (!id)
+    {
+        id = m_nextid++;
+        m_idToPage[id] = page;
+    }
+
+    return id;
+}
+
 // Called when a tab is activated
 void wxNotebookTabView::OnTabActivate(int activateId, int deactivateId)
 {
@@ -676,8 +717,8 @@ void wxNotebookTabView::OnTabActivate(int activateId, int deactivateId)
 
   // Translate from wxTabView's ids (which aren't position-dependent)
   // to wxNotebook's (which are).
-  wxNotebookPage* pActive = (wxNotebookPage*) activateId;
-  wxNotebookPage* pDeactive = (wxNotebookPage*) deactivateId;
+  wxNotebookPage* pActive = GetPage(activateId);
+  wxNotebookPage* pDeactive = GetPage(deactivateId);
 
   int activatePos = m_notebook->FindPagePosition(pActive);
   int deactivatePos = m_notebook->FindPagePosition(pDeactive);
@@ -699,8 +740,8 @@ bool wxNotebookTabView::OnTabPreActivate(int activateId, int deactivateId)
 
     // Translate from wxTabView's ids (which aren't position-dependent)
     // to wxNotebook's (which are).
-    wxNotebookPage* pActive = (wxNotebookPage*) activateId;
-    wxNotebookPage* pDeactive = (wxNotebookPage*) deactivateId;
+    wxNotebookPage* pActive = GetPage(activateId);
+    wxNotebookPage* pDeactive = GetPage(deactivateId);
 
     int activatePos = m_notebook->FindPagePosition(pActive);
     int deactivatePos = m_notebook->FindPagePosition(pDeactive);