changed Refresh to take Rect as client coordinates not window coordinates

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

diff --git a/src/generic/notebook.cpp b/src/generic/notebook.cpp
index 97019ea950f3b8153a30bdee18dab1de62b23d1c..439675439919cbe4003ec9e0c30e507ef9d59518 100644 (file)
--- a/src/generic/notebook.cpp
+++ b/src/generic/notebook.cpp
@@ -45,6 +45,9 @@
 // event table
 // ----------------------------------------------------------------------------
 
 // event table
 // ----------------------------------------------------------------------------
 

+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)
 BEGIN_EVENT_TABLE(wxNotebook, wxControl)
     EVT_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange)
     EVT_SIZE(wxNotebook::OnSize)


@@ -216,7 +219,7 @@ bool wxNotebook::SetPageImage(int nPage, int nImage)
 }
 
 void wxNotebook::SetImageList(wxImageList* imageList)
 }
 
 void wxNotebook::SetImageList(wxImageList* imageList)

-{ 
+{

     m_pImageList = imageList;
     // TODO
 }
     m_pImageList = imageList;
     // TODO
 }


@@ -474,7 +477,7 @@ bool wxNotebook::RefreshLayout(bool force)
         rect.y = tabHeight + 4;
         rect.width = cw - 8;
         rect.height = ch - 4 - rect.y ;
         rect.y = tabHeight + 4;
         rect.width = cw - 8;
         rect.height = ch - 4 - rect.y ;

-  
+

         m_tabView->SetViewRect(rect);
 
         m_tabView->LayoutTabs();
         m_tabView->SetViewRect(rect);
 
         m_tabView->LayoutTabs();


@@ -487,7 +490,7 @@ bool wxNotebook::RefreshLayout(bool force)
         rect.y = tabHeight + 4;
         rect.width = cw - 8;
         rect.height = ch - 4 - rect.y ;
         rect.y = tabHeight + 4;
         rect.width = cw - 8;
         rect.height = ch - 4 - rect.y ;

-  
+

         m_tabView->SetViewRect(rect);
 
         m_tabView->LayoutTabs();
         m_tabView->SetViewRect(rect);
 
         m_tabView->LayoutTabs();


@@ -634,7 +637,7 @@ wxRect wxNotebook::GetAvailableClientSize()
 /*
  * wxNotebookTabView
  */
 /*
  * wxNotebookTabView
  */

- 
+

 IMPLEMENT_CLASS(wxNotebookTabView, wxTabView)
 
 wxNotebookTabView::wxNotebookTabView(wxNotebook *notebook, long style): wxTabView(style)
 IMPLEMENT_CLASS(wxNotebookTabView, wxTabView)
 
 wxNotebookTabView::wxNotebookTabView(wxNotebook *notebook, long style): wxTabView(style)


@@ -656,12 +659,7 @@ void wxNotebookTabView::OnTabActivate(int activateId, int deactivateId)
   if (!m_notebook)
     return;
 
   if (!m_notebook)
     return;
 

-// Because of name truncation!
-#if defined(__BORLANDC__) && defined(__WIN16__)
-  wxNotebookEvent event(wxEVT_COMMAND_NB_PAGE_CHANGED, m_notebook->GetId());
-#else

   wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, m_notebook->GetId());
   wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, m_notebook->GetId());

-#endif

 
 #if defined (__WIN16__)
   int activatePos = activateId;
 
 #if defined (__WIN16__)
   int activatePos = activateId;