X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b0c0a393c4027a46b83187ea1328949ca75971d0..a8d2fb31cbf09dcc4683c9566ff4bc89580f268c:/src/generic/notebook.cpp

diff --git a/src/generic/notebook.cpp b/src/generic/notebook.cpp
index 756369436e..6b6b84c79a 100644
--- a/src/generic/notebook.cpp
+++ b/src/generic/notebook.cpp
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        notebook.cpp
-// Purpose:     implementation of wxNotebook
+// Name:        src/generic/notebook.cpp
+// Purpose:     generic implementation of wxNotebook
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
@@ -16,9 +16,6 @@
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "notebook.h"
-#endif
 
 #ifdef __VMS
 #pragma message disable unscomzer
@@ -31,6 +28,8 @@
 #pragma hdrstop
 #endif
 
+#ifndef __WXPALMOS__
+
 #include  "wx/string.h"
 #include  "wx/log.h"
 #include  "wx/settings.h"
@@ -44,7 +43,7 @@
 // ----------------------------------------------------------------------------
 
 // check that the page index is valid
-#define IS_VALID_PAGE(nPage) (((nPage) >= 0) && ((nPage) < GetPageCount()))
+#define IS_VALID_PAGE(nPage) ((nPage) < GetPageCount())
 
 // ----------------------------------------------------------------------------
 // event table
@@ -54,7 +53,7 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)
 
 BEGIN_EVENT_TABLE(wxNotebook, wxControl)
-    EVT_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange)
+    EVT_NOTEBOOK_PAGE_CHANGED(wxID_ANY, wxNotebook::OnSelChange)
     EVT_SIZE(wxNotebook::OnSize)
     EVT_PAINT(wxNotebook::OnPaint)
     EVT_MOUSE_EVENTS(wxNotebook::OnMouseEvent)
@@ -131,16 +130,16 @@ bool wxNotebook::Create(wxWindow *parent,
     // base init
     SetName(name);
 
-    m_windowId = id == -1 ? NewControlId() : id;
+    m_windowId = id == wxID_ANY ? NewControlId() : id;
 
     if (!wxControl::Create(parent, id, pos, size, style|wxNO_BORDER, wxDefaultValidator, name))
-        return FALSE;
+        return false;
 
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
 
     SetTabView(new wxNotebookTabView(this));
 
-    return TRUE;
+    return true;
 }
 
 // dtor
@@ -162,13 +161,10 @@ int wxNotebook::SetSelection(size_t nPage)
 {
     wxASSERT( IS_VALID_PAGE(nPage) );
 
-#if defined (__WIN16__)
-    m_tabView->SetTabSelection(nPage);
-#else
     wxNotebookPage* pPage = GetPage(nPage);
 
     m_tabView->SetTabSelection((int) (long) pPage);
-#endif
+
     // TODO
     return 0;
 }
@@ -188,38 +184,30 @@ void wxNotebook::AdvanceSelection(bool bForward)
 bool wxNotebook::SetPageText(size_t nPage, const wxString& strText)
 {
     wxASSERT( IS_VALID_PAGE(nPage) );
-#if defined (__WIN16__)
-	m_tabView->SetTabText(nPage, strText);
-    Refresh();
-    return TRUE;
-#else
+
     wxNotebookPage* page = GetPage(nPage);
     if (page)
     {
         m_tabView->SetTabText((int) (long) page, strText);
         Refresh();
-        return TRUE;
+        return true;
     }
-#endif
-    return FALSE;
+
+    return false;
 }
 
 wxString wxNotebook::GetPageText(size_t nPage) const
 {
     wxASSERT( IS_VALID_PAGE(nPage) );
 
-#if defined (__WIN16__)
-    return m_tabView->GetTabText(nPage);
-#else
     wxNotebookPage* page = ((wxNotebook*)this)->GetPage(nPage);
     if (page)
         return m_tabView->GetTabText((int) (long) page);
     else
         return wxEmptyString;
-#endif
 }
 
-int wxNotebook::GetPageImage(size_t nPage) const
+int wxNotebook::GetPageImage(size_t WXUNUSED_UNLESS_DEBUG(nPage)) const
 {
     wxASSERT( IS_VALID_PAGE(nPage) );
 
@@ -227,28 +215,29 @@ int wxNotebook::GetPageImage(size_t nPage) const
     return 0;
 }
 
