Visible functions implemented

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

diff --git a/src/generic/tabg.cpp b/src/generic/tabg.cpp
index 433d3c18018f870babeaf8b4f162d5b4bef78ce6..fe7590fd50dea95c0e9fc714c48358e92b84a887 100644 (file)
--- a/src/generic/tabg.cpp
+++ b/src/generic/tabg.cpp
@@ -31,6 +31,10 @@
 
 #include "wx/tab.h"
 
 
 #include "wx/tab.h"
 

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

 IMPLEMENT_DYNAMIC_CLASS(wxTabControl, wxObject)
 
 IMPLEMENT_DYNAMIC_CLASS(wxTabLayer, wxList)
 IMPLEMENT_DYNAMIC_CLASS(wxTabControl, wxObject)
 
 IMPLEMENT_DYNAMIC_CLASS(wxTabLayer, wxList)


@@ -39,7 +43,6 @@ wxTabControl::wxTabControl(wxTabView *v)
 {
   m_view = v;
   m_isSelected = FALSE;
 {
   m_view = v;
   m_isSelected = FALSE;

-  m_labelFont = (wxFont *) NULL;

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


@@ -56,7 +59,7 @@ wxTabControl::~wxTabControl(void)
 void wxTabControl::OnDraw(wxDC& dc, bool lastInRow)
 {
     // Old, but in some ways better (drawing opaque tabs)
 void wxTabControl::OnDraw(wxDC& dc, bool lastInRow)
 {
     // Old, but in some ways better (drawing opaque tabs)

-#if 0
+#ifndef wxUSE_NEW_METHOD

   if (!m_view)
     return;
     
   if (!m_view)
     return;
     


@@ -70,23 +73,27 @@ void wxTabControl::OnDraw(wxDC& dc, bool lastInRow)
   int tabHeightInc = 0;
   if (m_isSelected)
   {
   int tabHeightInc = 0;
   if (m_isSelected)
   {

-    tabHeightInc = (view->GetTabSelectionHeight() - view->GetTabHeight());
+    tabHeightInc = (m_view->GetTabSelectionHeight() - m_view->GetTabHeight());

     tabY -= tabHeightInc;
   }
   
     tabY -= tabHeightInc;
   }
   

-  dc.SetPen(wxTRANSPARENT_PEN);
+  dc.SetPen(*wxTRANSPARENT_PEN);

 
   // Draw grey background
 
   // Draw grey background

-  if (view->GetTabStyle() & wxTAB_STYLE_COLOUR_INTERIOR)
+  if (m_view->GetTabStyle() & wxTAB_STYLE_COLOUR_INTERIOR)

   {
   {

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

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

+#ifdef __WXMOTIF__
+    dc.DrawRectangle(tabX, tabY, (GetWidth()+1), (GetHeight() + tabHeightInc));
+#else

     dc.DrawRectangle(tabX, tabY, (GetWidth()+1), (GetHeight() + 1 + tabHeightInc));
     dc.DrawRectangle(tabX, tabY, (GetWidth()+1), (GetHeight() + 1 + tabHeightInc));

+#endif

   }
   
   // Draw highlight and shadow
   }
   
   // Draw highlight and shadow

-  dc.SetPen(m_view->GetHighlightPen());
+  dc.SetPen(*m_view->GetHighlightPen());

 
   // Calculate the top of the tab beneath. It's the height of the tab, MINUS
   // a bit if the tab below happens to be selected. Check.
 
   // Calculate the top of the tab beneath. It's the height of the tab, MINUS
   // a bit if the tab below happens to be selected. Check.


@@ -107,7 +114,7 @@ void wxTabControl::OnDraw(wxDC& dc, bool lastInRow)
     dc.DrawLine(tabX, tabY, tabX, (tabY + GetHeight() + tabHeightInc - subtractThis));
 
   dc.DrawLine(tabX, tabY, (tabX + GetWidth()), tabY);
     dc.DrawLine(tabX, tabY, tabX, (tabY + GetHeight() + tabHeightInc - subtractThis));
 
   dc.DrawLine(tabX, tabY, (tabX + GetWidth()), tabY);

-  dc.SetPen(m_view->GetShadowPen());
+  dc.SetPen(*m_view->GetShadowPen());

 
   // Test if we're outside the right-hand edge of the view area
   if (((tabX + GetWidth()) >= m_view->GetViewRect().x + m_view->GetViewRect().width) && (m_view->GetTabStyle() & wxTAB_STYLE_DRAW_BOX))
 
   // Test if we're outside the right-hand edge of the view area
   if (((tabX + GetWidth()) >= m_view->GetViewRect().x + m_view->GetViewRect().width) && (m_view->GetTabStyle() & wxTAB_STYLE_DRAW_BOX))


@@ -126,7 +133,7 @@ void wxTabControl::OnDraw(wxDC& dc, bool lastInRow)
       (tabX + GetWidth()), (bottomY-1));
 
     // Draw black line to emphasize shadow
       (tabX + GetWidth()), (bottomY-1));
 
     // Draw black line to emphasize shadow

-    dc.SetPen(wxBLACK_PEN);
+    dc.SetPen(*wxBLACK_PEN);

     dc.DrawLine((tabX + GetWidth() + 1), (tabY+1),
       (tabX + GetWidth() + 1), bottomY);
 
     dc.DrawLine((tabX + GetWidth() + 1), (tabY+1),
       (tabX + GetWidth() + 1), bottomY);
 


@@ -145,13 +152,17 @@ void wxTabControl::OnDraw(wxDC& dc, bool lastInRow)
       int maxPositions = ((wxTabLayer *)m_view->GetLayers().Nth(0)->Data())->Number();
 
       // Only down to the bottom of the tab, not to the top of the view
       int maxPositions = ((wxTabLayer *)m_view->GetLayers().Nth(0)->Data())->Number();
 
       // Only down to the bottom of the tab, not to the top of the view

-      if ( GetColPosition() < maxPositions )
+      if ( GetRowPosition() < (maxPositions - 1) )

         topY = tabY + GetHeight() + tabHeightInc;
 
         topY = tabY + GetHeight() + tabHeightInc;
 

+#ifdef __WXMOTIF__
+      topY -= 1;
+#endif
+

       // Shadow
       dc.DrawLine((tabX + GetWidth()), tabY, (tabX + GetWidth()), topY);
       // Draw black line to emphasize shadow
       // Shadow
       dc.DrawLine((tabX + GetWidth()), tabY, (tabX + GetWidth()), topY);
       // Draw black line to emphasize shadow

-      dc.SetPen(wxBLACK_PEN);
+      dc.SetPen(*wxBLACK_PEN);

       dc.DrawLine((tabX + GetWidth() + 1), (tabY+1), (tabX + GetWidth() + 1),
          topY);
     }
       dc.DrawLine((tabX + GetWidth() + 1), (tabY+1), (tabX + GetWidth() + 1),
          topY);
     }


