make it possible to change the text of the item being edited from OnBeginLabelEdit()

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

diff --git a/src/univ/notebook.cpp b/src/univ/notebook.cpp
index 80763267edf1e1840e7df8b4f7138b16a5546eb5..8326d62016b091ace422445237dfdd5b8afc9f8d 100644 (file)
--- a/src/univ/notebook.cpp
+++ b/src/univ/notebook.cpp
@@ -44,7 +44,12 @@
 // macros
 // ----------------------------------------------------------------------------
 
+#if 0
+// 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())
+#endif
 
 // ----------------------------------------------------------------------------
 // constants
@@ -63,7 +68,7 @@ class wxNotebookSpinBtn : public wxSpinButton
 {
 public:
     wxNotebookSpinBtn(wxNotebook *nb)
-        : wxSpinButton(nb, -1,
+        : wxSpinButton(nb, wxID_ANY,
                        wxDefaultPosition, wxDefaultSize,
                        nb->IsVertical() ? wxSP_VERTICAL : wxSP_HORIZONTAL)
     {
@@ -83,7 +88,7 @@ private:
 };
 
 BEGIN_EVENT_TABLE(wxNotebookSpinBtn, wxSpinButton)
-    EVT_SPIN(-1, wxNotebookSpinBtn::OnSpin)
+    EVT_SPIN(wxID_ANY, wxNotebookSpinBtn::OnSpin)
 END_EVENT_TABLE()
 
 // ============================================================================
@@ -122,7 +127,7 @@ bool wxNotebook::Create(wxWindow *parent,
 {
     if ( !wxControl::Create(parent, id, pos, size, style,
                             wxDefaultValidator, name) )
-        return FALSE;
+        return false;
 
     m_sizePad = GetRenderer()->GetTabPadding();
 
@@ -130,7 +135,7 @@ bool wxNotebook::Create(wxWindow *parent,
 
     CreateInputHandler(wxINP_HANDLER_NOTEBOOK);
 
-    return TRUE;
+    return true;
 }
 
 // ----------------------------------------------------------------------------
@@ -139,14 +144,14 @@ bool wxNotebook::Create(wxWindow *parent,
 
 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)
 {
-    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] )
     {
@@ -164,7 +169,7 @@ bool wxNotebook::SetPageText(size_t nPage, const wxString& strText)
         }
     }
 
-    return TRUE;
+    return true;
 }
 
 int wxNotebook::GetPageImage(size_t nPage) const
@@ -176,9 +181,9 @@ int wxNotebook::GetPageImage(size_t nPage) const
 
 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] )
@@ -195,7 +200,7 @@ bool wxNotebook::SetPageImage(size_t nPage, int nImage)
             RefreshTab(nPage);
     }
 
-    return TRUE;
+    return true;
 }
 
 wxNotebook::~wxNotebook()
@@ -237,7 +242,7 @@ int wxNotebook::SetSelection(size_t nPage)
 
     if ( selOld != INVALID_PAGE )
     {
-        RefreshTab(selOld, TRUE /* this tab was selected */);
+        RefreshTab(selOld, true /* this tab was selected */);
 
         m_pages[selOld]->Hide();
     }
