The richtext DLL needs to also link with the html and xml DLLs.

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

diff --git a/src/univ/notebook.cpp b/src/univ/notebook.cpp
index 68e2ec2e236bd2c0eb04a289d276e27b0cf849e3..407dc958ae3aee1c60cfaeefb4d53f8d4bc9094c 100644 (file)
--- a/src/univ/notebook.cpp
+++ b/src/univ/notebook.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        univ/notebook.cpp
+// Name:        src/univ/notebook.cpp

 // Purpose:     wxNotebook implementation
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     wxNotebook implementation
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -17,14 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "univnotebook.h"
-#endif
-
-#ifdef __VMS
-#pragma message disable unscomzer
-#endif
-

 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__


@@ -33,10 +25,14 @@
 
 #if wxUSE_NOTEBOOK
 
 
 #if wxUSE_NOTEBOOK
 

-#include "wx/imaglist.h"

 #include "wx/notebook.h"
 #include "wx/notebook.h"

+
+#ifndef WX_PRECOMP
+    #include "wx/dcmemory.h"
+#endif
+
+#include "wx/imaglist.h"

 #include "wx/spinbutt.h"
 #include "wx/spinbutt.h"

-#include "wx/dcmemory.h"

 
 #include "wx/univ/renderer.h"
 
 
 #include "wx/univ/renderer.h"
 


@@ -48,7 +44,7 @@
 // due to unsigned type nPage is always >= 0
 #define IS_VALID_PAGE(nPage) (((nPage) >= 0) && ((size_t(nPage)) < GetPageCount()))
 #else
 // due to unsigned type nPage is always >= 0
 #define IS_VALID_PAGE(nPage) (((nPage) >= 0) && ((size_t(nPage)) < GetPageCount()))
 #else

-#define IS_VALID_PAGE(nPage) ((size_t(nPage)) < GetPageCount())
+#define IS_VALID_PAGE(nPage) (((size_t)nPage) < GetPageCount())

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -68,7 +64,7 @@ class wxNotebookSpinBtn : public wxSpinButton
 {
 public:
     wxNotebookSpinBtn(wxNotebook *nb)
 {
 public:
     wxNotebookSpinBtn(wxNotebook *nb)

-        : wxSpinButton(nb, -1,
+        : wxSpinButton(nb, wxID_ANY,

                        wxDefaultPosition, wxDefaultSize,
                        nb->IsVertical() ? wxSP_VERTICAL : wxSP_HORIZONTAL)
     {
                        wxDefaultPosition, wxDefaultSize,
                        nb->IsVertical() ? wxSP_VERTICAL : wxSP_HORIZONTAL)
     {


@@ -88,7 +84,7 @@ private:
 };
 
 BEGIN_EVENT_TABLE(wxNotebookSpinBtn, wxSpinButton)
 };
 
 BEGIN_EVENT_TABLE(wxNotebookSpinBtn, wxSpinButton)

-    EVT_SPIN(-1, wxNotebookSpinBtn::OnSpin)
+    EVT_SPIN(wxID_ANY, wxNotebookSpinBtn::OnSpin)

 END_EVENT_TABLE()
 
 // ============================================================================
 END_EVENT_TABLE()
 
 // ============================================================================


@@ -125,9 +121,12 @@ bool wxNotebook::Create(wxWindow *parent,
                         long style,
                         const wxString& name)
 {
                         long style,
                         const wxString& name)
 {

+    if ( (style & wxBK_ALIGN_MASK) == wxBK_DEFAULT )
+        style |= wxBK_TOP;
+

     if ( !wxControl::Create(parent, id, pos, size, style,
                             wxDefaultValidator, name) )
     if ( !wxControl::Create(parent, id, pos, size, style,
                             wxDefaultValidator, name) )

-        return FALSE;
+        return false;

 
     m_sizePad = GetRenderer()->GetTabPadding();
 
 
     m_sizePad = GetRenderer()->GetTabPadding();
 


@@ -135,7 +134,7 @@ bool wxNotebook::Create(wxWindow *parent,
 
     CreateInputHandler(wxINP_HANDLER_NOTEBOOK);
 
 
     CreateInputHandler(wxINP_HANDLER_NOTEBOOK);
 

-    return TRUE;
+    return true;

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


@@ -144,14 +143,14 @@ bool wxNotebook::Create(wxWindow *parent,
 
 wxString wxNotebook::GetPageText(size_t nPage) const
 {
 
 wxString wxNotebook::GetPageText(size_t nPage) const
 {

-    wxCHECK_MSG( IS_VALID_PAGE(nPage), _T(""), _T("invalid notebook page") );
+    wxCHECK_MSG( IS_VALID_PAGE(nPage), wxEmptyString, _T("invalid notebook page") );

 
     return m_titles[nPage];
 }
 
 bool wxNotebook::SetPageText(size_t nPage, const wxString& strText)
 {
 
     return m_titles[nPage];
 }
 
 bool wxNotebook::SetPageText(size_t nPage, const wxString& strText)
 {

-    wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, _T("invalid notebook page") );
+    wxCHECK_MSG( IS_VALID_PAGE(nPage), false, _T("invalid notebook page") );

 
     if ( strText != m_titles[nPage] )
     {
 
     if ( strText != m_titles[nPage] )
     {


@@ -169,21 +168,21 @@ bool wxNotebook::SetPageText(size_t nPage, const wxString& strText)
         }
     }
 
         }
     }
 

-    return TRUE;
+    return true;

 }
 
 int wxNotebook::GetPageImage(size_t nPage) const
 {
 }
 
 int wxNotebook::GetPageImage(size_t nPage) const
 {

-    wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, _T("invalid notebook page") );
+    wxCHECK_MSG( IS_VALID_PAGE(nPage), wxNOT_FOUND, _T("invalid notebook page") );

 
     return m_images[nPage];
 }
 
 bool wxNotebook::SetPageImage(size_t nPage, int nImage)
 {
 
     return m_images[nPage];
 }
 
 bool wxNotebook::SetPageImage(size_t nPage, int nImage)
 {

-    wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, _T("invalid notebook page") );
+    wxCHECK_MSG( IS_VALID_PAGE(nPage), false, _T("invalid notebook page") );

 
 

-    wxCHECK_MSG( m_imageList && nImage < m_imageList->GetImageCount(), FALSE,
+    wxCHECK_MSG( m_imageList && nImage < m_imageList->GetImageCount(), false,

                  _T("invalid image index in SetPageImage()") );
 
     if ( nImage != m_images[nPage] )
                  _T("invalid image index in SetPageImage()") );
 
     if ( nImage != m_images[nPage] )


@@ -200,7 +199,7 @@ bool wxNotebook::SetPageImage(size_t nPage, int nImage)
             RefreshTab(nPage);
     }
 
             RefreshTab(nPage);
     }
 

