The Great wxRegion Refactoring:

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

diff --git a/src/generic/tabg.cpp b/src/generic/tabg.cpp
index bb3fc77c3d7b86f88444d98e7cab80ddc0437b4d..cec7c1d37a0ca280d81fa65622b5d131a06406ec 100644 (file)
--- a/src/generic/tabg.cpp
+++ b/src/generic/tabg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        tabg.cpp
+// Name:        src/generic/tabg.cpp

 // Purpose:     Generic tabbed dialogs
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     Generic tabbed dialogs
 // Author:      Julian Smart
 // Modified by:


@@ -9,15 +9,11 @@
 // 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
 
 #if wxUSE_TAB_DIALOG
 #endif
 
 #if wxUSE_TAB_DIALOG


@@ -25,14 +21,18 @@
 #ifndef WX_PRECOMP
     #include "wx/settings.h"
     #include "wx/intl.h"
 #ifndef WX_PRECOMP
     #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/tab.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)


@@ -40,12 +40,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;


@@ -498,9 +498,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)


@@ -523,12 +523,11 @@ 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;
+  SetBackgroundColour(m_backgroundColour);

   m_tabFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
   m_tabSelectedFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
   m_window = (wxWindow *) NULL;
   m_tabFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
   m_tabSelectedFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
   m_window = (wxWindow *) NULL;