-bool wxNotebook::SetPageImage(size_t nPage, int nImage)
+bool wxNotebook::SetPageImage(size_t WXUNUSED_UNLESS_DEBUG(nPage),
+                              int WXUNUSED(nImage))
 {
     wxASSERT( IS_VALID_PAGE(nPage) );
 
     // TODO
-    return FALSE;
+    return false;
 }
 
 // set the size (the same for all pages)
-void wxNotebook::SetPageSize(const wxSize& size)
+void wxNotebook::SetPageSize(const wxSize& WXUNUSED(size))
 {
     // TODO
 }
 
 // set the padding between tabs (in pixels)
-void wxNotebook::SetPadding(const wxSize& padding)
+void wxNotebook::SetPadding(const wxSize& WXUNUSED(padding))
 {
     // TODO
 }
 
 // set the size of the tabs for wxNB_FIXEDWIDTH controls
-void wxNotebook::SetTabSize(const wxSize& sz)
+void wxNotebook::SetTabSize(const wxSize& WXUNUSED(sz))
 {
     // TODO
 }
@@ -260,20 +249,17 @@ void wxNotebook::SetTabSize(const wxSize& sz)
 // remove one page from the notebook and delete it
 bool wxNotebook::DeletePage(size_t nPage)
 {
-    wxCHECK( IS_VALID_PAGE(nPage), FALSE );
+    wxCHECK( IS_VALID_PAGE(nPage), false );
 
     if (m_nSelection != -1)
     {
-        m_pages[m_nSelection]->Show(FALSE);
+        m_pages[m_nSelection]->Show(false);
         m_pages[m_nSelection]->Lower();
     }
 
     wxNotebookPage* pPage = GetPage(nPage);
-#if defined (__WIN16__)
-    m_tabView->RemoveTab(nPage);
-#else
+
     m_tabView->RemoveTab((int) (long) pPage);
-#endif
 
     m_pages.Remove(pPage);
     delete pPage;
@@ -281,23 +267,21 @@ bool wxNotebook::DeletePage(size_t nPage)
     if (m_pages.GetCount() == 0)
     {
       m_nSelection = -1;
-      m_tabView->SetTabSelection(-1, FALSE);
+      m_tabView->SetTabSelection(-1, false);
     }
     else if (m_nSelection > -1)
     {
       m_nSelection = -1;
-#if defined (__WIN16__)
-      m_tabView->SetTabSelection(0, FALSE);
-#else
-      m_tabView->SetTabSelection((int) (long) GetPage(0), FALSE);
-#endif
+
+      m_tabView->SetTabSelection((int) (long) GetPage(0), false);
+
       if (m_nSelection != 0)
         ChangePage(-1, 0);
     }
 
-    RefreshLayout(FALSE);
+    RefreshLayout(false);
 
-    return TRUE;
+    return true;
 }
 
 bool wxNotebook::DeletePage(wxNotebookPage* page)
@@ -306,7 +290,7 @@ bool wxNotebook::DeletePage(wxNotebookPage* page)
     if (pagePos > -1)
         return DeletePage(pagePos);
     else
-        return FALSE;
+        return false;
 }
 
 bool wxNotebook::RemovePage(size_t nPage)
@@ -317,24 +301,21 @@ bool wxNotebook::RemovePage(size_t nPage)
 // remove one page from the notebook
 wxWindow* wxNotebook::DoRemovePage(size_t nPage)
 {
-    wxCHECK( IS_VALID_PAGE(nPage), FALSE );
+    wxCHECK( IS_VALID_PAGE(nPage), NULL );
 
-    m_pages[nPage]->Show(FALSE);
+    m_pages[nPage]->Show(false);
     //    m_pages[nPage]->Lower();
 
     wxNotebookPage* pPage = GetPage(nPage);
-#if defined (__WIN16__)
-    m_tabView->RemoveTab(nPage);
-#else
+
     m_tabView->RemoveTab((int) (long) pPage);
-#endif
 
     m_pages.Remove(pPage);
 
     if (m_pages.GetCount() == 0)
     {
       m_nSelection = -1;
-      m_tabView->SetTabSelection(-1, TRUE);
+      m_tabView->SetTabSelection(-1, true);
     }
     else if (m_nSelection > -1)
     {
@@ -344,11 +325,11 @@ wxWindow* wxNotebook::DoRemovePage(size_t nPage)
       {
          m_nSelection = -1;
          // Select the first tab. Generates a ChangePage.
-         m_tabView->SetTabSelection(0, TRUE);
+         m_tabView->SetTabSelection(0, true);
       }
       else
       {
-	// We must adjust which tab we think is selected.
+        // We must adjust which tab we think is selected.
         // If greater than the page we deleted, it must be moved down
         // a notch.
         if (size_t(m_nSelection) > nPage)
@@ -356,7 +337,7 @@ wxWindow* wxNotebook::DoRemovePage(size_t nPage)
       }
     }
 
-    RefreshLayout(FALSE);
+    RefreshLayout(false);
 
     return pPage;
 }
