cleanup

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

diff --git a/src/generic/notebook.cpp b/src/generic/notebook.cpp
index f6462ae8a4eedee0fe8aec0ac859dd1cc5b37890..69f7bdd794c5c6a45ca270fc3547a06aaaf66e8e 100644 (file)
--- a/src/generic/notebook.cpp
+++ b/src/generic/notebook.cpp
@@ -16,6 +16,7 @@
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------

+

 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "notebook.h"
 #endif
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "notebook.h"
 #endif


@@ -31,6 +32,8 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

+#ifndef __WXPALMOS__
+

 #include  "wx/string.h"
 #include  "wx/log.h"
 #include  "wx/settings.h"
 #include  "wx/string.h"
 #include  "wx/log.h"
 #include  "wx/settings.h"


@@ -54,7 +57,7 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)
 
 BEGIN_EVENT_TABLE(wxNotebook, wxControl)
 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)
     EVT_SIZE(wxNotebook::OnSize)
     EVT_PAINT(wxNotebook::OnPaint)
     EVT_MOUSE_EVENTS(wxNotebook::OnMouseEvent)


@@ -131,16 +134,16 @@ bool wxNotebook::Create(wxWindow *parent,
     // base init
     SetName(name);
 
     // 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))
 
     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));
 
 
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
 
     SetTabView(new wxNotebookTabView(this));
 

-    return TRUE;
+    return true;

 }
 
 // dtor
 }
 
 // dtor


@@ -162,13 +165,10 @@ int wxNotebook::SetSelection(size_t nPage)
 {
     wxASSERT( IS_VALID_PAGE(nPage) );
 
 {
     wxASSERT( IS_VALID_PAGE(nPage) );
 

-#if defined (__WIN16__)
-    m_tabView->SetTabSelection(nPage);
-#else

     wxNotebookPage* pPage = GetPage(nPage);
 
     m_tabView->SetTabSelection((int) (long) pPage);
     wxNotebookPage* pPage = GetPage(nPage);
 
     m_tabView->SetTabSelection((int) (long) pPage);

-#endif
+

     // TODO
     return 0;
 }
     // TODO
     return 0;
 }


@@ -188,35 +188,27 @@ void wxNotebook::AdvanceSelection(bool bForward)
 bool wxNotebook::SetPageText(size_t nPage, const wxString& strText)
 {
     wxASSERT( IS_VALID_PAGE(nPage) );
 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();
     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) );
 
 }
 
 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;
     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 nPage) const


@@ -232,7 +224,7 @@ bool wxNotebook::SetPageImage(size_t nPage, int nImage)
     wxASSERT( IS_VALID_PAGE(nPage) );
 
     // TODO
     wxASSERT( IS_VALID_PAGE(nPage) );
 
     // TODO

-    return FALSE;
+    return false;

 }
 
 // set the size (the same for all pages)
 }
 
 // set the size (the same for all pages)


@@ -260,20 +252,17 @@ void wxNotebook::SetTabSize(const wxSize& sz)
 // remove one page from the notebook and delete it
 bool wxNotebook::DeletePage(size_t nPage)
 {
 // 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)
     {
 
     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);
         m_pages[m_nSelection]->Lower();
     }
 
     wxNotebookPage* pPage = GetPage(nPage);

-#if defined (__WIN16__)
-    m_tabView->RemoveTab(nPage);
-#else
+

     m_tabView->RemoveTab((int) (long) pPage);
     m_tabView->RemoveTab((int) (long) pPage);

-#endif

 
     m_pages.Remove(pPage);
     delete pPage;
 
     m_pages.Remove(pPage);
     delete pPage;


@@ -281,23 +270,21 @@ bool wxNotebook::DeletePage(size_t nPage)
     if (m_pages.GetCount() == 0)
     {
       m_nSelection = -1;
     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;
     }
     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);
     }
 
       if (m_nSelection != 0)
         ChangePage(-1, 0);
     }
 

-    RefreshLayout(FALSE);
+    RefreshLayout(false);

 
 

-    return TRUE;
+    return true;

 }
 
 bool wxNotebook::DeletePage(wxNotebookPage* page)
 }
 
 bool wxNotebook::DeletePage(wxNotebookPage* page)


@@ -306,7 +293,7 @@ bool wxNotebook::DeletePage(wxNotebookPage* page)
     if (pagePos > -1)
         return DeletePage(pagePos);
     else
     if (pagePos > -1)
         return DeletePage(pagePos);
     else

-        return FALSE;
+        return false;

 }
 
 bool wxNotebook::RemovePage(size_t nPage)
 }
 
 bool wxNotebook::RemovePage(size_t nPage)


@@ -317,24 +304,21 @@ bool wxNotebook::RemovePage(size_t nPage)
 // remove one page from the notebook
 wxWindow* wxNotebook::DoRemovePage(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), false );

 
 

