X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4410d619c5a29e025b3ee5cd2363d8795aaf841c..dcbd3762e86258781ed81202977f680665190528:/src/generic/tabg.cpp

diff --git a/src/generic/tabg.cpp b/src/generic/tabg.cpp
index 6c6ffa0120..8ec1549f2b 100644
--- a/src/generic/tabg.cpp
+++ b/src/generic/tabg.cpp
@@ -31,8 +31,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
-#include <math.h>
 
+#include "wx/math.h"
 #include "wx/tab.h"
 #include "wx/listimpl.cpp"
 
@@ -49,7 +49,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxTabControl, wxObject)
 wxTabControl::wxTabControl(wxTabView *v)
 {
   m_view = v;
-  m_isSelected = FALSE;
+  m_isSelected = false;
   m_offsetX = 0;
   m_offsetY = 0;
   m_width = 0;
@@ -502,9 +502,9 @@ bool wxTabControl::HitTest(int x, int y) const
   int tabY2 = tabY1 + GetHeight();
 
   if (x >= tabX1 && y >= tabY1 && x <= tabX2 && y <= tabY2)
-    return TRUE;
+    return true;
   else
-    return FALSE;
+    return false;
 }
 
 IMPLEMENT_DYNAMIC_CLASS(wxTabView, wxObject)
@@ -527,12 +527,11 @@ wxTabView::wxTabView(long style)
   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_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;
@@ -540,7 +539,7 @@ wxTabView::wxTabView(long style)
 
 wxTabView::~wxTabView()
 {
-  ClearTabs(TRUE);
+  ClearTabs(true);
 }
 
 // Automatically positions tabs
@@ -631,22 +630,22 @@ bool wxTabView::RemoveTab(int id)
 
         // The layout has changed
         LayoutTabs();
-        return TRUE;
+        return true;
       }
       tabNode = tabNode->GetNext();
     }
     layerNode = layerNode->GetNext();
   }
-  return FALSE;
+  return false;
 }
 
 bool wxTabView::SetTabText(int id, const wxString& label)
 {
     wxTabControl* control = FindTabControlForId(id);
     if (!control)
-      return FALSE;
+      return false;
     control->SetLabel(label);
-    return TRUE;
+    return true;
 }
 
 wxString wxTabView::GetTabText(int id) const
@@ -877,11 +876,11 @@ void wxTabView::Draw(wxDC& dc)
 #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())
-    return FALSE;
+    return false;
 
   wxCoord x, y;
   event.GetPosition(&x, &y);
@@ -911,16 +910,16 @@ bool wxTabView::OnEvent(wxMouseEvent& event)
   }
 
   if (!hitControl)
-    return FALSE;
+    return false;
 
   wxTabControl *currentTab = FindTabControlForId(m_tabSelection);
 
   if (hitControl == currentTab)
-    return FALSE;
+    return false;
 
   ChangeTab(hitControl);
 
-  return TRUE;
+  return true;
 }
 
 bool wxTabView::ChangeTab(wxTabControl *control)
@@ -931,28 +930,28 @@ bool wxTabView::ChangeTab(wxTabControl *control)
     oldTab = currentTab->GetId();
 
   if (control == currentTab)
-    return TRUE;
+    return true;
 
   if (m_layers.GetCount() == 0)
-    return FALSE;
+    return false;
 
   if (!OnTabPreActivate(control->GetId(), oldTab))
-    return FALSE;
+    return false;
 
   // 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
 
-  return TRUE;
+  return true;
 }
 
 // Move the selected tab to the bottom layer, if necessary,
@@ -960,7 +959,7 @@ bool wxTabView::ChangeTab(wxTabControl *control)
 bool wxTabView::MoveSelectionTab(wxTabControl *control)
 {
   if (m_layers.GetCount() == 0)
-    return FALSE;
+    return false;
 
   wxTabLayer *firstLayer = (wxTabLayer *)m_layers.GetFirst()->GetData();
 
@@ -972,14 +971,14 @@ bool wxTabView::MoveSelectionTab(wxTabControl *control)
     int col = 0;
     wxList::compatibility_iterator thisNode = FindTabNodeAndColumn(control, &col);
     if (!thisNode)
-      return FALSE;
+      return false;
     wxList::compatibility_iterator otherNode = firstLayer->Item(col);
     if (!otherNode)
-      return FALSE;
+      return false;
 
     // If this is already in the bottom layer, return now
     if (otherNode == thisNode)
-      return TRUE;
+      return true;
 
     wxTabControl *otherTab = (wxTabControl *)otherNode->GetData();
 
@@ -1003,7 +1002,7 @@ bool wxTabView::MoveSelectionTab(wxTabControl *control)
     thisNode->SetData(otherTab);
     otherNode->SetData(control);
   }
-  return TRUE;
+  return true;
 }
 
 // Called when a tab is activated
@@ -1051,7 +1050,7 @@ void wxTabView::SetTabSelection(int sel, bool activateTool)
   }
 
   if (oldControl)
-    oldControl->SetSelected(FALSE);
+    oldControl->SetSelected(false);
 
   m_tabSelection = sel;
 
@@ -1233,7 +1232,7 @@ wxPanelTabView::wxPanelTabView(wxPanel *pan, long style)
 
 wxPanelTabView::~wxPanelTabView(void)
 {
-  ClearWindows(TRUE);
+  ClearWindows(true);
 }
 
 // Called when a tab is activated
@@ -1246,9 +1245,9 @@ void wxPanelTabView::OnTabActivate(int activateId, int deactivateId)
   wxWindow *newWindow = GetTabWindow(activateId);
 
   if (oldWindow)
-    oldWindow->Show(FALSE);
+    oldWindow->Show(false);
   if (newWindow)
-    newWindow->Show(TRUE);
+    newWindow->Show(true);
 
   m_panel->Refresh();
 }
@@ -1258,7 +1257,7 @@ void wxPanelTabView::AddTabWindow(int id, wxWindow *window)
 {
   wxASSERT(m_tabWindows.find(id) == m_tabWindows.end());
   m_tabWindows[id] = window;
-  window->Show(FALSE);
+  window->Show(false);
 }
 
 wxWindow *wxPanelTabView::GetTabWindow(int id) const
@@ -1280,8 +1279,8 @@ void wxPanelTabView::ShowWindowForTab(int id)
   if (newWindow == m_currentWindow)
     return;
   if (m_currentWindow)
-    m_currentWindow->Show(FALSE);
-  newWindow->Show(TRUE);
+    m_currentWindow->Show(false);
+  newWindow->Show(true);
   newWindow->Refresh();
 }