precompiled headers fix

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

diff --git a/src/univ/notebook.cpp b/src/univ/notebook.cpp
index e1e2ff47ef1d9de53ecbe5b7eb02621870ef68db..68e2ec2e236bd2c0eb04a289d276e27b0cf849e3 100644 (file)
--- a/src/univ/notebook.cpp
+++ b/src/univ/notebook.cpp
@@ -17,10 +17,14 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "univnotebook.h"
 #endif
 
     #pragma implementation "univnotebook.h"
 #endif
 

+#ifdef __VMS
+#pragma message disable unscomzer
+#endif
+

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


@@ -40,7 +44,12 @@
 // macros
 // ----------------------------------------------------------------------------
 
 // macros
 // ----------------------------------------------------------------------------
 

-#define IS_VALID_PAGE(nPage) (((nPage) >= 0) && ((nPage) < GetPageCount()))
+#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
 
 // ----------------------------------------------------------------------------
 // constants


@@ -133,14 +142,14 @@ bool wxNotebook::Create(wxWindow *parent,
 // wxNotebook page titles and images
 // ----------------------------------------------------------------------------
 
 // wxNotebook page titles and images
 // ----------------------------------------------------------------------------
 

-wxString wxNotebook::GetPageText(int nPage) const
+wxString wxNotebook::GetPageText(size_t nPage) const

 {
     wxCHECK_MSG( IS_VALID_PAGE(nPage), _T(""), _T("invalid notebook page") );
 
     return m_titles[nPage];
 }
 
 {
     wxCHECK_MSG( IS_VALID_PAGE(nPage), _T(""), _T("invalid notebook page") );
 
     return m_titles[nPage];
 }
 

-bool wxNotebook::SetPageText(int nPage, const wxString& strText)
+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") );
 


@@ -163,14 +172,14 @@ bool wxNotebook::SetPageText(int nPage, const wxString& strText)
     return TRUE;
 }
 
     return TRUE;
 }
 

-int wxNotebook::GetPageImage(int nPage) const
+int wxNotebook::GetPageImage(size_t nPage) const

 {
     wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, _T("invalid notebook page") );
 
     return m_images[nPage];
 }
 
 {
     wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, _T("invalid notebook page") );
 
     return m_images[nPage];
 }
 

-bool wxNotebook::SetPageImage(int nPage, int nImage)
+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") );
 


@@ -202,7 +211,7 @@ wxNotebook::~wxNotebook()
 // wxNotebook page switching
 // ----------------------------------------------------------------------------
 
 // wxNotebook page switching
 // ----------------------------------------------------------------------------
 

-int wxNotebook::SetSelection(int nPage)
+int wxNotebook::SetSelection(size_t nPage)

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


@@ -212,15 +221,32 @@ int wxNotebook::SetSelection(int nPage)
         return m_sel;
     }
 
         return m_sel;
     }
 

-    if ( m_sel != INVALID_PAGE )
+    // event handling
+    wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_windowId);
+    event.SetSelection(nPage);
+    event.SetOldSelection(m_sel);
+    event.SetEventObject(this);
+    if ( GetEventHandler()->ProcessEvent(event) && !event.IsAllowed() )

     {
     {

-        RefreshTab(m_sel);
-
-        m_pages[m_sel]->Hide();
+        // program doesn't allow the page change
+        return m_sel;

     }
 
     }
 

+    // we need to change m_sel first, before calling RefreshTab() below as
+    // otherwise the previously selected tab wouldn't be redrawn properly under
+    // wxGTK which calls Refresh() immediately and not during the next event
+    // loop iteration as wxMSW does and as it should
+    size_t selOld = m_sel;
+

     m_sel = nPage;
 
     m_sel = nPage;
 

+    if ( selOld != INVALID_PAGE )
+    {
+        RefreshTab(selOld, TRUE /* this tab was selected */);
+
+        m_pages[selOld]->Hide();
+    }
+

     if ( m_sel != INVALID_PAGE ) // this is impossible - but test nevertheless
     {
         if ( HasSpinBtn() )
     if ( m_sel != INVALID_PAGE ) // this is impossible - but test nevertheless
     {
         if ( HasSpinBtn() )


@@ -249,46 +275,24 @@ int wxNotebook::SetSelection(int nPage)
         m_pages[m_sel]->Show();
     }
 
         m_pages[m_sel]->Show();
     }
 

-    return m_sel;
-}
-
-void wxNotebook::ChangePage(int nPage)
-{
-    wxCHECK_RET( IS_VALID_PAGE(nPage), _T("invalid notebook page") );
-
-    if ( (size_t)nPage == m_sel )
-    {
-        // nothing to do
-        return;
-    }
-
-    wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_windowId);
-    event.SetSelection(nPage);
-    event.SetOldSelection(m_sel);
-    event.SetEventObject(this);
-    if ( GetEventHandler()->ProcessEvent(event) && !event.IsAllowed() )
-    {
-        // program doesn't allow the page change
-        return;
-    }
-
-    SetSelection(nPage);
-
+    // event handling

     event.SetEventType(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED);
     GetEventHandler()->ProcessEvent(event);
     event.SetEventType(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED);
     GetEventHandler()->ProcessEvent(event);