@@ -288,7 +293,7 @@ bool wxNotebook::InsertPage(size_t nPage,
                             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
@@ -320,7 +325,7 @@ bool wxNotebook::InsertPage(size_t nPage,
     if ( nPages == 0 )
     {
         // always select the first tab to have at least some selection
-        bSelect = TRUE;
+        bSelect = true;
 
         Relayout();
         Refresh();
@@ -339,13 +344,13 @@ bool wxNotebook::InsertPage(size_t nPage,
         pPage->Hide();
     }
 
-    return TRUE;
+    return true;
 }
 
 bool wxNotebook::DeleteAllPages()
 {
     if ( !wxNotebookBase::DeleteAllPages() )
-        return FALSE;
+        return false;
 
     // clear the other arrays as well
     m_titles.Clear();
@@ -361,7 +366,7 @@ bool wxNotebook::DeleteAllPages()
 
     Relayout();
 
-    return TRUE;
+    return true;
 }
 
 wxNotebookPage *wxNotebook::DoRemovePage(size_t nPage)
@@ -465,10 +470,10 @@ void wxNotebook::DoDrawTab(wxDC& dc, const wxRect& rect, size_t n)
         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
-        bmp = *m_imageList->GetBitmap(image);
+        bmp = m_imageList->GetBitmap(image);
 #endif
     }
 
@@ -740,8 +745,16 @@ wxRect wxNotebook::GetTabsPart() const
     const wxSize indent = GetRenderer()->GetTabIndent();
     if ( IsVertical() )
     {
-        rect.x += indent.y;
         rect.y += indent.x;
+        if ( dir == wxLEFT )
+        {
+            rect.x += indent.y;
+            rect.width -= indent.y;
+        }
+        else // wxRIGHT
+        {
+            rect.width -= indent.y;
+        }
     }
     else // horz
     {
@@ -828,7 +841,7 @@ void wxNotebook::ResizeTab(int page)
     wxSize sizeTab = CalcTabSize(page);
 
     // we only need full relayout if the page size changes
-    bool needsRelayout = FALSE;
+    bool needsRelayout = false;
 
     if ( IsVertical() )
     {
@@ -840,7 +853,7 @@ void wxNotebook::ResizeTab(int page)
 
     if ( sizeTab.y > m_heightTab )
     {
-        needsRelayout = TRUE;
+        needsRelayout = true;
 
         m_heightTab = sizeTab.y;
     }
@@ -1066,7 +1079,7 @@ void wxNotebook::UpdateSpinBtn()
     {
         // 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 =
@@ -1122,7 +1135,7 @@ void wxNotebook::UpdateSpinBtn()
     }
     else // all tabs are visible, we don't need spin button
     {
-        if ( m_spinbtn )
+        if ( m_spinbtn && m_spinbtn -> IsShown() )
         {
             m_spinbtn->Hide();
         }
@@ -1240,7 +1253,7 @@ void wxNotebook::ScrollLastTo(int page)
 wxSize wxNotebook::DoGetBestClientSize() const
 {
     // calculate the max page size
-    wxSize size(0, 0);
+    wxSize size;
 
     size_t count = GetPageCount();
     if ( count )
@@ -1280,9 +1293,9 @@ void wxNotebook::DoSetSize(int x, int y,
     wxSize old_client_size = GetClientSize();
 
     wxControl::DoSetSize(x, y, width, height, sizeFlags);
-    
+
     wxSize new_client_size = GetClientSize();
-    
+
     if (old_client_size != new_client_size)
         Relayout();
 }
@@ -1296,15 +1309,15 @@ bool wxNotebook::PerformAction(const wxControlAction& action,
                                const wxString& strArg)
 {
     if ( action == wxACTION_NOTEBOOK_NEXT )
-        SetSelection(GetNextPage(TRUE));
+        SetSelection(GetNextPage(true));
     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);
 
-    return TRUE;
+    return true;
 }
 
 // ----------------------------------------------------------------------------
@@ -1360,7 +1373,7 @@ bool wxStdNotebookInputHandler::HandleKey(wxInputConsumer *consumer,
                 break;
         }
 
-        if ( !!action )
+        if ( !action.IsEmpty() )
         {
             return consumer->PerformAction(action, page);
         }
@@ -1380,7 +1393,7 @@ bool wxStdNotebookInputHandler::HandleMouse(wxInputConsumer *consumer,
         {
             consumer->PerformAction(wxACTION_NOTEBOOK_GOTO, page);
 
-            return FALSE;
+            return false;
         }
     }
 
@@ -1399,7 +1412,7 @@ wxStdNotebookInputHandler::HandleFocus(wxInputConsumer *consumer,
 {
     HandleFocusChange(consumer);
 
-    return FALSE;
+    return false;
 }
 
 bool wxStdNotebookInputHandler::HandleActivation(wxInputConsumer *consumer,
@@ -1408,7 +1421,7 @@ bool wxStdNotebookInputHandler::HandleActivation(wxInputConsumer *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)