Don't hardcode wxPreviewControlBar size in print preview code.

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

diff --git a/src/generic/notebook.cpp b/src/generic/notebook.cpp
index 8fd494e9e944de5de32c9a8e23a738602a4edeee..194f3ad628469c233b061ee3458e0eefd2cdeaa8 100644 (file)
--- a/src/generic/notebook.cpp
+++ b/src/generic/notebook.cpp
@@ -49,9 +49,6 @@
 // event table
 // ----------------------------------------------------------------------------
 
 // event table
 // ----------------------------------------------------------------------------
 

-DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)
-

 BEGIN_EVENT_TABLE(wxNotebook, wxBookCtrlBase)
     EVT_NOTEBOOK_PAGE_CHANGED(wxID_ANY, wxNotebook::OnSelChange)
     EVT_SIZE(wxNotebook::OnSize)
 BEGIN_EVENT_TABLE(wxNotebook, wxBookCtrlBase)
     EVT_NOTEBOOK_PAGE_CHANGED(wxID_ANY, wxNotebook::OnSelChange)
     EVT_SIZE(wxNotebook::OnSize)


@@ -105,7 +102,7 @@ private:
 
 static int GetPageId(wxTabView *tabview, wxNotebookPage *page)
 {
 
 static int GetPageId(wxTabView *tabview, wxNotebookPage *page)
 {

-    return wx_static_cast(wxNotebookTabView*, tabview)->GetId(page);
+    return static_cast<wxNotebookTabView*>(tabview)->GetId(page);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -115,8 +112,8 @@ static int GetPageId(wxTabView *tabview, wxNotebookPage *page)
 // common part of all ctors
 void wxNotebook::Init()
 {
 // common part of all ctors
 void wxNotebook::Init()
 {

-    m_tabView = (wxNotebookTabView*) NULL;
-    m_nSelection = -1;
+    m_tabView = NULL;
+    m_selection = -1;

 }
 
 // default for dynamic class
 }
 
 // default for dynamic class


@@ -277,10 +274,10 @@ bool wxNotebook::DeletePage(size_t nPage)
 {
     wxCHECK( IS_VALID_PAGE(nPage), false );
 
 {
     wxCHECK( IS_VALID_PAGE(nPage), false );
 

-    if (m_nSelection != -1)
+    if (m_selection != -1)

     {
     {

-        m_pages[m_nSelection]->Show(false);
-        m_pages[m_nSelection]->Lower();
+        m_pages[m_selection]->Show(false);
+        m_pages[m_selection]->Lower();

     }
 
     wxNotebookPage* pPage = GetPage(nPage);
     }
 
     wxNotebookPage* pPage = GetPage(nPage);


@@ -292,16 +289,16 @@ bool wxNotebook::DeletePage(size_t nPage)
 
     if (m_pages.GetCount() == 0)
     {
 
     if (m_pages.GetCount() == 0)
     {

-        m_nSelection = -1;
+        m_selection = -1;

         m_tabView->SetTabSelection(-1, false);
     }
         m_tabView->SetTabSelection(-1, false);
     }

-    else if (m_nSelection > -1)
+    else if (m_selection > -1)

     {
     {

-        m_nSelection = -1;
+        m_selection = -1;

 
         m_tabView->SetTabSelection(GetPageId(m_tabView, GetPage(0)), false);
 
 
         m_tabView->SetTabSelection(GetPageId(m_tabView, GetPage(0)), false);
 

-        if (m_nSelection != 0)
+        if (m_selection != 0)

             ChangePage(-1, 0);
     }
 
             ChangePage(-1, 0);
     }
 


@@ -340,16 +337,16 @@ wxWindow* wxNotebook::DoRemovePage(size_t nPage)
 
     if (m_pages.GetCount() == 0)
     {
 
     if (m_pages.GetCount() == 0)
     {

-      m_nSelection = -1;
+      m_selection = -1;

       m_tabView->SetTabSelection(-1, true);
     }
       m_tabView->SetTabSelection(-1, true);
     }

-    else if (m_nSelection > -1)
+    else if (m_selection > -1)

     {
       // Only change the selection if the page we
       // deleted was the selection.
     {
       // Only change the selection if the page we
       // deleted was the selection.

-      if (nPage == (size_t)m_nSelection)
+      if (nPage == (size_t)m_selection)

       {
       {

-         m_nSelection = -1;
+         m_selection = -1;

          // Select the first tab. Generates a ChangePage.
          m_tabView->SetTabSelection(0, true);
       }
          // Select the first tab. Generates a ChangePage.
          m_tabView->SetTabSelection(0, true);
       }


@@ -358,8 +355,8 @@ wxWindow* wxNotebook::DoRemovePage(size_t nPage)
         // We must adjust which tab we think is selected.
         // If greater than the page we deleted, it must be moved down
         // a notch.
         // We must adjust which tab we think is selected.
         // If greater than the page we deleted, it must be moved down
         // a notch.

-        if (size_t(m_nSelection) > nPage)
-          m_nSelection -- ;
+        if (size_t(m_selection) > nPage)
+          m_selection -- ;

       }
     }
 
       }
     }
 


@@ -430,7 +427,7 @@ bool wxNotebook::InsertPage(size_t nPage,
 
     // some page must be selected: either this one or the first one if there is
     // still no selection
 
     // some page must be selected: either this one or the first one if there is
     // still no selection

-    if ( m_nSelection == -1 )
+    if ( m_selection == -1 )

       ChangePage(-1, 0);
 
     RefreshLayout(false);
       ChangePage(-1, 0);
 
     RefreshLayout(false);


@@ -549,7 +546,7 @@ void wxNotebook::OnSelChange(wxBookCtrlEvent& event)
     // is it our tab control?
     if ( event.GetEventObject() == this )
     {
     // is it our tab control?
     if ( event.GetEventObject() == this )
     {

-        if (event.GetSelection() != m_nSelection)
+        if (event.GetSelection() != m_selection)

           ChangePage(event.GetOldSelection(), event.GetSelection());
     }
 
           ChangePage(event.GetOldSelection(), event.GetSelection());
     }
 


@@ -560,23 +557,25 @@ void wxNotebook::OnSelChange(wxBookCtrlEvent& event)
 void wxNotebook::OnSetFocus(wxFocusEvent& event)
 {
     // set focus to the currently selected page if any
 void wxNotebook::OnSetFocus(wxFocusEvent& event)
 {
     // set focus to the currently selected page if any

-    if ( m_nSelection != -1 )
-        m_pages[m_nSelection]->SetFocus();
+    if ( m_selection != -1 )
+        m_pages[m_selection]->SetFocus();

 
     event.Skip();
 }
 
 void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
 {
 
     event.Skip();
 }
 
 void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
 {

-    if ( event.IsWindowChange() ) {
+    if ( event.IsWindowChange() )
+    {

         // change pages
         AdvanceSelection(event.GetDirection());
     }
     else {
         // pass to the parent
         // change pages
         AdvanceSelection(event.GetDirection());
     }
     else {
         // pass to the parent

-        if ( GetParent() ) {
+        if ( GetParent() )
+        {

             event.SetCurrentFocus(this);
             event.SetCurrentFocus(this);

-            GetParent()->ProcessEvent(event);
+            GetParent()->ProcessWindowEvent(event);

         }
     }
 }
         }
     }
 }


@@ -629,7 +628,7 @@ void wxNotebook::ChangePage(int nOldSel, int nSel)
     pPage->Raise();
     pPage->SetFocus();
 
     pPage->Raise();
     pPage->SetFocus();
 

-    m_nSelection = nSel;
+    m_selection = nSel;

 }
 
 void wxNotebook::OnMouseEvent(wxMouseEvent& event)
 }
 
 void wxNotebook::OnMouseEvent(wxMouseEvent& event)