Merged some STC fixes over to the main branch

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

diff --git a/src/os2/notebook.cpp b/src/os2/notebook.cpp
index 82ebe9a138deddfe5498c3dc8a5008a7d1d94f00..e528e4ab3ed072dd5b816bd4d458df465e2a8cb3 100644 (file)
--- a/src/os2/notebook.cpp
+++ b/src/os2/notebook.cpp
@@ -347,8 +347,11 @@ void wxNotebook::OnSize(wxSizeEvent& event)
     for ( unsigned int nPage = 0; nPage < nCount; nPage++ ) {
         wxNotebookPage *pPage = m_aPages[nPage];
         pPage->SetSize(0, 0, w, h);
     for ( unsigned int nPage = 0; nPage < nCount; nPage++ ) {
         wxNotebookPage *pPage = m_aPages[nPage];
         pPage->SetSize(0, 0, w, h);

+#if wxUSE_CONSTRAINTS

         if ( pPage->GetAutoLayout() )
             pPage->Layout();
         if ( pPage->GetAutoLayout() )
             pPage->Layout();

+#endif //wxUSE_CONSTRAINTS
+

     }
 
     // Processing continues to next OnSize
     }
 
     // Processing continues to next OnSize


@@ -410,8 +413,10 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
 
 void wxNotebook::SetConstraintSizes(bool /* recurse */)
 {
 
 void wxNotebook::SetConstraintSizes(bool /* recurse */)
 {

+#if wxUSE_CONSTRAINTS

     // don't set the sizes of the pages - their correct size is not yet known
     wxControl::SetConstraintSizes(FALSE);
     // don't set the sizes of the pages - their correct size is not yet known
     wxControl::SetConstraintSizes(FALSE);

+#endif

 }
 
 bool wxNotebook::DoPhase(int /* nPhase */)
 }
 
 bool wxNotebook::DoPhase(int /* nPhase */)