@@ -367,7 +348,7 @@ bool wxNotebook::RemovePage(wxNotebookPage* page)
     if (pagePos > -1)
         return RemovePage(pagePos);
     else
-        return FALSE;
+        return false;
 }
 
 // Find the position of the wxNotebookPage, -1 if not found.
@@ -384,7 +365,7 @@ int wxNotebook::FindPagePosition(wxNotebookPage* page) const
 // remove all pages
 bool wxNotebook::DeleteAllPages()
 {
-    m_tabView->ClearTabs(TRUE);
+    m_tabView->ClearTabs(true);
 
     size_t nPageCount = GetPageCount();
     size_t nPage;
@@ -393,7 +374,7 @@ bool wxNotebook::DeleteAllPages()
 
     m_pages.Clear();
 
-    return TRUE;
+    return true;
 }
 
 // same as AddPage() but does it at given position
@@ -401,19 +382,15 @@ bool wxNotebook::InsertPage(size_t nPage,
                             wxNotebookPage *pPage,
                             const wxString& strText,
                             bool bSelect,
-                            int imageId)
+                            int WXUNUSED(imageId))
 {
     wxASSERT( pPage != NULL );
-    wxCHECK( IS_VALID_PAGE(nPage) || nPage == GetPageCount(), FALSE );
+    wxCHECK( IS_VALID_PAGE(nPage) || nPage == GetPageCount(), false );
 
-// For 16 bit integers (tabs limited to 32768)
-#if defined (__WIN16__)
-    m_tabView->AddTab(nPage, strText);
-#else
     m_tabView->AddTab((int) (long) pPage, strText);
-#endif
+
     if (!bSelect)
-      pPage->Show(FALSE);
+      pPage->Show(false);
 
     // save the pointer to the page
     m_pages.Insert(pPage, nPage);
@@ -421,11 +398,8 @@ bool wxNotebook::InsertPage(size_t nPage,
     if (bSelect)
     {
         // This will cause ChangePage to be called, via OnSelPage
-#if defined (__WIN16__)
-        m_tabView->SetTabSelection(nPage, TRUE);
-#else
-        m_tabView->SetTabSelection((int) (long) pPage, TRUE);
-#endif
+
+        m_tabView->SetTabSelection((int) (long) pPage, true);
     }
 
     // some page must be selected: either this one or the first one if there is
@@ -433,9 +407,9 @@ bool wxNotebook::InsertPage(size_t nPage,
     if ( m_nSelection == -1 )
       ChangePage(-1, 0);
 
-    RefreshLayout(FALSE);
+    RefreshLayout(false);
 
-    return TRUE;
+    return true;
 }
 
 // ----------------------------------------------------------------------------
@@ -446,10 +420,10 @@ bool wxNotebook::InsertPage(size_t nPage,
 //     time because doing it in ::Create() doesn't work (for unknown reasons)
 void wxNotebook::OnSize(wxSizeEvent& event)
 {
-    static bool s_bFirstTime = TRUE;
+    static bool s_bFirstTime = true;
     if ( s_bFirstTime ) {
         // TODO: any first-time-size processing.
-        s_bFirstTime = FALSE;
+        s_bFirstTime = false;
     }
 
     RefreshLayout();
@@ -465,8 +439,8 @@ void wxNotebook::OnInternalIdle()
 {
     wxWindow::OnInternalIdle();
 
-#if 0    
-    static bool s_bFirstTime = TRUE;
+#if 0
+    static bool s_bFirstTime = true;
     if ( s_bFirstTime ) {
       /*
       wxSize sz(GetSize());
@@ -483,7 +457,7 @@ void wxNotebook::OnInternalIdle()
       GetEventHandler()->ProcessEvent(sizeEvent);
       Refresh();
       */
-      s_bFirstTime = FALSE;
+      s_bFirstTime = false;
     }
 #endif
 }
@@ -524,7 +498,7 @@ bool wxNotebook::RefreshLayout(bool force)
         m_tabView->LayoutTabs();
 
         if (!force && (rect == oldRect))
-          return FALSE;
+          return false;
 
         // fit the notebook page to the tab control's display area
 
@@ -541,7 +515,7 @@ bool wxNotebook::RefreshLayout(bool force)
         }
         Refresh();
     }
-    return TRUE;
+    return true;
 }
 
 void wxNotebook::OnSelChange(wxNotebookEvent& event)
@@ -590,12 +564,12 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
 void wxNotebook::SetConstraintSizes(bool /* recurse */)
 {
     // don't set the sizes of the pages - their correct size is not yet known
-    wxControl::SetConstraintSizes(FALSE);
+    wxControl::SetConstraintSizes(false);
 }
 
 bool wxNotebook::DoPhase(int /* nPhase */)
 {
-    return TRUE;
+    return true;
 }
 
 void wxNotebook::Command(wxCommandEvent& WXUNUSED(event))
@@ -614,7 +588,7 @@ void wxNotebook::ChangePage(int nOldSel, int nSel)
     wxASSERT( nOldSel != nSel ); // impossible
 
     if ( nOldSel != -1 ) {
-        m_pages[nOldSel]->Show(FALSE);
+        m_pages[nOldSel]->Show(false);
         m_pages[nOldSel]->Lower();
     }
 
@@ -625,7 +599,7 @@ void wxNotebook::ChangePage(int nOldSel, int nSel)
 
     Refresh();
 
-    pPage->Show(TRUE);
+    pPage->Show(true);
     pPage->Raise();
     pPage->SetFocus();
 
@@ -645,6 +619,17 @@ void wxNotebook::OnPaint(wxPaintEvent& WXUNUSED(event) )
         m_tabView->Draw(dc);
 }
 
+wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) const
+{
+    // MBN: since the total tab height is really a function of the
+    // width, this should really call
+    // GetTotalTabHeightPretendingWidthIs(), but the current
+    // implementation will suffice, provided the wxNotebook has been
+    // created with a sensible initial width.
+    return wxSize( sizePage.x + 12,
+                   sizePage.y + m_tabView->GetTotalTabHeight() + 6 + 4 );
+}
+
 wxRect wxNotebook::GetAvailableClientSize()
 {
     int cw, ch;
@@ -689,10 +674,6 @@ void wxNotebookTabView::OnTabActivate(int activateId, int deactivateId)
 
   wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, m_notebook->GetId());
 
-#if defined (__WIN16__)
-  int activatePos = activateId;
-  int deactivatePos = deactivateId;
-#else
   // Translate from wxTabView's ids (which aren't position-dependent)
   // to wxNotebook's (which are).
   wxNotebookPage* pActive = (wxNotebookPage*) activateId;
@@ -701,7 +682,6 @@ void wxNotebookTabView::OnTabActivate(int activateId, int deactivateId)
   int activatePos = m_notebook->FindPagePosition(pActive);
   int deactivatePos = m_notebook->FindPagePosition(pDeactive);
 
-#endif
   event.SetEventObject(m_notebook);
   event.SetSelection(activatePos);
   event.SetOldSelection(deactivatePos);
@@ -711,16 +691,12 @@ void wxNotebookTabView::OnTabActivate(int activateId, int deactivateId)
 // Allows Vetoing
 bool wxNotebookTabView::OnTabPreActivate(int activateId, int deactivateId)
 {
-  bool retval = TRUE;
-  
+  bool retval = true;
+
   if (m_notebook)
   {
     wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_notebook->GetId());
 
-#if defined (__WIN16__)
-    int activatePos = activateId;
-    int deactivatePos = deactivateId;
-#else
     // Translate from wxTabView's ids (which aren't position-dependent)
     // to wxNotebook's (which are).
     wxNotebookPage* pActive = (wxNotebookPage*) activateId;
@@ -729,7 +705,6 @@ bool wxNotebookTabView::OnTabPreActivate(int activateId, int deactivateId)
     int activatePos = m_notebook->FindPagePosition(pActive);
     int deactivatePos = m_notebook->FindPagePosition(pDeactive);
 
-#endif
     event.SetEventObject(m_notebook);
     event.SetSelection(activatePos);
     event.SetOldSelection(deactivatePos);
@@ -739,5 +714,6 @@ bool wxNotebookTabView::OnTabPreActivate(int activateId, int deactivateId)
     }
   }
   return retval;
-} 
+}
 
+#endif // __WXPALMOS__