@@ -536,7 +535,7 @@ wxTabView::wxTabView(long style)
 
 wxTabView::~wxTabView()
 {
 
 wxTabView::~wxTabView()
 {

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

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


@@ -546,7 +545,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.GetLast();
+  wxTabLayerList::compatibility_iterator node = m_layers.GetLast();

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


@@ -555,7 +554,7 @@ 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.
   wxTabLayer *tabLayer = (wxTabLayer *)node->GetData();
   // Check if adding another tab control would go off the
   // right-hand edge of the layer.
   wxTabLayer *tabLayer = (wxTabLayer *)node->GetData();

-  wxNode *lastTabNode = tabLayer->GetLast();
+  wxList::compatibility_iterator lastTabNode = tabLayer->GetLast();

   if (lastTabNode)
   {
     wxTabControl *lastTab = (wxTabControl *)lastTabNode->GetData();
   if (lastTabNode)
   {
     wxTabControl *lastTab = (wxTabControl *)lastTabNode->GetData();


@@ -570,7 +569,7 @@ wxTabControl *wxTabView::AddTab(int id, const wxString& label, wxTabControl *exi
     {
       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.GetCount() - 1;
     }
   }
   int layer = m_layers.GetCount() - 1;


@@ -609,11 +608,11 @@ 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.GetFirst();
+  wxTabLayerList::compatibility_iterator layerNode = m_layers.GetFirst();

   while (layerNode)
   {
     wxTabLayer *layer = (wxTabLayer *)layerNode->GetData();
   while (layerNode)
   {
     wxTabLayer *layer = (wxTabLayer *)layerNode->GetData();

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

     while (tabNode)
     {
       wxTabControl *tab = (wxTabControl *)tabNode->GetData();
     while (tabNode)
     {
       wxTabControl *tab = (wxTabControl *)tabNode->GetData();


@@ -622,27 +621,27 @@ bool wxTabView::RemoveTab(int id)
         if (id == m_tabSelection)
           m_tabSelection = -1;
         delete tab;
         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->GetNext();
     }
     layerNode = layerNode->GetNext();
   }
       }
       tabNode = tabNode->GetNext();
     }
     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


@@ -660,11 +659,11 @@ int wxTabView::GetTotalTabHeight()
 {
   int minY = 0;
 
 {
   int minY = 0;
 

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

   while (layerNode)
   {
     wxTabLayer *layer = (wxTabLayer *)layerNode->GetData();
   while (layerNode)
   {
     wxTabLayer *layer = (wxTabLayer *)layerNode->GetData();

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

     while (tabNode)
     {
       wxTabControl *tab = (wxTabControl *)tabNode->GetData();
     while (tabNode)
     {
       wxTabControl *tab = (wxTabControl *)tabNode->GetData();


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

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

   while (layerNode)
   {
     wxTabLayer *layer = (wxTabLayer *)layerNode->GetData();
   while (layerNode)
   {
     wxTabLayer *layer = (wxTabLayer *)layerNode->GetData();

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

     while (tabNode)
     {
       wxTabControl *tab = (wxTabControl *)tabNode->GetData();
       if (deleteTabs)
         delete tab;
     while (tabNode)
     {
       wxTabControl *tab = (wxTabControl *)tabNode->GetData();
       if (deleteTabs)
         delete tab;

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

       tabNode = next;
     }
       tabNode = next;
     }

-    wxNode *nextLayerNode = layerNode->GetNext();
+    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;


@@ -712,22 +711,22 @@ 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.GetFirst();
+  wxTabLayerList::compatibility_iterator layerNode = m_layers.GetFirst();

   while (layerNode)
   {
     wxTabLayer *layer = (wxTabLayer *)layerNode->GetData();
   while (layerNode)
   {
     wxTabLayer *layer = (wxTabLayer *)layerNode->GetData();

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

     while (tabNode)
     {
       wxTabControl *tab = (wxTabControl *)tabNode->GetData();
       controls.Append(tab);
     while (tabNode)
     {
       wxTabControl *tab = (wxTabControl *)tabNode->GetData();
       controls.Append(tab);

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

       tabNode = next;
     }
       tabNode = next;
     }

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

     delete layer;
     delete layer;

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

     layerNode = nextLayerNode;
   }
 
     layerNode = nextLayerNode;
   }
 


@@ -736,7 +735,7 @@ void wxTabView::LayoutTabs(void)
   wxTabLayer *currentLayer = new wxTabLayer;
   m_layers.Append(currentLayer);
 
   wxTabLayer *currentLayer = new wxTabLayer;
   m_layers.Append(currentLayer);
 

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

   while (node)
   {
     wxTabControl *tabControl = (wxTabControl *)node->GetData();
   while (node)
   {
     wxTabControl *tabControl = (wxTabControl *)node->GetData();


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

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

     while (node)
     {
         wxTabLayer *layer = (wxTabLayer *)node->GetData();
     while (node)
     {
         wxTabLayer *layer = (wxTabLayer *)node->GetData();

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

         while (node2)
         {
             wxTabControl *control = (wxTabControl *)node2->GetData();
         while (node2)
         {
             wxTabControl *control = (wxTabControl *)node2->GetData();

-            control->OnDraw(dc, (node2->GetNext() == NULL));
+            control->OnDraw(dc, (!node2->GetNext()));

             node2 = node2->GetNext();
         }
 
             node2 = node2->GetNext();
         }
 


@@ -873,30 +872,30 @@ 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);
 
   wxTabControl *hitControl = (wxTabControl *) NULL;
 
 
   wxCoord x, y;
   event.GetPosition(&x, &y);
 
   wxTabControl *hitControl = (wxTabControl *) NULL;
 

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

   while (node)
   {
     wxTabLayer *layer = (wxTabLayer *)node->GetData();
   while (node)
   {
     wxTabLayer *layer = (wxTabLayer *)node->GetData();

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

     while (node2)
     {
       wxTabControl *control = (wxTabControl *)node2->GetData();
       if (control->HitTest((int)x, (int)y))
       {
         hitControl = control;
     while (node2)
     {
       wxTabControl *control = (wxTabControl *)node2->GetData();
       if (control->HitTest((int)x, (int)y))
       {
         hitControl = control;

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

       }
       else
         node2 = node2->GetNext();
       }
       else
         node2 = node2->GetNext();


@@ -907,16 +906,16 @@ bool wxTabView::OnEvent(wxMouseEvent& event)
   }
 
   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)


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

-    return TRUE;
+    return true;

 
   if (m_layers.GetCount() == 0)
 
   if (m_layers.GetCount() == 0)

-    return FALSE;
+    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,
 }
 
 // Move the selected tab to the bottom layer, if necessary,


@@ -956,7 +955,7 @@ bool wxTabView::ChangeTab(wxTabControl *control)
 bool wxTabView::MoveSelectionTab(wxTabControl *control)
 {
   if (m_layers.GetCount() == 0)
 bool wxTabView::MoveSelectionTab(wxTabControl *control)
 {
   if (m_layers.GetCount() == 0)

-    return FALSE;
+    return false;

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


@@ -966,16 +965,16 @@ 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->Item(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->GetData();
 
 
     wxTabControl *otherTab = (wxTabControl *)otherNode->GetData();
 


@@ -999,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


@@ -1026,6 +1025,10 @@ void wxTabView::SetBackgroundColour(const wxColour& col)
   m_backgroundBrush = wxTheBrushList->FindOrCreateBrush(col, wxSOLID);
 }
 
   m_backgroundBrush = wxTheBrushList->FindOrCreateBrush(col, wxSOLID);
 }
 

+// 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 )


@@ -1033,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))


@@ -1047,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;
 


@@ -1059,17 +1063,19 @@ 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.GetFirst();
+  wxTabLayerList::compatibility_iterator node1 = m_layers.GetFirst();

   while (node1)
   {
     wxTabLayer *layer = (wxTabLayer *)node1->GetData();
   while (node1)
   {
     wxTabLayer *layer = (wxTabLayer *)node1->GetData();

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

     while (node2)
     {
       wxTabControl *control = (wxTabControl *)node2->GetData();
     while (node2)
     {
       wxTabControl *control = (wxTabControl *)node2->GetData();

-      if (control->GetId() == id)
+      if (control->GetId() == id || id == 0)

         return control;
       node2 = node2->GetNext();
     }
         return control;
       node2 = node2->GetNext();
     }


@@ -1081,25 +1087,25 @@ wxTabControl *wxTabView::FindTabControlForId(int id) const
 // 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.Item(layer);
+  wxTabLayerList::compatibility_iterator node1 = m_layers.Item(layer);

   if (!node1)
     return (wxTabControl *) NULL;
   wxTabLayer *tabLayer = (wxTabLayer *)node1->GetData();
   if (!node1)
     return (wxTabControl *) NULL;
   wxTabLayer *tabLayer = (wxTabLayer *)node1->GetData();

-  wxNode *node2 = tabLayer->Item(position);
+  wxList::compatibility_iterator node2 = tabLayer->Item(position);

   if (!node2)
     return (wxTabControl *) NULL;
   return (wxTabControl *)node2->GetData();
 }
 
 // Find the node and the column at which this control is positioned.
   if (!node2)
     return (wxTabControl *) NULL;
   return (wxTabControl *)node2->GetData();
 }
 
 // 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.GetFirst();
+  wxTabLayerList::compatibility_iterator node1 = m_layers.GetFirst();

   while (node1)
   {
     wxTabLayer *layer = (wxTabLayer *)node1->GetData();
     int c = 0;
   while (node1)
   {
     wxTabLayer *layer = (wxTabLayer *)node1->GetData();
     int c = 0;

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

     while (node2)
     {
       wxTabControl *cnt = (wxTabControl *)node2->GetData();
     while (node2)
     {
       wxTabControl *cnt = (wxTabControl *)node2->GetData();


@@ -1113,7 +1119,7 @@ wxNode *wxTabView::FindTabNodeAndColumn(wxTabControl *control, int *col) const
     }
     node1 = node1->GetNext();
   }
     }
     node1 = node1->GetNext();
   }

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

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


@@ -1213,7 +1219,8 @@ 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_currentWindow = (wxWindow *) NULL;
 {
   m_panel = pan;
   m_currentWindow = (wxWindow *) NULL;


@@ -1228,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


@@ -1241,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();
 }


@@ -1251,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->GetData();
+  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)


@@ -1277,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();
 }