-    m_pages[nPage]->Show(FALSE);
+    m_pages[nPage]->Show(false);

     //    m_pages[nPage]->Lower();
 
     wxNotebookPage* pPage = GetPage(nPage);
     //    m_pages[nPage]->Lower();
 
     wxNotebookPage* pPage = GetPage(nPage);

-#if defined (__WIN16__)
-    m_tabView->RemoveTab(nPage);
-#else
+

     m_tabView->RemoveTab((int) (long) pPage);
     m_tabView->RemoveTab((int) (long) pPage);

-#endif

 
     m_pages.Remove(pPage);
 
     if (m_pages.GetCount() == 0)
     {
       m_nSelection = -1;
 
     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)
     {
     }
     else if (m_nSelection > -1)
     {


@@ -344,11 +328,11 @@ wxWindow* wxNotebook::DoRemovePage(size_t nPage)
       {
          m_nSelection = -1;
          // Select the first tab. Generates a ChangePage.
       {
          m_nSelection = -1;
          // Select the first tab. Generates a ChangePage.

-         m_tabView->SetTabSelection(0, TRUE);
+         m_tabView->SetTabSelection(0, true);

       }
       else
       {
       }
       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)
         // If greater than the page we deleted, it must be moved down
         // a notch.
         if (size_t(m_nSelection) > nPage)


@@ -356,7 +340,7 @@ wxWindow* wxNotebook::DoRemovePage(size_t nPage)
       }
     }
 
       }
     }
 

-    RefreshLayout(FALSE);
+    RefreshLayout(false);

 
     return pPage;
 }
 
     return pPage;
 }


@@ -367,7 +351,7 @@ bool wxNotebook::RemovePage(wxNotebookPage* page)
     if (pagePos > -1)
         return RemovePage(pagePos);
     else
     if (pagePos > -1)
         return RemovePage(pagePos);
     else

-        return FALSE;
+        return false;

 }
 
 // Find the position of the wxNotebookPage, -1 if not found.
 }
 
 // Find the position of the wxNotebookPage, -1 if not found.


@@ -384,7 +368,7 @@ int wxNotebook::FindPagePosition(wxNotebookPage* page) const
 // remove all pages
 bool wxNotebook::DeleteAllPages()
 {
 // remove all pages
 bool wxNotebook::DeleteAllPages()
 {

-    m_tabView->ClearTabs(TRUE);
+    m_tabView->ClearTabs(true);

 
     size_t nPageCount = GetPageCount();
     size_t nPage;
 
     size_t nPageCount = GetPageCount();
     size_t nPage;


@@ -393,7 +377,7 @@ bool wxNotebook::DeleteAllPages()
 
     m_pages.Clear();
 
 
     m_pages.Clear();
 

-    return TRUE;
+    return true;

 }
 
 // same as AddPage() but does it at given position
 }
 
 // same as AddPage() but does it at given position


@@ -404,16 +388,12 @@ bool wxNotebook::InsertPage(size_t nPage,
                             int imageId)
 {
     wxASSERT( pPage != NULL );
                             int 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);
     m_tabView->AddTab((int) (long) pPage, strText);

-#endif
+

     if (!bSelect)
     if (!bSelect)

-      pPage->Show(FALSE);
+      pPage->Show(false);

 
     // save the pointer to the page
     m_pages.Insert(pPage, nPage);
 
     // save the pointer to the page
     m_pages.Insert(pPage, nPage);


@@ -421,11 +401,8 @@ bool wxNotebook::InsertPage(size_t nPage,
     if (bSelect)
     {
         // This will cause ChangePage to be called, via OnSelPage
     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
     }
 
     // some page must be selected: either this one or the first one if there is


@@ -433,9 +410,9 @@ bool wxNotebook::InsertPage(size_t nPage,
     if ( m_nSelection == -1 )
       ChangePage(-1, 0);
 
     if ( m_nSelection == -1 )
       ChangePage(-1, 0);
 

-    RefreshLayout(FALSE);
+    RefreshLayout(false);

 
 

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -446,10 +423,10 @@ bool wxNotebook::InsertPage(size_t nPage,
 //     time because doing it in ::Create() doesn't work (for unknown reasons)
 void wxNotebook::OnSize(wxSizeEvent& event)
 {
 //     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.
     if ( s_bFirstTime ) {
         // TODO: any first-time-size processing.

-        s_bFirstTime = FALSE;
+        s_bFirstTime = false;

     }
 
     RefreshLayout();
     }
 
     RefreshLayout();


@@ -465,8 +442,8 @@ void wxNotebook::OnInternalIdle()
 {
     wxWindow::OnInternalIdle();
 
 {
     wxWindow::OnInternalIdle();
 

-#if 0    
-    static bool s_bFirstTime = TRUE;
+#if 0
+    static bool s_bFirstTime = true;

     if ( s_bFirstTime ) {
       /*
       wxSize sz(GetSize());
     if ( s_bFirstTime ) {
       /*
       wxSize sz(GetSize());


@@ -483,7 +460,7 @@ void wxNotebook::OnInternalIdle()
       GetEventHandler()->ProcessEvent(sizeEvent);
       Refresh();
       */
       GetEventHandler()->ProcessEvent(sizeEvent);
       Refresh();
       */

-      s_bFirstTime = FALSE;
+      s_bFirstTime = false;

     }
 #endif
 }
     }
 #endif
 }


@@ -524,7 +501,7 @@ bool wxNotebook::RefreshLayout(bool force)
         m_tabView->LayoutTabs();
 
         if (!force && (rect == oldRect))
         m_tabView->LayoutTabs();
 
         if (!force && (rect == oldRect))

-          return FALSE;
+          return false;

 
         // fit the notebook page to the tab control's display area
 
 
         // fit the notebook page to the tab control's display area
 


@@ -541,7 +518,7 @@ bool wxNotebook::RefreshLayout(bool force)
         }
         Refresh();
     }
         }
         Refresh();
     }