-    return TRUE;
+    return true;

 }
 
 wxNotebook::~wxNotebook()
 }
 
 wxNotebook::~wxNotebook()


@@ -213,7 +212,7 @@ wxNotebook::~wxNotebook()
 
 int wxNotebook::SetSelection(size_t nPage)
 {
 
 int wxNotebook::SetSelection(size_t nPage)
 {

-    wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, _T("invalid notebook page") );
+    wxCHECK_MSG( IS_VALID_PAGE(nPage), wxNOT_FOUND, _T("invalid notebook page") );

 
     if ( (size_t)nPage == m_sel )
     {
 
     if ( (size_t)nPage == m_sel )
     {


@@ -242,7 +241,7 @@ int wxNotebook::SetSelection(size_t nPage)
 
     if ( selOld != INVALID_PAGE )
     {
 
     if ( selOld != INVALID_PAGE )
     {

-        RefreshTab(selOld, TRUE /* this tab was selected */);
+        RefreshTab(selOld, true /* this tab was selected */);

 
         m_pages[selOld]->Hide();
     }
 
         m_pages[selOld]->Hide();
     }


@@ -293,7 +292,7 @@ bool wxNotebook::InsertPage(size_t nPage,
                             int imageId)
 {
     size_t nPages = GetPageCount();
                             int imageId)
 {
     size_t nPages = GetPageCount();

-    wxCHECK_MSG( nPage == nPages || IS_VALID_PAGE(nPage), FALSE,
+    wxCHECK_MSG( nPage == nPages || IS_VALID_PAGE(nPage), false,

                  _T("invalid notebook page in InsertPage()") );
 
     // modify the data
                  _T("invalid notebook page in InsertPage()") );
 
     // modify the data


@@ -325,7 +324,7 @@ bool wxNotebook::InsertPage(size_t nPage,
     if ( nPages == 0 )
     {
         // always select the first tab to have at least some selection
     if ( nPages == 0 )
     {
         // always select the first tab to have at least some selection

-        bSelect = TRUE;
+        bSelect = true;

 
         Relayout();
         Refresh();
 
         Relayout();
         Refresh();


@@ -344,13 +343,13 @@ bool wxNotebook::InsertPage(size_t nPage,
         pPage->Hide();
     }
 
         pPage->Hide();
     }
 

-    return TRUE;
+    return true;

 }
 
 bool wxNotebook::DeleteAllPages()
 {
     if ( !wxNotebookBase::DeleteAllPages() )
 }
 
 bool wxNotebook::DeleteAllPages()
 {
     if ( !wxNotebookBase::DeleteAllPages() )

-        return FALSE;
+        return false;

 
     // clear the other arrays as well
     m_titles.Clear();
 
     // clear the other arrays as well
     m_titles.Clear();


@@ -366,7 +365,7 @@ bool wxNotebook::DeleteAllPages()
 
     Relayout();
 
 
     Relayout();
 

-    return TRUE;
+    return true;

 }
 
 wxNotebookPage *wxNotebook::DoRemovePage(size_t nPage)
 }
 
 wxNotebookPage *wxNotebook::DoRemovePage(size_t nPage)


@@ -470,10 +469,10 @@ void wxNotebook::DoDrawTab(wxDC& dc, const wxRect& rect, size_t n)
         wxMemoryDC dc;
         dc.SelectObject(bmp);
         dc.SetBackground(wxBrush(GetBackgroundColour(), wxSOLID));
         wxMemoryDC dc;
         dc.SelectObject(bmp);
         dc.SetBackground(wxBrush(GetBackgroundColour(), wxSOLID));

-        m_imageList->Draw(image, dc, 0, 0, wxIMAGELIST_DRAW_NORMAL, TRUE);
+        m_imageList->Draw(image, dc, 0, 0, wxIMAGELIST_DRAW_NORMAL, true);

         dc.SelectObject(wxNullBitmap);
 #else
         dc.SelectObject(wxNullBitmap);
 #else

-        bmp = *m_imageList->GetBitmap(image);
+        bmp = m_imageList->GetBitmap(image);

 #endif
     }
 
 #endif
     }
 


@@ -658,14 +657,14 @@ bool wxNotebook::IsVertical() const
 wxDirection wxNotebook::GetTabOrientation() const
 {
     long style = GetWindowStyle();
 wxDirection wxNotebook::GetTabOrientation() const
 {
     long style = GetWindowStyle();

-    if ( style & wxNB_BOTTOM )
+    if ( style & wxBK_BOTTOM )

         return wxBOTTOM;
         return wxBOTTOM;

-    else if ( style & wxNB_RIGHT )
+    else if ( style & wxBK_RIGHT )

         return wxRIGHT;
         return wxRIGHT;

-    else if ( style & wxNB_LEFT )
+    else if ( style & wxBK_LEFT )

         return wxLEFT;
 
         return wxLEFT;
 

-    // wxNB_TOP == 0 so we don't have to test for it
+    // wxBK_TOP == 0 so we don't have to test for it

     return wxTOP;
 }
 
     return wxTOP;
 }
 


@@ -745,8 +744,16 @@ wxRect wxNotebook::GetTabsPart() const
     const wxSize indent = GetRenderer()->GetTabIndent();
     if ( IsVertical() )
     {
     const wxSize indent = GetRenderer()->GetTabIndent();
     if ( IsVertical() )
     {

-        rect.x += indent.y;

         rect.y += indent.x;
         rect.y += indent.x;

+        if ( dir == wxLEFT )
+        {
+            rect.x += indent.y;
+            rect.width -= indent.y;
+        }
+        else // wxRIGHT
+        {
+            rect.width -= indent.y;
+        }

     }
     else // horz
     {
     }
     else // horz
     {


@@ -833,7 +840,7 @@ void wxNotebook::ResizeTab(int page)
     wxSize sizeTab = CalcTabSize(page);
 
     // we only need full relayout if the page size changes
     wxSize sizeTab = CalcTabSize(page);
 
     // we only need full relayout if the page size changes

-    bool needsRelayout = FALSE;
+    bool needsRelayout = false;

 
     if ( IsVertical() )
     {
 
     if ( IsVertical() )
     {


@@ -845,7 +852,7 @@ void wxNotebook::ResizeTab(int page)
 
     if ( sizeTab.y > m_heightTab )
     {
 
     if ( sizeTab.y > m_heightTab )
     {

-        needsRelayout = TRUE;
+        needsRelayout = true;

 
         m_heightTab = sizeTab.y;
     }
 
         m_heightTab = sizeTab.y;
     }


@@ -1071,7 +1078,7 @@ void wxNotebook::UpdateSpinBtn()
     {
         // this case is special, get rid of it immediately: everything is
         // visible and we don't need any spin buttons
     {
         // this case is special, get rid of it immediately: everything is
         // visible and we don't need any spin buttons

-        allTabsShown = TRUE;
+        allTabsShown = true;

 
         // have to reset them manually as we don't call CalcLastVisibleTab()
         m_firstVisible =
 
         // have to reset them manually as we don't call CalcLastVisibleTab()
         m_firstVisible =


@@ -1127,7 +1134,7 @@ void wxNotebook::UpdateSpinBtn()
     }
     else // all tabs are visible, we don't need spin button
     {
     }
     else // all tabs are visible, we don't need spin button
     {

-        if ( m_spinbtn )
+        if ( m_spinbtn && m_spinbtn -> IsShown() )

         {
             m_spinbtn->Hide();
         }
         {
             m_spinbtn->Hide();
         }


@@ -1245,7 +1252,7 @@ void wxNotebook::ScrollLastTo(int page)
 wxSize wxNotebook::DoGetBestClientSize() const
 {
     // calculate the max page size
 wxSize wxNotebook::DoGetBestClientSize() const
 {
     // calculate the max page size

-    wxSize size(0, 0);
+    wxSize size;

 
     size_t count = GetPageCount();
     if ( count )
 
     size_t count = GetPageCount();
     if ( count )


@@ -1285,9 +1292,9 @@ void wxNotebook::DoSetSize(int x, int y,
     wxSize old_client_size = GetClientSize();
 
     wxControl::DoSetSize(x, y, width, height, sizeFlags);
     wxSize old_client_size = GetClientSize();
 
     wxControl::DoSetSize(x, y, width, height, sizeFlags);

-    
+

     wxSize new_client_size = GetClientSize();
     wxSize new_client_size = GetClientSize();

-    
+

     if (old_client_size != new_client_size)
         Relayout();
 }
     if (old_client_size != new_client_size)
         Relayout();
 }


@@ -1301,15 +1308,15 @@ bool wxNotebook::PerformAction(const wxControlAction& action,
                                const wxString& strArg)
 {
     if ( action == wxACTION_NOTEBOOK_NEXT )
                                const wxString& strArg)
 {
     if ( action == wxACTION_NOTEBOOK_NEXT )

-        SetSelection(GetNextPage(TRUE));
+        SetSelection(GetNextPage(true));

     else if ( action == wxACTION_NOTEBOOK_PREV )
     else if ( action == wxACTION_NOTEBOOK_PREV )

-        SetSelection(GetNextPage(FALSE));
+        SetSelection(GetNextPage(false));

     else if ( action == wxACTION_NOTEBOOK_GOTO )
         SetSelection((int)numArg);
     else
         return wxControl::PerformAction(action, numArg, strArg);
 
     else if ( action == wxACTION_NOTEBOOK_GOTO )
         SetSelection((int)numArg);
     else
         return wxControl::PerformAction(action, numArg, strArg);
 

-    return TRUE;
+    return true;

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


@@ -1365,7 +1372,7 @@ bool wxStdNotebookInputHandler::HandleKey(wxInputConsumer *consumer,
                 break;
         }
 
                 break;
         }
 

-        if ( !!action )
+        if ( !action.IsEmpty() )

         {
             return consumer->PerformAction(action, page);
         }
         {
             return consumer->PerformAction(action, page);
         }


@@ -1385,7 +1392,7 @@ bool wxStdNotebookInputHandler::HandleMouse(wxInputConsumer *consumer,
         {
             consumer->PerformAction(wxACTION_NOTEBOOK_GOTO, page);
 
         {
             consumer->PerformAction(wxACTION_NOTEBOOK_GOTO, page);
 

-            return FALSE;
+            return false;

         }
     }
 
         }
     }
 


@@ -1404,7 +1411,7 @@ wxStdNotebookInputHandler::HandleFocus(wxInputConsumer *consumer,
 {
     HandleFocusChange(consumer);
 
 {
     HandleFocusChange(consumer);
 

-    return FALSE;
+    return false;

 }
 
 bool wxStdNotebookInputHandler::HandleActivation(wxInputConsumer *consumer,
 }
 
 bool wxStdNotebookInputHandler::HandleActivation(wxInputConsumer *consumer,


@@ -1413,7 +1420,7 @@ bool wxStdNotebookInputHandler::HandleActivation(wxInputConsumer *consumer,
     // we react to the focus change in the same way as to the [de]activation
     HandleFocusChange(consumer);
 
     // we react to the focus change in the same way as to the [de]activation
     HandleFocusChange(consumer);
 

-    return FALSE;
+    return false;

 }
 
 void wxStdNotebookInputHandler::HandleFocusChange(wxInputConsumer *consumer)
 }
 
 void wxStdNotebookInputHandler::HandleFocusChange(wxInputConsumer *consumer)


@@ -1423,4 +1430,3 @@ void wxStdNotebookInputHandler::HandleFocusChange(wxInputConsumer *consumer)
 }
 
 #endif // wxUSE_NOTEBOOK
 }
 
 #endif // wxUSE_NOTEBOOK

-