+
+    return selOld;

 }
 
 // ----------------------------------------------------------------------------
 // wxNotebook pages adding/deleting
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // wxNotebook pages adding/deleting
 // ----------------------------------------------------------------------------
 

-bool wxNotebook::InsertPage(int nPage,
+bool wxNotebook::InsertPage(size_t nPage,

                             wxNotebookPage *pPage,
                             const wxString& strText,
                             bool bSelect,
                             int imageId)
 {
                             wxNotebookPage *pPage,
                             const wxString& strText,
                             bool bSelect,
                             int imageId)
 {

-    int nPages = GetPageCount();
+    size_t nPages = GetPageCount();

     wxCHECK_MSG( nPage == nPages || IS_VALID_PAGE(nPage), FALSE,
                  _T("invalid notebook page in InsertPage()") );
 
     wxCHECK_MSG( nPage == nPages || IS_VALID_PAGE(nPage), FALSE,
                  _T("invalid notebook page in InsertPage()") );
 


@@ -324,6 +328,7 @@ bool wxNotebook::InsertPage(int nPage,
         bSelect = TRUE;
 
         Relayout();
         bSelect = TRUE;
 
         Relayout();

+        Refresh();

     }
     else // not the first tab
     {
     }
     else // not the first tab
     {


@@ -364,7 +369,7 @@ bool wxNotebook::DeleteAllPages()
     return TRUE;
 }
 
     return TRUE;
 }
 

-wxNotebookPage *wxNotebook::DoRemovePage(int nPage)
+wxNotebookPage *wxNotebook::DoRemovePage(size_t nPage)

 {
     wxCHECK_MSG( IS_VALID_PAGE(nPage), NULL, _T("invalid notebook page") );
 
 {
     wxCHECK_MSG( IS_VALID_PAGE(nPage), NULL, _T("invalid notebook page") );
 


@@ -376,12 +381,16 @@ wxNotebookPage *wxNotebook::DoRemovePage(int nPage)
     m_images.RemoveAt(nPage);
 
     // the spin button might not be needed any more
     m_images.RemoveAt(nPage);
 
     // the spin button might not be needed any more

-    if ( HasSpinBtn() )
+    // 2002-08-12 'if' commented out by JACS on behalf
+    // of Hans Van Leemputten <Hansvl@softhome.net> who
+    // points out that UpdateSpinBtn should always be called,
+    // to ensure m_lastVisible is up to date.
+    // if ( HasSpinBtn() )

     {
         UpdateSpinBtn();
     }
 
     {
         UpdateSpinBtn();
     }
 

-    int count = GetPageCount();
+    size_t count = GetPageCount();

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


@@ -421,12 +430,12 @@ void wxNotebook::RefreshCurrent()
     }
 }
 
     }
 }
 

