Fixed toolbar gaffe.

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

diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index 7800cc398f5e6c17e1ef2dffb17f78cfd3146071..74dfb4cd9d6b71aeae09bddb548daa3427c5b7b6 100644 (file)
--- a/src/msw/notebook.cpp
+++ b/src/msw/notebook.cpp
@@ -9,22 +9,15 @@
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
 #ifdef __GNUG__
-  #pragma implementation "notebook.h"
+#pragma implementation "notebook.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-  #pragma hdrstop
+#pragma hdrstop
 #endif
 
 // wxWindows
@@ -70,6 +63,7 @@
     EVT_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange)
 
     EVT_SIZE(wxNotebook::OnSize)
+    EVT_ERASE_BACKGROUND(wxNotebook::OnEraseBackground)
     EVT_SET_FOCUS(wxNotebook::OnSetFocus)
     EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey)
   END_EVENT_TABLE()
@@ -284,6 +278,18 @@ bool wxNotebook::DeletePage(int nPage)
   return TRUE;
 }
 
+// remove one page from the notebook, without deleting
+bool wxNotebook::RemovePage(int nPage)
+{
+  wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, "notebook page out of range" );
+
+  TabCtrl_DeleteItem(m_hwnd, nPage);
+
+  m_aPages.Remove(nPage);
+
+  return TRUE;
+}
+
 // remove all pages
 bool wxNotebook::DeleteAllPages()
 {
@@ -404,7 +410,7 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
     // pass to the parent
     if ( GetParent() ) {
       event.SetCurrentFocus(this);
-      GetParent()->ProcessEvent(event);
+      GetParent()->GetEventHandler()->ProcessEvent(event);
     }
   }
 }
@@ -431,7 +437,7 @@ void wxNotebook::Command(wxCommandEvent& event)
   wxFAIL_MSG("wxNotebook::Command not implemented");
 }
 
-bool wxNotebook::MSWNotify(WXWPARAM wParam, WXLPARAM lParam)
+bool wxNotebook::MSWNotify(WXWPARAM wParam, WXLPARAM lParam, WXLPARAM* result)
 {
   wxNotebookEvent event(wxEVT_NULL, m_windowId);
 
@@ -445,21 +451,18 @@ bool wxNotebook::MSWNotify(WXWPARAM wParam, WXLPARAM lParam)
       event.SetEventType(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING);
       break;
 
-      // prevent this msg from being passed to wxControl::MSWNotify which would
-      // retrun FALSE disabling the change of page
-    case UDN_DELTAPOS:
-      return TRUE;
-
-    default :
-      return wxControl::MSWNotify(wParam, lParam);
+    default:
+      return wxControl::MSWNotify(wParam, lParam, result);
   }
 
   event.SetSelection(TabCtrl_GetCurSel(m_hwnd));
   event.SetOldSelection(m_nSelection);
   event.SetEventObject(this);
-  event.SetInt(LOWORD(wParam));
+  event.SetInt(LOWORD(wParam)); // ctrl id
 
-  return ProcessEvent(event);
+  bool processed = GetEventHandler()->ProcessEvent(event);
+  *result = !event.IsAllowed();
+  return processed;
 }
 
 // ----------------------------------------------------------------------------
@@ -469,11 +472,32 @@ bool wxNotebook::MSWNotify(WXWPARAM wParam, WXLPARAM lParam)
 // hide the currently active panel and show the new one
 void wxNotebook::ChangePage(int nOldSel, int nSel)
 {
+  // MT-FIXME should use a real semaphore
+  static bool s_bInsideChangePage = FALSE;
+
+  // when we call ProcessEvent(), our own OnSelChange() is called which calls
+  // this function - break the infinite loop
+  if ( s_bInsideChangePage )
+    return;
+
   // it's not an error (the message may be generated by the tab control itself)
   // and it may happen - just do nothing
   if ( nSel == nOldSel )
     return;
 
+  s_bInsideChangePage = TRUE;
+
+  wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_windowId);
+  event.SetSelection(nSel);
+  event.SetOldSelection(nOldSel);
+  event.SetEventObject(this);
+  if ( ProcessEvent(event) && !event.IsAllowed() )
+  {
+    // program doesn't allow the page change
+    s_bInsideChangePage = FALSE;
+    return;
+  }
+
   if ( nOldSel != -1 )
     m_aPages[nOldSel]->Show(FALSE);
 
@@ -481,5 +505,15 @@ void wxNotebook::ChangePage(int nOldSel, int nSel)
   pPage->Show(TRUE);
   pPage->SetFocus();
 
+  event.SetEventType(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED);
+  ProcessEvent(event);
+
   m_nSelection = nSel;
+  s_bInsideChangePage = FALSE;
 }
+
+void wxNotebook::OnEraseBackground(wxEraseEvent& event)
+{
+    Default();
+}
+