@@ -166,12 +177,16 @@ void wxTabControl::OnDraw(wxDC& dc, bool lastInRow)
       if (tabBeneath && tabBeneath->IsSelected())
         subtractThis = (m_view->GetTabSelectionHeight() - m_view->GetTabHeight());
 
       if (tabBeneath && tabBeneath->IsSelected())
         subtractThis = (m_view->GetTabSelectionHeight() - m_view->GetTabHeight());
 

+#ifdef __WXMOTIF__
+      subtractThis += 1;
+#endif
+

       // Draw only to next tab down.
       dc.DrawLine((tabX + GetWidth()), tabY,
          (tabX + GetWidth()), (tabY + GetHeight() + tabHeightInc - subtractThis));
 
       // Draw black line to emphasize shadow
       // Draw only to next tab down.
       dc.DrawLine((tabX + GetWidth()), tabY,
          (tabX + GetWidth()), (tabY + GetHeight() + tabHeightInc - subtractThis));
 
       // Draw black line to emphasize shadow

-      dc.SetPen(wxBLACK_PEN);
+      dc.SetPen(*wxBLACK_PEN);

       dc.DrawLine((tabX + GetWidth() + 1), (tabY+1), (tabX + GetWidth() + 1),
          (tabY + GetHeight() + tabHeightInc - subtractThis));
     }
       dc.DrawLine((tabX + GetWidth() + 1), (tabY+1), (tabX + GetWidth() + 1),
          (tabY + GetHeight() + tabHeightInc - subtractThis));
     }