-    return TRUE;
+    return true;

 }
 
 void wxNotebook::OnSelChange(wxNotebookEvent& event)
 }
 
 void wxNotebook::OnSelChange(wxNotebookEvent& event)


@@ -590,17 +567,17 @@ 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
 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 */)
 {
 }
 
 bool wxNotebook::DoPhase(int /* nPhase */)
 {

-    return TRUE;
+    return true;

 }
 
 void wxNotebook::Command(wxCommandEvent& WXUNUSED(event))
 {
 }
 
 void wxNotebook::Command(wxCommandEvent& WXUNUSED(event))
 {

-    wxFAIL_MSG("wxNotebook::Command not implemented");
+    wxFAIL_MSG(wxT("wxNotebook::Command not implemented"));

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -614,7 +591,7 @@ void wxNotebook::ChangePage(int nOldSel, int nSel)
     wxASSERT( nOldSel != nSel ); // impossible
 
     if ( nOldSel != -1 ) {
     wxASSERT( nOldSel != nSel ); // impossible
 
     if ( nOldSel != -1 ) {

-        m_pages[nOldSel]->Show(FALSE);
+        m_pages[nOldSel]->Show(false);

         m_pages[nOldSel]->Lower();
     }
 
         m_pages[nOldSel]->Lower();
     }
 


@@ -625,7 +602,7 @@ void wxNotebook::ChangePage(int nOldSel, int nSel)
 
     Refresh();
 
 
     Refresh();
 

-    pPage->Show(TRUE);
+    pPage->Show(true);

     pPage->Raise();
     pPage->SetFocus();
 
     pPage->Raise();
     pPage->SetFocus();
 


@@ -689,10 +666,6 @@ void wxNotebookTabView::OnTabActivate(int activateId, int deactivateId)
 
   wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, m_notebook->GetId());
 
 
   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;
   // Translate from wxTabView's ids (which aren't position-dependent)
   // to wxNotebook's (which are).
   wxNotebookPage* pActive = (wxNotebookPage*) activateId;


@@ -701,7 +674,6 @@ void wxNotebookTabView::OnTabActivate(int activateId, int deactivateId)
   int activatePos = m_notebook->FindPagePosition(pActive);
   int deactivatePos = m_notebook->FindPagePosition(pDeactive);
 
   int activatePos = m_notebook->FindPagePosition(pActive);
   int deactivatePos = m_notebook->FindPagePosition(pDeactive);
 

-#endif

   event.SetEventObject(m_notebook);
   event.SetSelection(activatePos);
   event.SetOldSelection(deactivatePos);
   event.SetEventObject(m_notebook);
   event.SetSelection(activatePos);
   event.SetOldSelection(deactivatePos);


@@ -711,16 +683,12 @@ void wxNotebookTabView::OnTabActivate(int activateId, int deactivateId)
 // Allows Vetoing
 bool wxNotebookTabView::OnTabPreActivate(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 (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;
     // Translate from wxTabView's ids (which aren't position-dependent)
     // to wxNotebook's (which are).
     wxNotebookPage* pActive = (wxNotebookPage*) activateId;


@@ -729,7 +697,6 @@ bool wxNotebookTabView::OnTabPreActivate(int activateId, int deactivateId)
     int activatePos = m_notebook->FindPagePosition(pActive);
     int deactivatePos = m_notebook->FindPagePosition(pDeactive);
 
     int activatePos = m_notebook->FindPagePosition(pActive);
     int deactivatePos = m_notebook->FindPagePosition(pDeactive);
 

-#endif

     event.SetEventObject(m_notebook);
     event.SetSelection(activatePos);
     event.SetOldSelection(deactivatePos);
     event.SetEventObject(m_notebook);
     event.SetSelection(activatePos);
     event.SetOldSelection(deactivatePos);


@@ -739,5 +706,6 @@ bool wxNotebookTabView::OnTabPreActivate(int activateId, int deactivateId)
     }
   }
   return retval;
     }
   }
   return retval;

-} 
+}

 
 

+#endif // __WXPALMOS__