-void wxNotebook::RefreshTab(int page)
+void wxNotebook::RefreshTab(int page, bool forceSelected)

 {
     wxCHECK_RET( IS_VALID_PAGE(page), _T("invalid notebook page") );
 
     wxRect rect = GetTabRect(page);
 {
     wxCHECK_RET( IS_VALID_PAGE(page), _T("invalid notebook page") );
 
     wxRect rect = GetTabRect(page);

-    if ( (size_t)page == m_sel )
+    if ( forceSelected || ((size_t)page == m_sel) )

     {
         const wxSize indent = GetRenderer()->GetTabIndent();
         rect.Inflate(indent.x, indent.y);
     {
         const wxSize indent = GetRenderer()->GetTabIndent();
         rect.Inflate(indent.x, indent.y);


@@ -452,7 +461,9 @@ void wxNotebook::DoDrawTab(wxDC& dc, const wxRect& rect, size_t n)
     {
         int image = m_images[n];
 
     {
         int image = m_images[n];
 

-#ifdef __WXMSW__    // FIXME
+        // Not needed now that wxGenericImageList is being
+        // used for wxUniversal under MSW
+#if 0 // def __WXMSW__    // FIXME

         int w, h;
         m_imageList->GetSize(n, w, h);
         bmp.Create(w, h);
         int w, h;
         m_imageList->GetSize(n, w, h);
         bmp.Create(w, h);


@@ -460,6 +471,7 @@ void wxNotebook::DoDrawTab(wxDC& dc, const wxRect& rect, size_t n)
         dc.SelectObject(bmp);
         dc.SetBackground(wxBrush(GetBackgroundColour(), wxSOLID));
         m_imageList->Draw(image, dc, 0, 0, wxIMAGELIST_DRAW_NORMAL, TRUE);
         dc.SelectObject(bmp);
         dc.SetBackground(wxBrush(GetBackgroundColour(), wxSOLID));
         m_imageList->Draw(image, dc, 0, 0, wxIMAGELIST_DRAW_NORMAL, TRUE);

+        dc.SelectObject(wxNullBitmap);

 #else
         bmp = *m_imageList->GetBitmap(image);
 #endif
 #else
         bmp = *m_imageList->GetBitmap(image);
 #endif


@@ -505,10 +517,20 @@ void wxNotebook::DoDraw(wxControlRenderer *renderer)
         wxSize sizeSpinBtn = m_spinbtn->GetSize();
 
         if ( IsVertical() )
         wxSize sizeSpinBtn = m_spinbtn->GetSize();
 
         if ( IsVertical() )

+        {

             rectTabs.height -= sizeSpinBtn.y;
             rectTabs.height -= sizeSpinBtn.y;

+
+            // Allow for erasing the line under selected tab
+            rectTabs.width += 2;
+        }

         else
         else

+        {

             rectTabs.width -= sizeSpinBtn.x;
 
             rectTabs.width -= sizeSpinBtn.x;
 

+            // Allow for erasing the line under selected tab
+            rectTabs.height += 2;
+        }
+

         dc.SetClippingRegion(rectTabs);
     }
 
         dc.SetClippingRegion(rectTabs);
     }
 


@@ -553,14 +575,19 @@ void wxNotebook::DoDraw(wxControlRenderer *renderer)
     {
         DoDrawTab(dc, rectSel, m_sel);
     }
     {
         DoDrawTab(dc, rectSel, m_sel);
     }

+
+    dc.DestroyClippingRegion();

 }
 
 // ----------------------------------------------------------------------------
 // wxNotebook geometry
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // wxNotebook geometry
 // ----------------------------------------------------------------------------
 

-int wxNotebook::HitTest(const wxPoint& pt) const
+int wxNotebook::HitTest(const wxPoint& pt, long *flags) const

 {
 {

+    if ( flags )
+        *flags = wxNB_HITTEST_NOWHERE;
+

     // first check that it is in this window at all
     if ( !GetClientRect().Inside(pt) )
     {
     // first check that it is in this window at all
     if ( !GetClientRect().Inside(pt) )
     {


@@ -601,7 +628,15 @@ int wxNotebook::HitTest(const wxPoint& pt) const
         GetTabSize(n, &rectTabs.width, &rectTabs.height);
 
         if ( rectTabs.Inside(pt) )
         GetTabSize(n, &rectTabs.width, &rectTabs.height);
 
         if ( rectTabs.Inside(pt) )

+        {
+            if ( flags )
+            {
+                // TODO: be more precise
+                *flags = wxNB_HITTEST_ONITEM;
+            }
+

             return n;
             return n;

+        }

 
         // move the rectTabs to the next tab
         if ( IsVertical() )
 
         // move the rectTabs to the next tab
         if ( IsVertical() )


@@ -936,7 +971,7 @@ void wxNotebook::SetPageSize(const wxSize& size)
     SetClientSize(GetSizeForPage(size));
 }
 
     SetClientSize(GetSizeForPage(size));
 }
 

-wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage)
+wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) const

 {
     return AdjustSize(GetSizeForPage(sizePage));
 }
 {
     return AdjustSize(GetSizeForPage(sizePage));
 }


@@ -1247,9 +1282,14 @@ void wxNotebook::DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags)
 {
                            int width, int height,
                            int sizeFlags)
 {

-    wxControl::DoSetSize(x, y, width, height, sizeFlags);
+    wxSize old_client_size = GetClientSize();

 
 

-    Relayout();
+    wxControl::DoSetSize(x, y, width, height, sizeFlags);
+    
+    wxSize new_client_size = GetClientSize();
+    
+    if (old_client_size != new_client_size)
+        Relayout();

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


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

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

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

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

     else if ( action == wxACTION_NOTEBOOK_GOTO )
     else if ( action == wxACTION_NOTEBOOK_GOTO )

-        ChangePage((int)numArg);
+        SetSelection((int)numArg);

     else
         return wxControl::PerformAction(action, numArg, strArg);
 
     else
         return wxControl::PerformAction(action, numArg, strArg);
 


@@ -1358,8 +1398,9 @@ bool wxStdNotebookInputHandler::HandleMouseMove(wxInputConsumer *consumer,
     return wxStdInputHandler::HandleMouseMove(consumer, event);
 }
 
     return wxStdInputHandler::HandleMouseMove(consumer, event);
 }
 

-bool wxStdNotebookInputHandler::HandleFocus(wxInputConsumer *consumer,
-                                            const wxFocusEvent& event)
+bool
+wxStdNotebookInputHandler::HandleFocus(wxInputConsumer *consumer,
+                                       const wxFocusEvent& WXUNUSED(event))

 {
     HandleFocusChange(consumer);
 
 {
     HandleFocusChange(consumer);