@@ -181,15 +196,14 @@ void wxTabControl::OnDraw(wxDC& dc, bool lastInRow)
   int textY = tabY + m_view->GetVerticalTabTextSpacing() + tabHeightInc;
 
   if (m_isSelected)
   int textY = tabY + m_view->GetVerticalTabTextSpacing() + tabHeightInc;
 
   if (m_isSelected)

-    dc.SetFont(m_view->GetSelectedTabFont());
+    dc.SetFont(* m_view->GetSelectedTabFont());

   else
   else

-    dc.SetFont(GetFont());
+    dc.SetFont(* GetFont());

 
   wxColour col(m_view->GetTextColour());
 
   wxColour col(m_view->GetTextColour());

-  dc.SetTextForeground(&col);
-//  dc.SetTextForeground(&(m_view->GetTextColour()));
+  dc.SetTextForeground(col);

   dc.SetBackgroundMode(wxTRANSPARENT);
   dc.SetBackgroundMode(wxTRANSPARENT);

-  float textWidth, textHeight;
+  long 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);


@@ -197,7 +211,7 @@ void wxTabControl::OnDraw(wxDC& dc, bool lastInRow)
 
   if (m_isSelected)
   {
 
   if (m_isSelected)
   {

-    dc.SetPen(m_view->GetHighlightPen());
+    dc.SetPen(*m_view->GetHighlightPen());

 
     // Draw white highlight from the tab's left side to the left hand edge of the view
     dc.DrawLine(m_view->GetViewRect().x, (tabY + GetHeight() + tabHeightInc),
 
     // Draw white highlight from the tab's left side to the left hand edge of the view
     dc.DrawLine(m_view->GetViewRect().x, (tabY + GetHeight() + tabHeightInc),


@@ -207,10 +221,9 @@ void wxTabControl::OnDraw(wxDC& dc, bool lastInRow)
     dc.DrawLine((tabX + GetWidth()), (tabY + GetHeight() + tabHeightInc),
      m_view->GetViewRect().x + m_view->GetViewRect().width, (tabY + GetHeight() + tabHeightInc));
   }
     dc.DrawLine((tabX + GetWidth()), (tabY + GetHeight() + tabHeightInc),
      m_view->GetViewRect().x + m_view->GetViewRect().width, (tabY + GetHeight() + tabHeightInc));
   }

-#endif
+#else
+    // New HEL version with rounder tabs

 
 

-// New HEL version with rounder tabs
-#if 1

        if (!m_view) return;
 
        int tabInc   = 0;
        if (!m_view) return;
 
        int tabInc   = 0;


@@ -508,16 +521,20 @@ wxTabView::wxTabView(long style)
   m_shadowPen = wxGREY_PEN;
   m_backgroundPen = wxLIGHT_GREY_PEN;
   m_backgroundBrush = wxLIGHT_GREY_BRUSH;
   m_shadowPen = wxGREY_PEN;
   m_backgroundPen = wxLIGHT_GREY_PEN;
   m_backgroundBrush = wxLIGHT_GREY_BRUSH;

-  m_tabFont = wxTheFontList->FindOrCreateFont(9, wxSWISS, wxNORMAL, wxNORMAL);
-  m_tabSelectedFont = wxTheFontList->FindOrCreateFont(9, wxSWISS, wxNORMAL, wxBOLD);
+  m_tabFont = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
+  m_tabSelectedFont = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);

   m_window = (wxWindow *) NULL;
 }
 
 wxTabView::~wxTabView()
 {
   m_window = (wxWindow *) NULL;
 }
 
 wxTabView::~wxTabView()
 {

+  ClearTabs(TRUE);

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

+// TODO: this should just add the tab to a list, and then
+// a layout function (e.g. Realize) should be called when all tabs have been added.
+// The view rect could easily change as the view window is resized.

 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.


@@ -573,7 +590,7 @@ wxTabControl *wxTabView::AddTab(int id, const wxString& label, wxTabControl *exi
   tabControl->SetSize(GetTabWidth(), GetTabHeight());
   tabControl->SetId(id);
   tabControl->SetLabel(label);
   tabControl->SetSize(GetTabWidth(), GetTabHeight());
   tabControl->SetId(id);
   tabControl->SetLabel(label);

-  tabControl->SetFont(GetTabFont());
+  tabControl->SetFont(* GetTabFont());

   
   tabLayer->Append(tabControl);
   m_noTabs ++;
   
   tabLayer->Append(tabControl);
   m_noTabs ++;


@@ -581,6 +598,32 @@ wxTabControl *wxTabView::AddTab(int id, const wxString& label, wxTabControl *exi
   return tabControl;
 }
   
   return tabControl;
 }
   

+// Returns the total height of the tabs component -- this may be several
+// times the height of a tab, if there are several tab layers (rows).
+int wxTabView::GetTotalTabHeight()
+{
+  int minY = 0;
+
+  wxNode *layerNode = m_layers.First();
+  while (layerNode)
+  {
+    wxTabLayer *layer = (wxTabLayer *)layerNode->Data();
+    wxNode *tabNode = layer->First();
+    while (tabNode)
+    {
+      wxTabControl *tab = (wxTabControl *)tabNode->Data();
+
+      if (tab->GetY() < minY)
+        minY = tab->GetY();
+
+      tabNode = tabNode->Next();
+    }
+    layerNode = layerNode->Next();
+  }
+
+  return - minY;
+}
+

 void wxTabView::ClearTabs(bool deleteTabs)
 {
   wxNode *layerNode = m_layers.First();
 void wxTabView::ClearTabs(bool deleteTabs)
 {
   wxNode *layerNode = m_layers.First();


@@ -603,7 +646,8 @@ void wxTabView::ClearTabs(bool deleteTabs)
     layerNode = nextLayerNode;
   }
 }
     layerNode = nextLayerNode;
   }
 }

