buttons now become default when they have focus

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

diff --git a/src/generic/notebook.cpp b/src/generic/notebook.cpp
index 3be3cd9634d6801cbc5d89f3515e80e0f0d99bd0..3b18a3ce2ac41181f955e6525211b3567787bee6 100644 (file)
--- a/src/generic/notebook.cpp
+++ b/src/generic/notebook.cpp
@@ -31,7 +31,7 @@
 #include  <wx/log.h>
 #include  <wx/settings.h>
 #include  <wx/generic/imaglist.h>
 #include  <wx/log.h>
 #include  <wx/settings.h>
 #include  <wx/generic/imaglist.h>

-#include  <wx/generic/notebook.h>
+#include  <wx/notebook.h>

 #include  <wx/dcclient.h>
 
 // ----------------------------------------------------------------------------
 #include  <wx/dcclient.h>
 
 // ----------------------------------------------------------------------------


@@ -146,10 +146,13 @@ int wxNotebook::SetSelection(int nPage)
 
     wxASSERT( IS_VALID_PAGE(nPage) );
 
 
     wxASSERT( IS_VALID_PAGE(nPage) );
 

+#if defined (__WIN16__)
+    m_tabView->SetTabSelection(nPage);
+#else

     wxNotebookPage* pPage = GetPage(nPage);
 
     m_tabView->SetTabSelection((int) (long) pPage);
     wxNotebookPage* pPage = GetPage(nPage);
 
     m_tabView->SetTabSelection((int) (long) pPage);

-
+#endif

     // TODO
     return 0;
 }
     // TODO
     return 0;
 }


@@ -167,7 +170,11 @@ void wxNotebook::AdvanceSelection(bool bForward)
 bool wxNotebook::SetPageText(int nPage, const wxString& strText)
 {
     wxASSERT( IS_VALID_PAGE(nPage) );
 bool wxNotebook::SetPageText(int nPage, const wxString& strText)
 {
     wxASSERT( IS_VALID_PAGE(nPage) );

-
+#if defined (__WIN16__)
+       m_tabView->SetTabText(nPage, strText);
+    Refresh();
+    return TRUE;
+#else

     wxNotebookPage* page = GetPage(nPage);
     if (page)
     {
     wxNotebookPage* page = GetPage(nPage);
     if (page)
     {


@@ -175,7 +182,7 @@ bool wxNotebook::SetPageText(int nPage, const wxString& strText)
         Refresh();
         return TRUE;
     }
         Refresh();
         return TRUE;
     }

-
+#endif

     return FALSE;
 }
 
     return FALSE;
 }
 


@@ -183,11 +190,15 @@ wxString wxNotebook::GetPageText(int nPage) const
 {
     wxASSERT( IS_VALID_PAGE(nPage) );
 
 {
     wxASSERT( IS_VALID_PAGE(nPage) );
 

+#if defined (__WIN16__)
+    return m_tabView->GetTabText(nPage);
+#else

     wxNotebookPage* page = ((wxNotebook*)this)->GetPage(nPage);
     if (page)
         return m_tabView->GetTabText((int) (long) page);
     else
         return wxEmptyString;
     wxNotebookPage* page = ((wxNotebook*)this)->GetPage(nPage);
     if (page)
         return m_tabView->GetTabText((int) (long) page);
     else
         return wxEmptyString;

+#endif

 }
 
 int wxNotebook::GetPageImage(int nPage) const
 }
 
 int wxNotebook::GetPageImage(int nPage) const


@@ -228,7 +239,11 @@ bool wxNotebook::DeletePage(int nPage)
     }
 
     wxNotebookPage* pPage = GetPage(nPage);
     }
 
     wxNotebookPage* pPage = GetPage(nPage);

+#if defined (__WIN16__)
+    m_tabView->RemoveTab(nPage);
+#else

     m_tabView->RemoveTab((int) (long) pPage);
     m_tabView->RemoveTab((int) (long) pPage);

+#endif

 
     delete m_aPages[nPage];
     m_aPages.Remove(nPage);
 
     delete m_aPages[nPage];
     m_aPages.Remove(nPage);


@@ -241,7 +256,11 @@ bool wxNotebook::DeletePage(int nPage)
     else if (m_nSelection > -1)
     {
       m_nSelection = -1;
     else if (m_nSelection > -1)
     {
       m_nSelection = -1;

+#if defined (__WIN16__)
+      m_tabView->SetTabSelection(0, FALSE);
+#else

       m_tabView->SetTabSelection((int) (long) GetPage(0), FALSE);
       m_tabView->SetTabSelection((int) (long) GetPage(0), FALSE);

+#endif

       if (m_nSelection != 0)
         ChangePage(-1, 0);
     }
       if (m_nSelection != 0)
         ChangePage(-1, 0);
     }


