Document that wxDCClipper currently resets clipping region.

[wxWidgets.git] / src / common / bookctrl.cpp

diff --git a/src/common/bookctrl.cpp b/src/common/bookctrl.cpp
index 32a6ffebe2e651ece96c04b06cd7bbbce997b24b..4a588a4ddb500af9d86cad41071100a28a444ef6 100644 (file)
--- a/src/common/bookctrl.cpp
+++ b/src/common/bookctrl.cpp
@@ -53,9 +53,8 @@ END_EVENT_TABLE()
 
 void wxBookCtrlBase::Init()
 {
 
 void wxBookCtrlBase::Init()
 {

+    m_selection = wxNOT_FOUND;

     m_bookctrl = NULL;
     m_bookctrl = NULL;

-    m_imageList = NULL;
-    m_ownsImageList = false;

     m_fitToCurrentPage = false;
 
 #if defined(__WXWINCE__)
     m_fitToCurrentPage = false;
 
 #if defined(__WXWINCE__)


@@ -88,39 +87,6 @@ wxBookCtrlBase::Create(wxWindow *parent,
                      );
 }
 
                      );
 }
 

-wxBookCtrlBase::~wxBookCtrlBase()
-{
-    if ( m_ownsImageList )
-    {
-        // may be NULL, ok
-        delete m_imageList;
-    }
-}
-
-// ----------------------------------------------------------------------------
-// image list
-// ----------------------------------------------------------------------------
-
-void wxBookCtrlBase::SetImageList(wxImageList *imageList)
-{
-    if ( m_ownsImageList )
-    {
-        // may be NULL, ok
-        delete m_imageList;
-
-        m_ownsImageList = false;
-    }
-
-    m_imageList = imageList;
-}
-
-void wxBookCtrlBase::AssignImageList(wxImageList* imageList)
-{
-    SetImageList(imageList);
-
-    m_ownsImageList = true;
-}
-

 // ----------------------------------------------------------------------------
 // geometry
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // geometry
 // ----------------------------------------------------------------------------


@@ -137,6 +103,33 @@ void wxBookCtrlBase::DoInvalidateBestSize()
         wxControl::InvalidateBestSize();
 }
 
         wxControl::InvalidateBestSize();
 }
 

