replaced wxYield() call in PopupMenu() by a much safer wxYieldForCommandsOnly() ...

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

diff --git a/src/os2/notebook.cpp b/src/os2/notebook.cpp
index 82ebe9a138deddfe5498c3dc8a5008a7d1d94f00..efb99e30e452d1fbd8f0c80fba06a963424dc6a9 100644 (file)
--- a/src/os2/notebook.cpp
+++ b/src/os2/notebook.cpp
@@ -56,15 +56,18 @@
 // event table
 // ----------------------------------------------------------------------------
 
-  BEGIN_EVENT_TABLE(wxNotebook, wxControl)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)
+
+BEGIN_EVENT_TABLE(wxNotebook, wxControl)
     EVT_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange)
     EVT_SIZE(wxNotebook::OnSize)
     EVT_SET_FOCUS(wxNotebook::OnSetFocus)
     EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey)
-  END_EVENT_TABLE()
+END_EVENT_TABLE()
 
-  IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl)
-  IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxNotifyEvent)
+IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxNotifyEvent)
 
 // ============================================================================
 // implementation
@@ -347,8 +350,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);
+#if wxUSE_CONSTRAINTS
         if ( pPage->GetAutoLayout() )
             pPage->Layout();
+#endif //wxUSE_CONSTRAINTS
+
     }
 
     // Processing continues to next OnSize
@@ -410,8 +416,10 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
 
 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);
+#endif
 }
 
 bool wxNotebook::DoPhase(int /* nPhase */)