Fix typo in last commit

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

diff --git a/src/generic/tabg.cpp b/src/generic/tabg.cpp
index 24fb5c5f1c1c2b8652307ee3a00bfb86cf402b51..2ce29fd0492a5056a240ed34e5f4334f94bc1c2d 100644 (file)
--- a/src/generic/tabg.cpp
+++ b/src/generic/tabg.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        tabg.cpp
-// Purpose:     Generic tabbed dialogs
+// Name:        src/generic/tabg.cpp
+// Purpose:     Generic tabbed dialogs; used by wxMotif's wxNotebook

 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97


@@ -9,27 +9,28 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "tabg.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx/wx.h"
+    #include "wx/settings.h"
+    #include "wx/intl.h"
+    #include "wx/dcclient.h"
+    #include "wx/math.h"

 #endif
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #endif
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>

-#include <math.h>

 
 

-#include "wx/tab.h"
+#include "wx/generic/tabg.h"
+#include "wx/listimpl.cpp"
+
+WX_DEFINE_LIST(wxTabLayerList)

 
 // not defined: use old, square tab implementation (fills in tabs)
 // defined: use new, rounded tab implementation (doesn't colour in tabs)
 
 // not defined: use old, square tab implementation (fills in tabs)
 // defined: use new, rounded tab implementation (doesn't colour in tabs)


@@ -37,12 +38,12 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxTabControl, wxObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxTabControl, wxObject)
 

-IMPLEMENT_DYNAMIC_CLASS(wxTabLayer, wxList)
+// IMPLEMENT_DYNAMIC_CLASS(wxTabLayer, wxList)

 
 wxTabControl::wxTabControl(wxTabView *v)
 {
   m_view = v;
 
 wxTabControl::wxTabControl(wxTabView *v)
 {
   m_view = v;

-  m_isSelected = FALSE;
+  m_isSelected = false;

   m_offsetX = 0;
   m_offsetY = 0;
   m_width = 0;
   m_offsetX = 0;
   m_offsetY = 0;
   m_width = 0;


@@ -82,7 +83,8 @@ void wxTabControl::OnDraw(wxDC& dc, bool lastInRow)
   // Draw grey background
   if (m_view->GetTabStyle() & wxTAB_STYLE_COLOUR_INTERIOR)
   {
   // Draw grey background
   if (m_view->GetTabStyle() & wxTAB_STYLE_COLOUR_INTERIOR)
   {

-    dc.SetBrush(*m_view->GetBackgroundBrush());
+    if(m_view->GetBackgroundBrush())
+      dc.SetBrush(*m_view->GetBackgroundBrush());

 
     // Add 1 because the pen is transparent. Under Motif, may be different.
 #ifdef __WXMOTIF__
 
     // Add 1 because the pen is transparent. Under Motif, may be different.
 #ifdef __WXMOTIF__


@@ -149,7 +151,7 @@ void wxTabControl::OnDraw(wxDC& dc, bool lastInRow)
 
       int topY = m_view->GetViewRect().y - m_view->GetTopMargin();
 
 
       int topY = m_view->GetViewRect().y - m_view->GetTopMargin();
 

-      int maxPositions = ((wxTabLayer *)m_view->GetLayers().Nth(0)->Data())->Number();
+      int maxPositions = ((wxTabLayer *)m_view->GetLayers().Item(0)->GetData())->GetCount();

 
       // Only down to the bottom of the tab, not to the top of the view
       if ( GetRowPosition() < (maxPositions - 1) )
 
       // Only down to the bottom of the tab, not to the top of the view
       if ( GetRowPosition() < (maxPositions - 1) )


@@ -203,7 +205,7 @@ void wxTabControl::OnDraw(wxDC& dc, bool lastInRow)
   wxColour col(m_view->GetTextColour());
   dc.SetTextForeground(col);
   dc.SetBackgroundMode(wxTRANSPARENT);
   wxColour col(m_view->GetTextColour());
   dc.SetTextForeground(col);
   dc.SetBackgroundMode(wxTRANSPARENT);

-  long textWidth, textHeight;
+  wxCoord textWidth, textHeight;

   dc.GetTextExtent(GetLabel(), &textWidth, &textHeight);
 
   int textX = (int)(tabX + (GetWidth() - textWidth)/2.0);
   dc.GetTextExtent(GetLabel(), &textWidth, &textHeight);
 
   int textX = (int)(tabX + (GetWidth() - textWidth)/2.0);


@@ -333,7 +335,7 @@ void wxTabControl::OnDraw(wxDC& dc, bool lastInRow)
         // TAB is not selected - just draw TAB outline and RH edge
         // if the TAB is the last in the row
 
         // TAB is not selected - just draw TAB outline and RH edge
         // if the TAB is the last in the row
 

-        int maxPositions = ((wxTabLayer*)m_view->GetLayers().Nth(0)->Data())->Number();
+        int maxPositions = ((wxTabLayer*)m_view->GetLayers().Item(0)->GetData())->GetCount();

         wxTabControl* tabBelow = 0;
         wxTabControl* tabBelowRight = 0;
         if (GetColPosition() > 0)
         wxTabControl* tabBelow = 0;
         wxTabControl* tabBelowRight = 0;
         if (GetColPosition() > 0)


@@ -495,9 +497,9 @@ bool wxTabControl::HitTest(int x, int y) const
   int tabY2 = tabY1 + GetHeight();
 
   if (x >= tabX1 && y >= tabY1 && x <= tabX2 && y <= tabY2)
   int tabY2 = tabY1 + GetHeight();
 
   if (x >= tabX1 && y >= tabY1 && x <= tabX2 && y <= tabY2)

-    return TRUE;
+    return true;

   else
   else

-    return FALSE;
+    return false;

 }
 
 IMPLEMENT_DYNAMIC_CLASS(wxTabView, wxObject)
 }
 
 IMPLEMENT_DYNAMIC_CLASS(wxTabView, wxObject)


@@ -520,20 +522,19 @@ wxTabView::wxTabView(long style)
   m_tabViewRect.x = 300;
   m_highlightColour = *wxWHITE;
   m_shadowColour = wxColour(128, 128, 128);
   m_tabViewRect.x = 300;
   m_highlightColour = *wxWHITE;
   m_shadowColour = wxColour(128, 128, 128);

-  m_backgroundColour = *wxLIGHT_GREY;
+  // m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE);

   m_textColour = *wxBLACK;
   m_highlightPen = wxWHITE_PEN;
   m_shadowPen = wxGREY_PEN;
   m_textColour = *wxBLACK;
   m_highlightPen = wxWHITE_PEN;
   m_shadowPen = wxGREY_PEN;

-  m_backgroundPen = wxLIGHT_GREY_PEN;
-  m_backgroundBrush = wxLIGHT_GREY_BRUSH;
-  m_tabFont = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
-  m_tabSelectedFont = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
-  m_window = (wxWindow *) NULL;
+  // SetBackgroundColour(m_backgroundColour);
+  m_tabFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
+  m_tabSelectedFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
+  m_window = NULL;

 }
 
 wxTabView::~wxTabView()
 {
 }
 
 wxTabView::~wxTabView()
 {

-  ClearTabs(TRUE);
+  ClearTabs(true);

 }
 
 // Automatically positions tabs
 }
 
 // Automatically positions tabs