@@ -269,7 +288,11 @@ bool wxNotebook::RemovePage(int nPage)
     //    m_aPages[nPage]->Lower();
 
     wxNotebookPage* pPage = GetPage(nPage);
     //    m_aPages[nPage]->Lower();
 
     wxNotebookPage* pPage = GetPage(nPage);

+#if defined (__WIN16__)
+    m_tabView->RemoveTab(nPage);
+#else

     m_tabView->RemoveTab((int) (long) pPage);
     m_tabView->RemoveTab((int) (long) pPage);

+#endif

 
     m_aPages.Remove(nPage);
 
 
     m_aPages.Remove(nPage);
 


@@ -357,7 +380,12 @@ bool wxNotebook::InsertPage(int nPage,
     wxASSERT( pPage != NULL );
     wxCHECK( IS_VALID_PAGE(nPage) || nPage == GetPageCount(), FALSE );
 
     wxASSERT( pPage != NULL );
     wxCHECK( IS_VALID_PAGE(nPage) || nPage == GetPageCount(), FALSE );
 

+// For 16 bit integers (tabs limited to 32768)
+#if defined (__WIN16__)
+    m_tabView->AddTab(nPage, strText);
+#else

     m_tabView->AddTab((int) (long) pPage, strText);
     m_tabView->AddTab((int) (long) pPage, strText);

+#endif

     if (!bSelect)
       pPage->Show(FALSE);
 
     if (!bSelect)
       pPage->Show(FALSE);
 


@@ -367,7 +395,11 @@ bool wxNotebook::InsertPage(int nPage,
     if (bSelect)
     {
         // This will cause ChangePage to be called, via OnSelPage
     if (bSelect)
     {
         // This will cause ChangePage to be called, via OnSelPage

+#if defined (__WIN16__)
+        m_tabView->SetTabSelection(nPage, TRUE);
+#else

         m_tabView->SetTabSelection((int) (long) pPage, TRUE);
         m_tabView->SetTabSelection((int) (long) pPage, TRUE);

+#endif

     }
 
     // some page must be selected: either this one or the first one if there is
     }
 
     // some page must be selected: either this one or the first one if there is


@@ -447,7 +479,7 @@ bool wxNotebook::RefreshLayout(bool force)
   
         m_tabView->SetViewRect(rect);
 
   
         m_tabView->SetViewRect(rect);
 

-        m_tabView->Layout();
+        m_tabView->LayoutTabs();

 
         // Need to do it a 2nd time to get the tab height with
         // the new view width, since changing the view width changes the
 
         // Need to do it a 2nd time to get the tab height with
         // the new view width, since changing the view width changes the


@@ -460,7 +492,7 @@ bool wxNotebook::RefreshLayout(bool force)
   
         m_tabView->SetViewRect(rect);
 
   
         m_tabView->SetViewRect(rect);
 

-        m_tabView->Layout();
+        m_tabView->LayoutTabs();

 
         if (!force && (rect == oldRect))
           return FALSE;
 
         if (!force && (rect == oldRect))
           return FALSE;


@@ -633,6 +665,10 @@ void wxNotebookTabView::OnTabActivate(int activateId, int deactivateId)
   wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, m_notebook->GetId());
 #endif
 
   wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, m_notebook->GetId());
 #endif
 

+#if defined (__WIN16__)
+  int activatePos = activateId;
+  int deactivatePos = deactivateId;
+#else

   // Translate from wxTabView's ids (which aren't position-dependent)
   // to wxNotebook's (which are).
   wxNotebookPage* pActive = (wxNotebookPage*) activateId;
   // Translate from wxTabView's ids (which aren't position-dependent)
   // to wxNotebook's (which are).
   wxNotebookPage* pActive = (wxNotebookPage*) activateId;


@@ -641,6 +677,7 @@ void wxNotebookTabView::OnTabActivate(int activateId, int deactivateId)
   int activatePos = m_notebook->FindPagePosition(pActive);
   int deactivatePos = m_notebook->FindPagePosition(pDeactive);
 
   int activatePos = m_notebook->FindPagePosition(pActive);
   int deactivatePos = m_notebook->FindPagePosition(pDeactive);
 

+#endif

   event.SetEventObject(m_notebook);
   event.SetSelection(activatePos);
   event.SetOldSelection(deactivatePos);
   event.SetEventObject(m_notebook);
   event.SetSelection(activatePos);
   event.SetOldSelection(deactivatePos);