removed the strange __WXMSW__ test in AddFile(bitmap) -- why should this function...

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

diff --git a/src/common/bookctrl.cpp b/src/common/bookctrl.cpp
index 32a6ffebe2e651ece96c04b06cd7bbbce997b24b..d45ff84f7db2a994a58b1b4ca56984557351ddd6 100644 (file)
--- a/src/common/bookctrl.cpp
+++ b/src/common/bookctrl.cpp
@@ -229,6 +229,13 @@ 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;
 
         const wxSize sizeNew = m_bookctrl->GetSize();
         wxPoint posCtrl;


@@ -258,7 +265,7 @@ 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];
     for ( unsigned int i = 0; i < pagesCount; ++i )
     {
         wxWindow * const page = m_pages[i];


@@ -448,7 +455,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 +493,6 @@ int wxBookCtrlBase::DoSetSelection(size_t n, int flags)
     return oldSel;
 }
 
     return oldSel;
 }
 

+IMPLEMENT_DYNAMIC_CLASS(wxBookCtrlEvent, wxNotifyEvent)

 
 #endif // wxUSE_BOOKCTRL
 
 #endif // wxUSE_BOOKCTRL