-  
+
+

 // Layout tabs (optional, e.g. if resizing window)
 void wxTabView::Layout(void)
 {
 // Layout tabs (optional, e.g. if resizing window)
 void wxTabView::Layout(void)
 {


@@ -720,7 +764,7 @@ void wxTabView::Draw(wxDC& dc)
        }
 
 
        }
 
 

-#if 0
+#ifndef wxUSE_NEW_METHOD

        if (GetTabStyle() & wxTAB_STYLE_DRAW_BOX)
        {
                dc.SetPen(GetShadowPen());
        if (GetTabStyle() & wxTAB_STYLE_DRAW_BOX)
        {
                dc.SetPen(GetShadowPen());


@@ -729,7 +773,7 @@ void wxTabView::Draw(wxDC& dc)
                dc.DrawLine(
                                (GetViewRect().x + 1),
                                (GetViewRect().y + GetViewRect().height),
                dc.DrawLine(
                                (GetViewRect().x + 1),
                                (GetViewRect().y + GetViewRect().height),

-                               (GetViewRect().x + GetViewRect().width),
+                               (GetViewRect().x + GetViewRect().width + 1),

                                (GetViewRect().y + GetViewRect().height)
                                );
 
                                (GetViewRect().y + GetViewRect().height)
                                );
 


@@ -747,7 +791,12 @@ void wxTabView::Draw(wxDC& dc)
                dc.DrawLine(
                                (GetViewRect().x),
                                (GetViewRect().y + GetViewRect().height + 1),
                dc.DrawLine(
                                (GetViewRect().x),
                                (GetViewRect().y + GetViewRect().height + 1),

-                               (GetViewRect().x + GetViewRect().width),
+#if defined(__WXMOTIF__)
+                               (GetViewRect().x + GetViewRect().width + 1),
+#else
+                               (GetViewRect().x + GetViewRect().width + 2),
+#endif
+

                                (GetViewRect().y + GetViewRect().height + 1)
                                );
 
                                (GetViewRect().y + GetViewRect().height + 1)
                                );
 


@@ -1088,7 +1137,7 @@ void wxTabbedPanel::OnPaint(wxPaintEvent& WXUNUSED(event) )
 }
 
 /*
 }
 
 /*

- * wxDialogTabView
+ * wxPanelTabView

  */
  
 IMPLEMENT_CLASS(wxPanelTabView, wxTabView)
  */
  
 IMPLEMENT_CLASS(wxPanelTabView, wxTabView)