@@ -543,7 +544,7 @@ wxTabView::~wxTabView()
 wxTabControl *wxTabView::AddTab(int id, const wxString& label, wxTabControl *existingTab)
 {
   // First, find which layer we should be adding to.
 wxTabControl *wxTabView::AddTab(int id, const wxString& label, wxTabControl *existingTab)
 {
   // First, find which layer we should be adding to.

-  wxNode *node = m_layers.Last();
+  wxTabLayerList::compatibility_iterator node = m_layers.GetLast();

   if (!node)
   {
     wxTabLayer *newLayer = new wxTabLayer;
   if (!node)
   {
     wxTabLayer *newLayer = new wxTabLayer;


@@ -551,36 +552,36 @@ wxTabControl *wxTabView::AddTab(int id, const wxString& label, wxTabControl *exi
   }
   // Check if adding another tab control would go off the
   // right-hand edge of the layer.
   }
   // Check if adding another tab control would go off the
   // right-hand edge of the layer.

-  wxTabLayer *tabLayer = (wxTabLayer *)node->Data();
-  wxNode *lastTabNode = tabLayer->Last();
+  wxTabLayer *tabLayer = (wxTabLayer *)node->GetData();
+  wxList::compatibility_iterator lastTabNode = tabLayer->GetLast();

   if (lastTabNode)
   {
   if (lastTabNode)
   {

-    wxTabControl *lastTab = (wxTabControl *)lastTabNode->Data();
+    wxTabControl *lastTab = (wxTabControl *)lastTabNode->GetData();

     // Start another layer (row).
     // Tricky choice: can't just check if will be overlapping the edge, because
     // this happens anyway for 2nd and subsequent rows.
     // Should check this for 1st row, and then subsequent rows should not exceed 1st
     // in length.
     // Start another layer (row).
     // Tricky choice: can't just check if will be overlapping the edge, because
     // this happens anyway for 2nd and subsequent rows.
     // Should check this for 1st row, and then subsequent rows should not exceed 1st
     // in length.

-    if (((tabLayer == m_layers.First()->Data()) && ((lastTab->GetX() + 2*lastTab->GetWidth() + GetHorizontalTabSpacing())
+    if (((tabLayer == m_layers.GetFirst()->GetData()) && ((lastTab->GetX() + 2*lastTab->GetWidth() + GetHorizontalTabSpacing())

               > GetViewRect().width)) ||
               > GetViewRect().width)) ||

-        ((tabLayer != m_layers.First()->Data()) && (tabLayer->Number() == ((wxTabLayer *)m_layers.First()->Data())->Number())))
+        ((tabLayer != m_layers.GetFirst()->GetData()) && (tabLayer->GetCount() == ((wxTabLayer *)m_layers.GetFirst()->GetData())->GetCount())))

     {
       tabLayer = new wxTabLayer;
       m_layers.Append(tabLayer);
     {
       tabLayer = new wxTabLayer;
       m_layers.Append(tabLayer);

-      lastTabNode = (wxNode *) NULL;
+      lastTabNode = wxList::compatibility_iterator();

     }
   }
     }
   }

-  int layer = m_layers.Number() - 1;
+  int layer = m_layers.GetCount() - 1;

 
   wxTabControl *tabControl = existingTab;
   if (!existingTab)
     tabControl = OnCreateTabControl();
 
   wxTabControl *tabControl = existingTab;
   if (!existingTab)
     tabControl = OnCreateTabControl();

-  tabControl->SetRowPosition(tabLayer->Number());
+  tabControl->SetRowPosition(tabLayer->GetCount());

   tabControl->SetColPosition(layer);
 
   tabControl->SetColPosition(layer);
 

-  wxTabControl *lastTab = (wxTabControl *) NULL;
+  wxTabControl *lastTab = NULL;

   if (lastTabNode)
   if (lastTabNode)

-    lastTab = (wxTabControl *)lastTabNode->Data();
+    lastTab = (wxTabControl *)lastTabNode->GetData();

 
   // Top of new tab
   int verticalOffset = (- GetTopMargin()) - ((layer+1)*GetTabHeight());
 
   // Top of new tab
   int verticalOffset = (- GetTopMargin()) - ((layer+1)*GetTabHeight());


@@ -606,40 +607,40 @@ wxTabControl *wxTabView::AddTab(int id, const wxString& label, wxTabControl *exi
 // Remove the tab without deleting the window
 bool wxTabView::RemoveTab(int id)
 {
 // Remove the tab without deleting the window
 bool wxTabView::RemoveTab(int id)
 {

-  wxNode *layerNode = m_layers.First();
+  wxTabLayerList::compatibility_iterator layerNode = m_layers.GetFirst();

   while (layerNode)
   {
   while (layerNode)
   {

-    wxTabLayer *layer = (wxTabLayer *)layerNode->Data();
-    wxNode *tabNode = layer->First();
+    wxTabLayer *layer = (wxTabLayer *)layerNode->GetData();
+    wxList::compatibility_iterator tabNode = layer->GetFirst();

     while (tabNode)
     {
     while (tabNode)
     {

-      wxTabControl *tab = (wxTabControl *)tabNode->Data();
+      wxTabControl *tab = (wxTabControl *)tabNode->GetData();

       if (tab->GetId() == id)
       {
         if (id == m_tabSelection)
           m_tabSelection = -1;
         delete tab;
       if (tab->GetId() == id)
       {
         if (id == m_tabSelection)
           m_tabSelection = -1;
         delete tab;

-        delete tabNode;
+        layer->Erase(tabNode);

         m_noTabs --;
 
         // The layout has changed
         LayoutTabs();
         m_noTabs --;
 
         // The layout has changed
         LayoutTabs();

-        return TRUE;
+        return true;

       }
       }

-      tabNode = tabNode->Next();
+      tabNode = tabNode->GetNext();

     }
     }

-    layerNode = layerNode->Next();
+    layerNode = layerNode->GetNext();

   }
   }

-  return FALSE;
+  return false;

 }
 
 bool wxTabView::SetTabText(int id, const wxString& label)
 {
     wxTabControl* control = FindTabControlForId(id);
     if (!control)
 }
 
 bool wxTabView::SetTabText(int id, const wxString& label)
 {
     wxTabControl* control = FindTabControlForId(id);
     if (!control)

-      return FALSE;
+      return false;

     control->SetLabel(label);
     control->SetLabel(label);

-    return TRUE;
+    return true;

 }
 
 wxString wxTabView::GetTabText(int id) const
 }
 
 wxString wxTabView::GetTabText(int id) const


@@ -657,21 +658,21 @@ int wxTabView::GetTotalTabHeight()
 {
   int minY = 0;
 
 {
   int minY = 0;
 

-  wxNode *layerNode = m_layers.First();
+  wxTabLayerList::compatibility_iterator layerNode = m_layers.GetFirst();

   while (layerNode)
   {
   while (layerNode)
   {

-    wxTabLayer *layer = (wxTabLayer *)layerNode->Data();
-    wxNode *tabNode = layer->First();
+    wxTabLayer *layer = (wxTabLayer *)layerNode->GetData();
+    wxList::compatibility_iterator tabNode = layer->GetFirst();

     while (tabNode)
     {
     while (tabNode)
     {

-      wxTabControl *tab = (wxTabControl *)tabNode->Data();
+      wxTabControl *tab = (wxTabControl *)tabNode->GetData();

 
       if (tab->GetY() < minY)
         minY = tab->GetY();
 
 
       if (tab->GetY() < minY)
         minY = tab->GetY();
 

-      tabNode = tabNode->Next();
+      tabNode = tabNode->GetNext();

     }
     }

-    layerNode = layerNode->Next();
+    layerNode = layerNode->GetNext();

   }
 
   return - minY;
   }
 
   return - minY;


@@ -679,23 +680,23 @@ int wxTabView::GetTotalTabHeight()
 
 void wxTabView::ClearTabs(bool deleteTabs)
 {
 
 void wxTabView::ClearTabs(bool deleteTabs)
 {

-  wxNode *layerNode = m_layers.First();
+  wxTabLayerList::compatibility_iterator layerNode = m_layers.GetFirst();

   while (layerNode)
   {
   while (layerNode)
   {

-    wxTabLayer *layer = (wxTabLayer *)layerNode->Data();
-    wxNode *tabNode = layer->First();
+    wxTabLayer *layer = (wxTabLayer *)layerNode->GetData();
+    wxList::compatibility_iterator tabNode = layer->GetFirst();

     while (tabNode)
     {
     while (tabNode)
     {

-      wxTabControl *tab = (wxTabControl *)tabNode->Data();
+      wxTabControl *tab = (wxTabControl *)tabNode->GetData();

       if (deleteTabs)
         delete tab;
       if (deleteTabs)
         delete tab;

-      wxNode *next = tabNode->Next();
-      delete tabNode;
+      wxList::compatibility_iterator next = tabNode->GetNext();
+      layer->Erase(tabNode);

       tabNode = next;
     }
       tabNode = next;
     }

-    wxNode *nextLayerNode = layerNode->Next();
+    wxTabLayerList::compatibility_iterator nextLayerNode = layerNode->GetNext();

     delete layer;
     delete layer;

-    delete layerNode;
+    m_layers.Erase(layerNode);

     layerNode = nextLayerNode;
   }
   m_noTabs = 0;
     layerNode = nextLayerNode;
   }
   m_noTabs = 0;


@@ -709,34 +710,34 @@ void wxTabView::LayoutTabs(void)
   // Make a list of the tab controls, deleting the wxTabLayers.
   wxList controls;
 
   // Make a list of the tab controls, deleting the wxTabLayers.
   wxList controls;
 

-  wxNode *layerNode = m_layers.First();
+  wxTabLayerList::compatibility_iterator layerNode = m_layers.GetFirst();

   while (layerNode)
   {
   while (layerNode)
   {

-    wxTabLayer *layer = (wxTabLayer *)layerNode->Data();
-    wxNode *tabNode = layer->First();
+    wxTabLayer *layer = (wxTabLayer *)layerNode->GetData();
+    wxList::compatibility_iterator tabNode = layer->GetFirst();

     while (tabNode)
     {
     while (tabNode)
     {

-      wxTabControl *tab = (wxTabControl *)tabNode->Data();
+      wxTabControl *tab = (wxTabControl *)tabNode->GetData();

       controls.Append(tab);
       controls.Append(tab);

-      wxNode *next = tabNode->Next();
-      delete tabNode;
+      wxList::compatibility_iterator next = tabNode->GetNext();
+      layer->Erase(tabNode);

       tabNode = next;
     }
       tabNode = next;
     }

-    wxNode *nextLayerNode = layerNode->Next();
+    wxTabLayerList::compatibility_iterator nextLayerNode = layerNode->GetNext();

     delete layer;
     delete layer;

-    delete layerNode;
+    m_layers.Erase(layerNode);

     layerNode = nextLayerNode;
   }
 
     layerNode = nextLayerNode;
   }
 

-  wxTabControl *lastTab = (wxTabControl *) NULL;
+  wxTabControl *lastTab = NULL;

 
   wxTabLayer *currentLayer = new wxTabLayer;
   m_layers.Append(currentLayer);
 
 
   wxTabLayer *currentLayer = new wxTabLayer;
   m_layers.Append(currentLayer);
 

-  wxNode *node = controls.First();
+  wxList::compatibility_iterator node = controls.GetFirst();

   while (node)
   {
   while (node)
   {

-    wxTabControl *tabControl = (wxTabControl *)node->Data();
+    wxTabControl *tabControl = (wxTabControl *)node->GetData();

     if (lastTab)
     {
       // Start another layer (row).
     if (lastTab)
     {
       // Start another layer (row).


@@ -744,19 +745,19 @@ void wxTabView::LayoutTabs(void)
       // this happens anyway for 2nd and subsequent rows.
       // Should check this for 1st row, and then subsequent rows should not exceed 1st
       // in length.
       // this happens anyway for 2nd and subsequent rows.
       // Should check this for 1st row, and then subsequent rows should not exceed 1st
       // in length.

-      if (((currentLayer == m_layers.First()->Data()) && ((lastTab->GetX() + 2*lastTab->GetWidth() + GetHorizontalTabSpacing())
+      if (((currentLayer == m_layers.GetFirst()->GetData()) && ((lastTab->GetX() + 2*lastTab->GetWidth() + GetHorizontalTabSpacing())

                 > GetViewRect().width)) ||
                 > GetViewRect().width)) ||

-          ((currentLayer != m_layers.First()->Data()) && (currentLayer->Number() == ((wxTabLayer *)m_layers.First()->Data())->Number())))
+          ((currentLayer != m_layers.GetFirst()->GetData()) && (currentLayer->GetCount() == ((wxTabLayer *)m_layers.GetFirst()->GetData())->GetCount())))

      {
        currentLayer = new wxTabLayer;
        m_layers.Append(currentLayer);
      {
        currentLayer = new wxTabLayer;
        m_layers.Append(currentLayer);

-       lastTab = (wxTabControl *) NULL;
+       lastTab = NULL;

      }
     }
 
      }
     }
 

-    int layer = m_layers.Number() - 1;
+    int layer = m_layers.GetCount() - 1;

 
 

-    tabControl->SetRowPosition(currentLayer->Number());
+    tabControl->SetRowPosition(currentLayer->GetCount());

     tabControl->SetColPosition(layer);
 
     // Top of new tab
     tabControl->SetColPosition(layer);
 
     // Top of new tab


@@ -774,7 +775,7 @@ void wxTabView::LayoutTabs(void)
     currentLayer->Append(tabControl);
     lastTab = tabControl;
 
     currentLayer->Append(tabControl);
     lastTab = tabControl;
 

-    node = node->Next();
+    node = node->GetNext();

   }
 
   // Move the selected tab to the bottom
   }
 
   // Move the selected tab to the bottom


@@ -795,7 +796,8 @@ void wxTabView::Draw(wxDC& dc)
     if (GetTabStyle() & wxTAB_STYLE_COLOUR_INTERIOR)
     {
         dc.SetPen(*wxTRANSPARENT_PEN);
     if (GetTabStyle() & wxTAB_STYLE_COLOUR_INTERIOR)
     {
         dc.SetPen(*wxTRANSPARENT_PEN);

-        dc.SetBrush(*GetBackgroundBrush());
+        if(GetBackgroundBrush())
+            dc.SetBrush(*GetBackgroundBrush());

 
         // Add 1 because the pen is transparent. Under Motif, may be different.
         dc.DrawRectangle(
 
         // Add 1 because the pen is transparent. Under Motif, may be different.
         dc.DrawRectangle(


@@ -807,19 +809,19 @@ void wxTabView::Draw(wxDC& dc)
     }
 
     // Draw layers in reverse order
     }
 
     // Draw layers in reverse order

-    wxNode *node = m_layers.Last();
+    wxTabLayerList::compatibility_iterator node = m_layers.GetLast();

     while (node)
     {
     while (node)
     {

-        wxTabLayer *layer = (wxTabLayer *)node->Data();
-        wxNode *node2 = layer->First();
+        wxTabLayer *layer = (wxTabLayer *)node->GetData();
+        wxList::compatibility_iterator node2 = layer->GetFirst();

         while (node2)
         {
         while (node2)
         {

-            wxTabControl *control = (wxTabControl *)node2->Data();
-            control->OnDraw(dc, (node2->Next() == NULL));
-            node2 = node2->Next();
+            wxTabControl *control = (wxTabControl *)node2->GetData();
+            control->OnDraw(dc, (!node2->GetNext()));
+            node2 = node2->GetNext();

         }
 
         }
 

-        node = node->Previous();
+        node = node->GetPrevious();

     }
 
 
     }
 
 


@@ -870,50 +872,50 @@ void wxTabView::Draw(wxDC& dc)
 #endif
 }
 
 #endif
 }
 

-// Process mouse event, return FALSE if we didn't process it
+// Process mouse event, return false if we didn't process it

 bool wxTabView::OnEvent(wxMouseEvent& event)
 {
   if (!event.LeftDown())
 bool wxTabView::OnEvent(wxMouseEvent& event)
 {
   if (!event.LeftDown())

-    return FALSE;
+    return false;

 
   wxCoord x, y;
   event.GetPosition(&x, &y);
 
 
   wxCoord x, y;
   event.GetPosition(&x, &y);
 

-  wxTabControl *hitControl = (wxTabControl *) NULL;
+  wxTabControl *hitControl = NULL;

 
 

-  wxNode *node = m_layers.First();
+  wxTabLayerList::compatibility_iterator node = m_layers.GetFirst();

   while (node)
   {
   while (node)
   {

-    wxTabLayer *layer = (wxTabLayer *)node->Data();
-    wxNode *node2 = layer->First();
+    wxTabLayer *layer = (wxTabLayer *)node->GetData();
+    wxList::compatibility_iterator node2 = layer->GetFirst();

     while (node2)
     {
     while (node2)
     {

-      wxTabControl *control = (wxTabControl *)node2->Data();
+      wxTabControl *control = (wxTabControl *)node2->GetData();

       if (control->HitTest((int)x, (int)y))
       {
         hitControl = control;
       if (control->HitTest((int)x, (int)y))
       {
         hitControl = control;

-        node = (wxNode *) NULL;
-        node2 = (wxNode *) NULL;
+        node = wxTabLayerList::compatibility_iterator();
+        node2 = wxList::compatibility_iterator();

       }
       else
       }
       else

-        node2 = node2->Next();
+        node2 = node2->GetNext();

     }
 
     if (node)
     }
 
     if (node)

-      node = node->Next();
+      node = node->GetNext();

   }
 
   if (!hitControl)
   }
 
   if (!hitControl)

-    return FALSE;
+    return false;

 
   wxTabControl *currentTab = FindTabControlForId(m_tabSelection);
 
   if (hitControl == currentTab)
 
   wxTabControl *currentTab = FindTabControlForId(m_tabSelection);
 
   if (hitControl == currentTab)

-    return FALSE;
+    return false;

 
   ChangeTab(hitControl);
 
 
   ChangeTab(hitControl);
 

-  return TRUE;
+  return true;

 }
 
 bool wxTabView::ChangeTab(wxTabControl *control)
 }
 
 bool wxTabView::ChangeTab(wxTabControl *control)


@@ -924,38 +926,38 @@ bool wxTabView::ChangeTab(wxTabControl *control)
     oldTab = currentTab->GetId();
 
   if (control == currentTab)
     oldTab = currentTab->GetId();
 
   if (control == currentTab)

-    return TRUE;
+    return true;

 
 

-  if (m_layers.Number() == 0)
-    return FALSE;
+  if (m_layers.GetCount() == 0)
+    return false;

 
   if (!OnTabPreActivate(control->GetId(), oldTab))
 
   if (!OnTabPreActivate(control->GetId(), oldTab))

-    return FALSE;
+    return false;

 
   // Move the tab to the bottom
   MoveSelectionTab(control);
 
   if (currentTab)
 
   // Move the tab to the bottom
   MoveSelectionTab(control);
 
   if (currentTab)

-    currentTab->SetSelected(FALSE);
+    currentTab->SetSelected(false);

 
 

-  control->SetSelected(TRUE);
+  control->SetSelected(true);

   m_tabSelection = control->GetId();
 
   OnTabActivate(control->GetId(), oldTab);
 
   // Leave window refresh for the implementing window
 
   m_tabSelection = control->GetId();
 
   OnTabActivate(control->GetId(), oldTab);
 
   // Leave window refresh for the implementing window
 

-  return TRUE;
+  return true;

 }
 
 // Move the selected tab to the bottom layer, if necessary,
 // without calling app activation code
 bool wxTabView::MoveSelectionTab(wxTabControl *control)
 {
 }
 
 // Move the selected tab to the bottom layer, if necessary,
 // without calling app activation code
 bool wxTabView::MoveSelectionTab(wxTabControl *control)
 {

-  if (m_layers.Number() == 0)
-    return FALSE;
+  if (m_layers.GetCount() == 0)
+    return false;

 
 

-  wxTabLayer *firstLayer = (wxTabLayer *)m_layers.First()->Data();
+  wxTabLayer *firstLayer = (wxTabLayer *)m_layers.GetFirst()->GetData();

 
   // Find what column this tab is at, so we can swap with the one at the bottom.
   // If we're on the bottom layer, then no need to swap.
 
   // Find what column this tab is at, so we can swap with the one at the bottom.
   // If we're on the bottom layer, then no need to swap.


@@ -963,18 +965,18 @@ bool wxTabView::MoveSelectionTab(wxTabControl *control)
   {
     // Do a swap
     int col = 0;
   {
     // Do a swap
     int col = 0;

-    wxNode *thisNode = FindTabNodeAndColumn(control, &col);
+    wxList::compatibility_iterator thisNode = FindTabNodeAndColumn(control, &col);

     if (!thisNode)
     if (!thisNode)

-      return FALSE;
-    wxNode *otherNode = firstLayer->Nth(col);
+      return false;
+    wxList::compatibility_iterator otherNode = firstLayer->Item(col);

     if (!otherNode)
     if (!otherNode)

-      return FALSE;
+      return false;

 
     // If this is already in the bottom layer, return now
     if (otherNode == thisNode)
 
     // If this is already in the bottom layer, return now
     if (otherNode == thisNode)

-      return TRUE;
+      return true;

 
 

-    wxTabControl *otherTab = (wxTabControl *)otherNode->Data();
+    wxTabControl *otherTab = (wxTabControl *)otherNode->GetData();

 
     // We now have pointers to the tab to be changed to,
     // and the tab on the first layer. Swap tab structures and
 
     // We now have pointers to the tab to be changed to,
     // and the tab on the first layer. Swap tab structures and


@@ -996,7 +998,7 @@ bool wxTabView::MoveSelectionTab(wxTabControl *control)
     thisNode->SetData(otherTab);
     otherNode->SetData(control);
   }
     thisNode->SetData(otherTab);
     otherNode->SetData(control);
   }

-  return TRUE;
+  return true;

 }
 
 // Called when a tab is activated
 }
 
 // Called when a tab is activated


@@ -1007,22 +1009,26 @@ void wxTabView::OnTabActivate(int /*activateId*/, int /*deactivateId*/)
 void wxTabView::SetHighlightColour(const wxColour& col)
 {
   m_highlightColour = col;
 void wxTabView::SetHighlightColour(const wxColour& col)
 {
   m_highlightColour = col;

-  m_highlightPen = wxThePenList->FindOrCreatePen(col, 1, wxSOLID);
+  m_highlightPen = wxThePenList->FindOrCreatePen(col);

 }
 
 void wxTabView::SetShadowColour(const wxColour& col)
 {
   m_shadowColour = col;
 }
 
 void wxTabView::SetShadowColour(const wxColour& col)
 {
   m_shadowColour = col;

-  m_shadowPen = wxThePenList->FindOrCreatePen(col, 1, wxSOLID);
+  m_shadowPen = wxThePenList->FindOrCreatePen(col);

 }
 
 void wxTabView::SetBackgroundColour(const wxColour& col)
 {
   m_backgroundColour = col;
 }
 
 void wxTabView::SetBackgroundColour(const wxColour& col)
 {
   m_backgroundColour = col;

-  m_backgroundPen = wxThePenList->FindOrCreatePen(col, 1, wxSOLID);
-  m_backgroundBrush = wxTheBrushList->FindOrCreateBrush(col, wxSOLID);
+  m_backgroundPen = wxThePenList->FindOrCreatePen(col);
+  m_backgroundBrush = wxTheBrushList->FindOrCreateBrush(col);

 }
 
 }
 

+// this may be called with sel = zero (which doesn't match any page)
+// when wxMotif deletes a page
+// so return the first tab...
+

 void wxTabView::SetTabSelection(int sel, bool activateTool)
 {
   if ( sel==m_tabSelection )
 void wxTabView::SetTabSelection(int sel, bool activateTool)
 {
   if ( sel==m_tabSelection )


@@ -1030,6 +1036,7 @@ void wxTabView::SetTabSelection(int sel, bool activateTool)
 
   int oldSel = m_tabSelection;
   wxTabControl *control = FindTabControlForId(sel);
 
   int oldSel = m_tabSelection;
   wxTabControl *control = FindTabControlForId(sel);

+  if (sel == 0) sel=control->GetId();

   wxTabControl *oldControl = FindTabControlForId(m_tabSelection);
 
   if (!OnTabPreActivate(sel, oldSel))
   wxTabControl *oldControl = FindTabControlForId(m_tabSelection);
 
   if (!OnTabPreActivate(sel, oldSel))


@@ -1044,7 +1051,7 @@ void wxTabView::SetTabSelection(int sel, bool activateTool)
   }
 
   if (oldControl)
   }
 
   if (oldControl)

-    oldControl->SetSelected(FALSE);
+    oldControl->SetSelected(false);

 
   m_tabSelection = sel;
 
 
   m_tabSelection = sel;
 


@@ -1056,61 +1063,63 @@ void wxTabView::SetTabSelection(int sel, bool activateTool)
 }
 
 // Find tab control for id
 }
 
 // Find tab control for id

+// this may be called with zero (which doesn't match any page)
+// so return the first control...

 wxTabControl *wxTabView::FindTabControlForId(int id) const
 {
 wxTabControl *wxTabView::FindTabControlForId(int id) const
 {

-  wxNode *node1 = m_layers.First();
+  wxTabLayerList::compatibility_iterator node1 = m_layers.GetFirst();

   while (node1)
   {
   while (node1)
   {

-    wxTabLayer *layer = (wxTabLayer *)node1->Data();
-    wxNode *node2 = layer->First();
+    wxTabLayer *layer = (wxTabLayer *)node1->GetData();
+    wxList::compatibility_iterator node2 = layer->GetFirst();

     while (node2)
     {
     while (node2)
     {

-      wxTabControl *control = (wxTabControl *)node2->Data();
-      if (control->GetId() == id)
+      wxTabControl *control = (wxTabControl *)node2->GetData();
+      if (control->GetId() == id || id == 0)

         return control;
         return control;

-      node2 = node2->Next();
+      node2 = node2->GetNext();

     }
     }

-    node1 = node1->Next();
+    node1 = node1->GetNext();

   }
   }

-  return (wxTabControl *) NULL;
+  return NULL;

 }
 
 // Find tab control for layer, position (starting from zero)
 wxTabControl *wxTabView::FindTabControlForPosition(int layer, int position) const
 {
 }
 
 // Find tab control for layer, position (starting from zero)
 wxTabControl *wxTabView::FindTabControlForPosition(int layer, int position) const
 {

-  wxNode *node1 = m_layers.Nth(layer);
+  wxTabLayerList::compatibility_iterator node1 = m_layers.Item(layer);

   if (!node1)
   if (!node1)

-    return (wxTabControl *) NULL;
-  wxTabLayer *tabLayer = (wxTabLayer *)node1->Data();
-  wxNode *node2 = tabLayer->Nth(position);
+    return NULL;
+  wxTabLayer *tabLayer = (wxTabLayer *)node1->GetData();
+  wxList::compatibility_iterator node2 = tabLayer->Item(position);

   if (!node2)
   if (!node2)

-    return (wxTabControl *) NULL;
-  return (wxTabControl *)node2->Data();
+    return NULL;
+  return (wxTabControl *)node2->GetData();

 }
 
 // Find the node and the column at which this control is positioned.
 }
 
 // Find the node and the column at which this control is positioned.

-wxNode *wxTabView::FindTabNodeAndColumn(wxTabControl *control, int *col) const
+wxList::compatibility_iterator wxTabView::FindTabNodeAndColumn(wxTabControl *control, int *col) const

 {
 {

-  wxNode *node1 = m_layers.First();
+  wxTabLayerList::compatibility_iterator node1 = m_layers.GetFirst();

   while (node1)
   {
   while (node1)
   {

-    wxTabLayer *layer = (wxTabLayer *)node1->Data();
+    wxTabLayer *layer = (wxTabLayer *)node1->GetData();

     int c = 0;
     int c = 0;

-    wxNode *node2 = layer->First();
+    wxList::compatibility_iterator node2 = layer->GetFirst();

     while (node2)
     {
     while (node2)
     {

-      wxTabControl *cnt = (wxTabControl *)node2->Data();
+      wxTabControl *cnt = (wxTabControl *)node2->GetData();

       if (cnt == control)
       {
         *col = c;
         return node2;
       }
       if (cnt == control)
       {
         *col = c;
         return node2;
       }

-      node2 = node2->Next();
+      node2 = node2->GetNext();

       c ++;
     }
       c ++;
     }

-    node1 = node1->Next();
+    node1 = node1->GetNext();

   }
   }

-  return (wxNode *) NULL;
+  return wxList::compatibility_iterator();

 }
 
 int wxTabView::CalculateTabWidth(int noTabs, bool adjustView)
 }
 
 int wxTabView::CalculateTabWidth(int noTabs, bool adjustView)


@@ -1141,7 +1150,7 @@ wxTabbedDialog::wxTabbedDialog(wxWindow *parent, wxWindowID id,
     long windowStyle, const wxString& name):
    wxDialog(parent, id, title, pos, size, windowStyle, name)
 {
     long windowStyle, const wxString& name):
    wxDialog(parent, id, title, pos, size, windowStyle, name)
 {

-  m_tabView = (wxTabView *) NULL;
+  m_tabView = NULL;

 }
 
 wxTabbedDialog::~wxTabbedDialog(void)
 }
 
 wxTabbedDialog::~wxTabbedDialog(void)


@@ -1183,7 +1192,7 @@ wxTabbedPanel::wxTabbedPanel(wxWindow *parent, wxWindowID id, const wxPoint& pos
    const wxSize& size, long windowStyle, const wxString& name):
    wxPanel(parent, id, pos, size, windowStyle, name)
 {
    const wxSize& size, long windowStyle, const wxString& name):
    wxPanel(parent, id, pos, size, windowStyle, name)
 {

-  m_tabView = (wxTabView *) NULL;
+  m_tabView = NULL;

 }
 
 wxTabbedPanel::~wxTabbedPanel(void)
 }
 
 wxTabbedPanel::~wxTabbedPanel(void)


@@ -1210,10 +1219,11 @@ void wxTabbedPanel::OnPaint(wxPaintEvent& WXUNUSED(event) )
 
 IMPLEMENT_CLASS(wxPanelTabView, wxTabView)
 
 
 IMPLEMENT_CLASS(wxPanelTabView, wxTabView)
 

-wxPanelTabView::wxPanelTabView(wxPanel *pan, long style): wxTabView(style), m_tabWindows(wxKEY_INTEGER)
+wxPanelTabView::wxPanelTabView(wxPanel *pan, long style)
+    : wxTabView(style)

 {
   m_panel = pan;
 {
   m_panel = pan;

-  m_currentWindow = (wxWindow *) NULL;
+  m_currentWindow = NULL;

 
   if (m_panel->IsKindOf(CLASSINFO(wxTabbedDialog)))
     ((wxTabbedDialog *)m_panel)->SetTabView(this);
 
   if (m_panel->IsKindOf(CLASSINFO(wxTabbedDialog)))
     ((wxTabbedDialog *)m_panel)->SetTabView(this);


@@ -1225,7 +1235,7 @@ wxPanelTabView::wxPanelTabView(wxPanel *pan, long style): wxTabView(style), m_ta
 
 wxPanelTabView::~wxPanelTabView(void)
 {
 
 wxPanelTabView::~wxPanelTabView(void)
 {

-  ClearWindows(TRUE);
+  ClearWindows(true);

 }
 
 // Called when a tab is activated
 }
 
 // Called when a tab is activated


@@ -1238,9 +1248,9 @@ void wxPanelTabView::OnTabActivate(int activateId, int deactivateId)
   wxWindow *newWindow = GetTabWindow(activateId);
 
   if (oldWindow)
   wxWindow *newWindow = GetTabWindow(activateId);
 
   if (oldWindow)

-    oldWindow->Show(FALSE);
+    oldWindow->Show(false);

   if (newWindow)
   if (newWindow)

-    newWindow->Show(TRUE);
+    newWindow->Show(true);

 
   m_panel->Refresh();
 }
 
   m_panel->Refresh();
 }


@@ -1248,24 +1258,22 @@ void wxPanelTabView::OnTabActivate(int activateId, int deactivateId)
 
 void wxPanelTabView::AddTabWindow(int id, wxWindow *window)
 {
 
 void wxPanelTabView::AddTabWindow(int id, wxWindow *window)
 {

-  m_tabWindows.Append((long)id, window);
-  window->Show(FALSE);
+  wxASSERT(m_tabWindows.find(id) == m_tabWindows.end());
+  m_tabWindows[id] = window;
+  window->Show(false);

 }
 
 wxWindow *wxPanelTabView::GetTabWindow(int id) const
 {
 }
 
 wxWindow *wxPanelTabView::GetTabWindow(int id) const
 {

-  wxNode *node = m_tabWindows.Find((long)id);
-  if (!node)
-    return (wxWindow *) NULL;
-  return (wxWindow *)node->Data();
+  wxIntToWindowHashMap::const_iterator it = m_tabWindows.find(id);
+  return it == m_tabWindows.end() ? NULL : it->second;

 }
 
 void wxPanelTabView::ClearWindows(bool deleteWindows)
 {
   if (deleteWindows)
 }
 
 void wxPanelTabView::ClearWindows(bool deleteWindows)
 {
   if (deleteWindows)

-    m_tabWindows.DeleteContents(TRUE);
-  m_tabWindows.Clear();
-  m_tabWindows.DeleteContents(FALSE);
+    WX_CLEAR_HASH_MAP(wxIntToWindowHashMap, m_tabWindows);
+  m_tabWindows.clear();

 }
 
 void wxPanelTabView::ShowWindowForTab(int id)
 }
 
 void wxPanelTabView::ShowWindowForTab(int id)


@@ -1274,8 +1282,8 @@ void wxPanelTabView::ShowWindowForTab(int id)
   if (newWindow == m_currentWindow)
     return;
   if (m_currentWindow)
   if (newWindow == m_currentWindow)
     return;
   if (m_currentWindow)

-    m_currentWindow->Show(FALSE);
-  newWindow->Show(TRUE);
+    m_currentWindow->Show(false);
+  newWindow->Show(true);

   newWindow->Refresh();
 }
 
   newWindow->Refresh();
 }