use wxTE_PROCESS_ENTER for the text control part

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

diff --git a/src/common/bookctrl.cpp b/src/common/bookctrl.cpp
index 2431b05ac5584f3a9506ac94b5bf6738013c0889..9b7c964e242e3a40d5dfaf02192fce812257ba29 100644 (file)
--- a/src/common/bookctrl.cpp
+++ b/src/common/bookctrl.cpp
@@ -53,12 +53,16 @@ void wxBookCtrlBase::Init()
     m_bookctrl = NULL;
     m_imageList = NULL;
     m_ownsImageList = false;
     m_bookctrl = NULL;
     m_imageList = NULL;
     m_ownsImageList = false;

+    m_fitToCurrentPage = false;

 
 #if defined(__WXWINCE__)
     m_internalBorder = 1;
 #else
     m_internalBorder = 5;
 #endif
 
 #if defined(__WXWINCE__)
     m_internalBorder = 1;
 #else
     m_internalBorder = 5;
 #endif

+
+    m_controlMargin = 0;
+    m_controlSizer = NULL;

 }
 
 bool
 }
 
 bool


@@ -144,6 +148,9 @@ wxSize wxBookCtrlBase::DoGetBestSize() const
         }
     }
 
         }
     }
 

+    if (m_fitToCurrentPage && GetCurrentPage())
+        bestSize = GetCurrentPage()->GetBestSize();
+

     // convert display area to window area, adding the size necessary for the
     // tabs
     wxSize best = CalcSizeFromPage(bestSize);
     // convert display area to window area, adding the size necessary for the
     // tabs
     wxSize best = CalcSizeFromPage(bestSize);


@@ -168,6 +175,9 @@ wxBookCtrlBase::InsertPage(size_t nPage,
                  _T("invalid page index in wxBookCtrlBase::InsertPage()") );
 
     m_pages.Insert(page, nPage);
                  _T("invalid page index in wxBookCtrlBase::InsertPage()") );
 
     m_pages.Insert(page, nPage);

+    if ( page )
+        page->SetSize(GetPageRect());
+

     InvalidateBestSize();
 
     return true;
     InvalidateBestSize();
 
     return true;


@@ -252,57 +262,76 @@ wxRect wxBookCtrlBase::GetPageRect() const
     return rectPage;
 }
 
     return rectPage;
 }
 

-void wxBookCtrlBase::OnSize(wxSizeEvent& event)
+// Lay out controls
+void wxBookCtrlBase::DoSize()

 {
 {

-    event.Skip();
-

     if ( !m_bookctrl )
     {
         // we're not fully created yet or OnSize() should be hidden by derived class
         return;
     }
 
     if ( !m_bookctrl )
     {
         // we're not fully created yet or OnSize() should be hidden by derived class
         return;
     }
 

-    // resize controller and the page area to fit inside our new size
-    const wxSize sizeClient( GetClientSize() ),
-                 sizeBorder( m_bookctrl->GetSize() - m_bookctrl->GetClientSize() ),
-                 sizeCtrl( GetControllerSize() );
-
-    m_bookctrl->SetClientSize( sizeCtrl.x - sizeBorder.x, sizeCtrl.y - sizeBorder.y );
-
-    const wxSize sizeNew = m_bookctrl->GetSize();
-    wxPoint posCtrl;
-    switch ( GetWindowStyle() & wxBK_ALIGN_MASK )
+    if (GetSizer())
+        Layout();
+    else

     {
     {

-        default:
-            wxFAIL_MSG( _T("unexpected alignment") );
-            // fall through
+        // resize controller and the page area to fit inside our new size
+        const wxSize sizeClient( GetClientSize() ),
+                    sizeBorder( m_bookctrl->GetSize() - m_bookctrl->GetClientSize() ),
+                    sizeCtrl( GetControllerSize() );

 
 

-        case wxBK_TOP:
-        case wxBK_LEFT:
-            // posCtrl is already ok
-            break;
+        m_bookctrl->SetClientSize( sizeCtrl.x - sizeBorder.x, sizeCtrl.y - sizeBorder.y );

 
 

-        case wxBK_BOTTOM:
-            posCtrl.y = sizeClient.y - sizeNew.y;
-            break;
+        const wxSize sizeNew = m_bookctrl->GetSize();
+        wxPoint posCtrl;
+        switch ( GetWindowStyle() & wxBK_ALIGN_MASK )
+        {
+            default:
+                wxFAIL_MSG( _T("unexpected alignment") );
+                // fall through
+
+            case wxBK_TOP:
+            case wxBK_LEFT:
+                // posCtrl is already ok
+                break;
+
+            case wxBK_BOTTOM:
+                posCtrl.y = sizeClient.y - sizeNew.y;
+                break;
+
+            case wxBK_RIGHT:
+                posCtrl.x = sizeClient.x - sizeNew.x;
+                break;
+        }

 
 

-        case wxBK_RIGHT:
-            posCtrl.x = sizeClient.x - sizeNew.x;
-            break;
+        if ( m_bookctrl->GetPosition() != posCtrl )
+            m_bookctrl->Move(posCtrl);

     }
 
     }
 

-    if ( m_bookctrl->GetPosition() != posCtrl )
-        m_bookctrl->Move(posCtrl);
-
-    // resize the currently shown page
-    if (GetSelection() != wxNOT_FOUND )
+    // resize all pages to fit the new control size
+    const wxRect pageRect = GetPageRect();
+    const unsigned pagesCount = m_pages.Count();
+    for ( unsigned int i = 0; i < pagesCount; ++i )

     {
     {

-        wxWindow *page = m_pages[GetSelection()];
-        wxCHECK_RET( page, _T("NULL page?") );
-        page->SetSize(GetPageRect());
+        wxWindow * const page = m_pages[i];
+        if ( !page )
+        {
+            wxASSERT_MSG( AllowNullPage(),
+                _T("Null page in a control that does not allow null pages?") );
+            continue;
+        }
+
+        page->SetSize(pageRect);

     }
 }
 
     }
 }
 

+void wxBookCtrlBase::OnSize(wxSizeEvent& event)
+{
+    event.Skip();
+
+    DoSize();
+}
+

 wxSize wxBookCtrlBase::GetControllerSize() const
 {
     if(!m_bookctrl)
 wxSize wxBookCtrlBase::GetControllerSize() const
 {
     if(!m_bookctrl)