+wxSize wxBookCtrlBase::CalcSizeFromPage(const wxSize& sizePage) const
+{
+    // We need to add the size of the controller and the border between if it's
+    // shown. Notice that we don't use GetControllerSize() here as it returns
+    // the actual size while we want the best size here.
+    if ( !m_bookctrl || !m_bookctrl->IsShown() )
+        return sizePage;
+
+    const wxSize sizeController = m_bookctrl->GetBestSize();
+
+    wxSize size = sizePage;
+    if ( IsVertical() )
+    {
+        if ( sizeController.x > sizePage.x )
+            size.x = sizeController.x;
+        size.y += sizeController.y + GetInternalBorder();
+    }
+    else // left/right aligned
+    {
+        size.x += sizeController.x + GetInternalBorder();
+        if ( sizeController.y > sizePage.y )
+            size.y = sizeController.y;
+    }
+
+    return size;
+}
+

 void wxBookCtrlBase::SetPageSize(const wxSize& size)
 {
     SetClientSize(CalcSizeFromPage(size));
 void wxBookCtrlBase::SetPageSize(const wxSize& size)
 {
     SetClientSize(CalcSizeFromPage(size));


@@ -183,7 +176,7 @@ wxRect wxBookCtrlBase::GetPageRect() const
     switch ( GetWindowStyle() & wxBK_ALIGN_MASK )
     {
         default:
     switch ( GetWindowStyle() & wxBK_ALIGN_MASK )
     {
         default:

-            wxFAIL_MSG( _T("unexpected alignment") );
+            wxFAIL_MSG( wxT("unexpected alignment") );

             // fall through
 
         case wxBK_TOP:
             // fall through
 
         case wxBK_TOP:


@@ -229,13 +222,20 @@ void wxBookCtrlBase::DoSize()
                     sizeCtrl( GetControllerSize() );
 
         m_bookctrl->SetClientSize( sizeCtrl.x - sizeBorder.x, sizeCtrl.y - sizeBorder.y );
                     sizeCtrl( GetControllerSize() );
 
         m_bookctrl->SetClientSize( sizeCtrl.x - sizeBorder.x, sizeCtrl.y - sizeBorder.y );

+        // if this changes the visibility of the scrollbars the best size changes, relayout in this case
+        wxSize sizeCtrl2 = GetControllerSize();
+        if ( sizeCtrl != sizeCtrl2 )
+        {
+            wxSize sizeBorder2 = m_bookctrl->GetSize() - m_bookctrl->GetClientSize();
+            m_bookctrl->SetClientSize( sizeCtrl2.x - sizeBorder2.x, sizeCtrl2.y - sizeBorder2.y );
+        }

 
         const wxSize sizeNew = m_bookctrl->GetSize();
         wxPoint posCtrl;
         switch ( GetWindowStyle() & wxBK_ALIGN_MASK )
         {
             default:
 
         const wxSize sizeNew = m_bookctrl->GetSize();
         wxPoint posCtrl;
         switch ( GetWindowStyle() & wxBK_ALIGN_MASK )
         {
             default:

-                wxFAIL_MSG( _T("unexpected alignment") );
+                wxFAIL_MSG( wxT("unexpected alignment") );

                 // fall through
 
             case wxBK_TOP:
                 // fall through
 
             case wxBK_TOP:


@@ -258,14 +258,14 @@ void wxBookCtrlBase::DoSize()
 
     // resize all pages to fit the new control size
     const wxRect pageRect = GetPageRect();
 
     // resize all pages to fit the new control size
     const wxRect pageRect = GetPageRect();

-    const unsigned pagesCount = m_pages.Count();
+    const unsigned pagesCount = m_pages.GetCount();

     for ( unsigned int i = 0; i < pagesCount; ++i )
     {
         wxWindow * const page = m_pages[i];
         if ( !page )
         {
             wxASSERT_MSG( AllowNullPage(),
     for ( unsigned int i = 0; i < pagesCount; ++i )
     {
         wxWindow * const page = m_pages[i];
         if ( !page )
         {
             wxASSERT_MSG( AllowNullPage(),

-                _T("Null page in a control that does not allow null pages?") );
+                wxT("Null page in a control that does not allow null pages?") );

             continue;
         }
 
             continue;
         }
 


@@ -282,12 +282,14 @@ void wxBookCtrlBase::OnSize(wxSizeEvent& event)
 
 wxSize wxBookCtrlBase::GetControllerSize() const
 {
 
 wxSize wxBookCtrlBase::GetControllerSize() const
 {

-    if(!m_bookctrl)
-        return wxSize(0,0);
+    // For at least some book controls (e.g. wxChoicebook) it may make sense to
+    // (temporarily?) hide the controller and we shouldn't leave extra space
+    // for the hidden control in this case.
+    if ( !m_bookctrl || !m_bookctrl->IsShown() )
+        return wxSize(0, 0);

 
     const wxSize sizeClient = GetClientSize(),
 
     const wxSize sizeClient = GetClientSize(),

-                 sizeBorder = m_bookctrl->GetSize() - m_bookctrl->GetClientSize(),
-                 sizeCtrl = m_bookctrl->GetBestSize() + sizeBorder;
+                 sizeCtrl = m_bookctrl->GetBestSize();

 
     wxSize size;
 
 
     wxSize size;
 


@@ -379,9 +381,9 @@ wxBookCtrlBase::InsertPage(size_t nPage,
                            int WXUNUSED(imageId))
 {
     wxCHECK_MSG( page || AllowNullPage(), false,
                            int WXUNUSED(imageId))
 {
     wxCHECK_MSG( page || AllowNullPage(), false,

-                 _T("NULL page in wxBookCtrlBase::InsertPage()") );
+                 wxT("NULL page in wxBookCtrlBase::InsertPage()") );

     wxCHECK_MSG( nPage <= m_pages.size(), false,
     wxCHECK_MSG( nPage <= m_pages.size(), false,

-                 _T("invalid page index in wxBookCtrlBase::InsertPage()") );
+                 wxT("invalid page index in wxBookCtrlBase::InsertPage()") );

 
     m_pages.Insert(page, nPage);
     if ( page )
 
     m_pages.Insert(page, nPage);
     if ( page )


@@ -407,7 +409,7 @@ bool wxBookCtrlBase::DeletePage(size_t nPage)
 wxWindow *wxBookCtrlBase::DoRemovePage(size_t nPage)
 {
     wxCHECK_MSG( nPage < m_pages.size(), NULL,
 wxWindow *wxBookCtrlBase::DoRemovePage(size_t nPage)
 {
     wxCHECK_MSG( nPage < m_pages.size(), NULL,

-                 _T("invalid page index in wxBookCtrlBase::DoRemovePage()") );
+                 wxT("invalid page index in wxBookCtrlBase::DoRemovePage()") );

 
     wxWindow *pageRemoved = m_pages[nPage];
     m_pages.RemoveAt(nPage);
 
     wxWindow *pageRemoved = m_pages[nPage];
     m_pages.RemoveAt(nPage);


@@ -439,6 +441,19 @@ int wxBookCtrlBase::GetNextPage(bool forward) const
     return nPage;
 }
 
     return nPage;
 }
 

+bool wxBookCtrlBase::DoSetSelectionAfterInsertion(size_t n, bool bSelect)
+{
+    if ( bSelect )
+        SetSelection(n);
+    else if ( m_selection == wxNOT_FOUND )
+        ChangeSelection(0);
+    else // We're not going to select this page.
+        return false;
+
+    // Return true to indicate that we selected this page.
+    return true;
+}
+

 int wxBookCtrlBase::DoSetSelection(size_t n, int flags)
 {
     wxCHECK_MSG( n < GetPageCount(), wxNOT_FOUND,
 int wxBookCtrlBase::DoSetSelection(size_t n, int flags)
 {
     wxCHECK_MSG( n < GetPageCount(), wxNOT_FOUND,


@@ -448,7 +463,7 @@ int wxBookCtrlBase::DoSetSelection(size_t n, int flags)
 
     if ( n != (size_t)oldSel )
     {
 
     if ( n != (size_t)oldSel )
     {

-        wxBookCtrlBaseEvent *event = CreatePageChangingEvent();
+        wxBookCtrlEvent *event = CreatePageChangingEvent();

         bool allowed = false;
 
         if ( flags & SetSelection_SendEvent )
         bool allowed = false;
 
         if ( flags & SetSelection_SendEvent )


@@ -486,5 +501,6 @@ int wxBookCtrlBase::DoSetSelection(size_t n, int flags)
     return oldSel;
 }
 
     return oldSel;
 }
 

+IMPLEMENT_DYNAMIC_CLASS(wxBookCtrlEvent, wxNotifyEvent)

 
 #endif // wxUSE_BOOKCTRL
 
 #endif // wxUSE_BOOKCTRL