setting clipping correctly

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

diff --git a/src/univ/notebook.cpp b/src/univ/notebook.cpp
index 7a72aaf22ec8967032253878c83bc7a954a697ed..ebe2c8bb583db6278a2b54759df17e616df62727 100644 (file)
--- a/src/univ/notebook.cpp
+++ b/src/univ/notebook.cpp
@@ -233,7 +233,7 @@ wxNotebook::~wxNotebook()
 // wxNotebook page switching
 // ----------------------------------------------------------------------------
 
 // wxNotebook page switching
 // ----------------------------------------------------------------------------
 

-int wxNotebook::DoSetSelection(size_t nPage, int flags = 0)
+int wxNotebook::DoSetSelection(size_t nPage, int flags)

 {
     wxCHECK_MSG( IS_VALID_PAGE(nPage), wxNOT_FOUND, _T("invalid notebook page") );
 
 {
     wxCHECK_MSG( IS_VALID_PAGE(nPage), wxNOT_FOUND, _T("invalid notebook page") );
 


@@ -243,14 +243,9 @@ int wxNotebook::DoSetSelection(size_t nPage, int flags = 0)
         return m_sel;
     }
 
         return m_sel;
     }
 

-    wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_windowId);
-    if (flags & SetSelection_SendEvent)
+    if ( flags & SetSelection_SendEvent )

     {
     {

-        // event handling
-        event.SetSelection(nPage);
-        event.SetOldSelection(m_sel);
-        event.SetEventObject(this);
-        if ( GetEventHandler()->ProcessEvent(event) && !event.IsAllowed() )
+        if ( !SendPageChangingEvent(nPage) )

         {
             // program doesn't allow the page change
             return m_sel;
         {
             // program doesn't allow the page change
             return m_sel;


@@ -300,11 +295,10 @@ int wxNotebook::DoSetSelection(size_t nPage, int flags = 0)
         m_pages[m_sel]->Show();
     }
 
         m_pages[m_sel]->Show();
     }
 

-    if (flags & SetSelection_SendEvent)
+    if ( flags & SetSelection_SendEvent )

     {
         // event handling
     {
         // event handling

-        event.SetEventType(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED);
-        GetEventHandler()->ProcessEvent(event);
+        SendPageChangedEvent(selOld);

     }
 
     return selOld;
     }
 
     return selOld;