Restore previous ogl sources. Waiting for fix in configure system

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

diff --git a/src/generic/notebook.cpp b/src/generic/notebook.cpp
index 90782f45457acf2afbdbef48298007c9054ae4bc..926f404c0e853b095ca4961997a1e5442c69b3f5 100644 (file)
--- a/src/generic/notebook.cpp
+++ b/src/generic/notebook.cpp
@@ -27,12 +27,12 @@
 #pragma hdrstop
 #endif
 
-#include  <wx/string.h>
-#include  <wx/log.h>
-#include  <wx/settings.h>
-#include  <wx/generic/imaglist.h>
-#include  <wx/generic/notebook.h>
-#include  <wx/dcclient.h>
+#include  "wx/string.h"
+#include  "wx/log.h"
+#include  "wx/settings.h"
+#include  "wx/generic/imaglist.h"
+#include  "wx/notebook.h"
+#include  "wx/dcclient.h"
 
 // ----------------------------------------------------------------------------
 // macros
@@ -45,7 +45,6 @@
 // event table
 // ----------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARIES
 BEGIN_EVENT_TABLE(wxNotebook, wxControl)
     EVT_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange)
     EVT_SIZE(wxNotebook::OnSize)
@@ -58,7 +57,6 @@ END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent)
-#endif
 
 // ============================================================================
 // implementation
@@ -146,10 +144,13 @@ int wxNotebook::SetSelection(int nPage)
 
     wxASSERT( IS_VALID_PAGE(nPage) );
 
+#if defined (__WIN16__)
+    m_tabView->SetTabSelection(nPage);
+#else
     wxNotebookPage* pPage = GetPage(nPage);
 
     m_tabView->SetTabSelection((int) (long) pPage);
-
+#endif
     // TODO
     return 0;
 }
@@ -167,7 +168,11 @@ void wxNotebook::AdvanceSelection(bool bForward)
 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)
     {
@@ -175,7 +180,7 @@ bool wxNotebook::SetPageText(int nPage, const wxString& strText)
         Refresh();
         return TRUE;
     }
-
+#endif
     return FALSE;
 }
 
@@ -183,11 +188,15 @@ wxString wxNotebook::GetPageText(int nPage) const
 {
     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;
+#endif
 }
 
 int wxNotebook::GetPageImage(int nPage) const
@@ -228,7 +237,11 @@ bool wxNotebook::DeletePage(int nPage)
     }
 
     wxNotebookPage* pPage = GetPage(nPage);
+#if defined (__WIN16__)
+    m_tabView->RemoveTab(nPage);
+#else
     m_tabView->RemoveTab((int) (long) pPage);
+#endif
 
     delete m_aPages[nPage];
     m_aPages.Remove(nPage);
@@ -241,7 +254,11 @@ bool wxNotebook::DeletePage(int nPage)
     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);
+#endif
       if (m_nSelection != 0)
         ChangePage(-1, 0);
     }
@@ -269,7 +286,11 @@ bool wxNotebook::RemovePage(int nPage)
     //    m_aPages[nPage]->Lower();
 
     wxNotebookPage* pPage = GetPage(nPage);
+#if defined (__WIN16__)
+    m_tabView->RemoveTab(nPage);
+#else
     m_tabView->RemoveTab((int) (long) pPage);
+#endif
 
     m_aPages.Remove(nPage);
 
@@ -357,7 +378,12 @@ bool wxNotebook::InsertPage(int nPage,
     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);
+#endif
     if (!bSelect)
       pPage->Show(FALSE);
 
@@ -367,7 +393,11 @@ bool wxNotebook::InsertPage(int nPage,
     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);
+#endif
     }
 
     // some page must be selected: either this one or the first one if there is
@@ -447,7 +477,7 @@ bool wxNotebook::RefreshLayout(bool force)
   
         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
@@ -460,7 +490,7 @@ bool wxNotebook::RefreshLayout(bool force)
   
         m_tabView->SetViewRect(rect);
 
-        m_tabView->Layout();
+        m_tabView->LayoutTabs();
 
         if (!force && (rect == oldRect))
           return FALSE;
@@ -537,7 +567,7 @@ bool wxNotebook::DoPhase(int /* nPhase */)
     return TRUE;
 }
 
-void wxNotebook::Command(wxCommandEvent& event)
+void wxNotebook::Command(wxCommandEvent& WXUNUSED(event))
 {
     wxFAIL_MSG("wxNotebook::Command not implemented");
 }
@@ -601,11 +631,6 @@ wxRect wxNotebook::GetAvailableClientSize()
     return rect;
 }
 
-void wxNotebook::SetTabSize(const wxSize& sz)
-{
-    // TODO
-}
-
 /*
  * wxNotebookTabView
  */
@@ -638,6 +663,10 @@ void wxNotebookTabView::OnTabActivate(int activateId, int deactivateId)
   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;
@@ -646,6 +675,7 @@ void wxNotebookTabView::OnTabActivate(int activateId, int deactivateId)
   int activatePos = m_notebook->FindPagePosition(pActive);
   int deactivatePos = m_notebook->FindPagePosition(pDeactive);
 
+#endif
   event.SetEventObject(m_notebook);
   event.SetSelection(activatePos);
   event.SetOldSelection(deactivatePos);