fix warnings about hiding virtual wxGraphicsContext::DrawText() overloads by using...

[wxWidgets.git] / src / aui / auibar.cpp

diff --git a/src/aui/auibar.cpp b/src/aui/auibar.cpp
index 9fb1f57e76a1087b2c4a82a6e2995b9e3dace5e2..03789c7a4c79a39eb7e2bfcef9f6a49fa4658494 100644 (file)
--- a/src/aui/auibar.cpp
+++ b/src/aui/auibar.cpp
@@ -5,7 +5,7 @@
 // Author:      Benjamin I. Williams
 // Modified by:
 // Created:     2005-05-17
 // Author:      Benjamin I. Williams
 // Modified by:
 // Created:     2005-05-17

-// RCS-ID:      $Id: dockart.cpp 48848 2007-09-21 10:19:53Z SC $
+// RCS-ID:      $Id$

 // Copyright:   (C) Copyright 2005-2006, Kirix Corporation, All Rights Reserved
 // Licence:     wxWindows Library Licence, Version 3.1
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (C) Copyright 2005-2006, Kirix Corporation, All Rights Reserved
 // Licence:     wxWindows Library Licence, Version 3.1
 ///////////////////////////////////////////////////////////////////////////////


@@ -38,6 +38,8 @@
 
 #ifdef __WXMAC__
 #include "wx/osx/private.h"
 
 #ifdef __WXMAC__
 #include "wx/osx/private.h"

+// for themeing support
+#include <Carbon/Carbon.h>

 #endif
 
 #include "wx/arrimpl.cpp"
 #endif
 
 #include "wx/arrimpl.cpp"


@@ -824,7 +826,7 @@ wxAuiToolBar::wxAuiToolBar(wxWindow* parent,
     SetFont(*wxNORMAL_FONT);
     m_art->SetFlags((unsigned int)m_style);
     SetExtraStyle(wxWS_EX_PROCESS_IDLE);
     SetFont(*wxNORMAL_FONT);
     m_art->SetFlags((unsigned int)m_style);
     SetExtraStyle(wxWS_EX_PROCESS_IDLE);

-    if (style & wxAUI_TB_HORZ_TEXT)
+    if (style & wxAUI_TB_HORZ_LAYOUT)

         SetToolTextOrientation(wxAUI_TBTOOL_TEXT_RIGHT);
 }
 
         SetToolTextOrientation(wxAUI_TBTOOL_TEXT_RIGHT);
 }
 


@@ -857,7 +859,7 @@ void wxAuiToolBar::SetWindowStyleFlag(long style)
     else
         m_overflow_visible = false;
 
     else
         m_overflow_visible = false;
 

-    if (style & wxAUI_TB_HORZ_TEXT)
+    if (style & wxAUI_TB_HORZ_LAYOUT)

         SetToolTextOrientation(wxAUI_TBTOOL_TEXT_RIGHT);
     else
         SetToolTextOrientation(wxAUI_TBTOOL_TEXT_BOTTOM);
         SetToolTextOrientation(wxAUI_TBTOOL_TEXT_RIGHT);
     else
         SetToolTextOrientation(wxAUI_TBTOOL_TEXT_BOTTOM);


@@ -885,13 +887,13 @@ wxAuiToolBarArt* wxAuiToolBar::GetArtProvider() const
 
 
 
 
 
 

-void wxAuiToolBar::AddTool(int tool_id,
+wxAuiToolBarItem* wxAuiToolBar::AddTool(int tool_id,

                            const wxString& label,
                            const wxBitmap& bitmap,
                            const wxString& short_help_string,
                            wxItemKind kind)
 {
                            const wxString& label,
                            const wxBitmap& bitmap,
                            const wxString& short_help_string,
                            wxItemKind kind)
 {

-    AddTool(tool_id,
+    return AddTool(tool_id,

             label,
             bitmap,
             wxNullBitmap,
             label,
             bitmap,
             wxNullBitmap,


@@ -902,7 +904,7 @@ void wxAuiToolBar::AddTool(int tool_id,
 }
 
 
 }
 
 

-void wxAuiToolBar::AddTool(int tool_id,
+wxAuiToolBarItem* wxAuiToolBar::AddTool(int tool_id,

                            const wxString& label,
                            const wxBitmap& bitmap,
                            const wxBitmap& disabled_bitmap,
                            const wxString& label,
                            const wxBitmap& bitmap,
                            const wxBitmap& disabled_bitmap,


@@ -941,11 +943,11 @@ void wxAuiToolBar::AddTool(int tool_id,
             item.disabled_bitmap = MakeDisabledBitmap(item.bitmap);
         }
     }
             item.disabled_bitmap = MakeDisabledBitmap(item.bitmap);
         }
     }

-

     m_items.Add(item);
     m_items.Add(item);

+    return &m_items.Last();

 }
 
 }
 

-void wxAuiToolBar::AddControl(wxControl* control,
+wxAuiToolBarItem* wxAuiToolBar::AddControl(wxControl* control,

                               const wxString& label)
 {
     wxAuiToolBarItem item;
                               const wxString& label)
 {
     wxAuiToolBarItem item;


@@ -966,9 +968,10 @@ void wxAuiToolBar::AddControl(wxControl* control,
     item.sticky = false;
 
     m_items.Add(item);
     item.sticky = false;
 
     m_items.Add(item);

+    return &m_items.Last();

 }
 
 }
 

-void wxAuiToolBar::AddLabel(int tool_id,
+wxAuiToolBarItem* wxAuiToolBar::AddLabel(int tool_id,

                             const wxString& label,
                             const int width)
 {
                             const wxString& label,
                             const int width)
 {


@@ -994,9 +997,10 @@ void wxAuiToolBar::AddLabel(int tool_id,
     item.sticky = false;
 
     m_items.Add(item);
     item.sticky = false;
 
     m_items.Add(item);

+    return &m_items.Last();

 }
 
 }
 

-void wxAuiToolBar::AddSeparator()
+wxAuiToolBarItem* wxAuiToolBar::AddSeparator()

 {
     wxAuiToolBarItem item;
     item.window = NULL;
 {
     wxAuiToolBarItem item;
     item.window = NULL;


@@ -1015,9 +1019,10 @@ void wxAuiToolBar::AddSeparator()
     item.sticky = false;
 
     m_items.Add(item);
     item.sticky = false;
 
     m_items.Add(item);

+    return &m_items.Last();

 }
 
 }
 

-void wxAuiToolBar::AddSpacer(int pixels)
+wxAuiToolBarItem* wxAuiToolBar::AddSpacer(int pixels)

 {
     wxAuiToolBarItem item;
     item.window = NULL;
 {
     wxAuiToolBarItem item;
     item.window = NULL;


@@ -1037,9 +1042,10 @@ void wxAuiToolBar::AddSpacer(int pixels)
     item.sticky = false;
 
     m_items.Add(item);
     item.sticky = false;
 
     m_items.Add(item);

+    return &m_items.Last();

 }
 
 }
 

-void wxAuiToolBar::AddStretchSpacer(int proportion)
+wxAuiToolBarItem* wxAuiToolBar::AddStretchSpacer(int proportion)

 {
     wxAuiToolBarItem item;
     item.window = NULL;
 {
     wxAuiToolBarItem item;
     item.window = NULL;


@@ -1059,6 +1065,7 @@ void wxAuiToolBar::AddStretchSpacer(int proportion)
     item.sticky = false;
 
     m_items.Add(item);
     item.sticky = false;
 
     m_items.Add(item);

+    return &m_items.Last();

 }
 
 void wxAuiToolBar::Clear()
 }
 
 void wxAuiToolBar::Clear()


@@ -1784,7 +1791,9 @@ bool wxAuiToolBar::Realize()
                 vert_sizer->AddStretchSpacer(1);
                 ctrl_sizer_item = vert_sizer->Add(item.window, 0, wxEXPAND);
                 vert_sizer->AddStretchSpacer(1);
                 vert_sizer->AddStretchSpacer(1);
                 ctrl_sizer_item = vert_sizer->Add(item.window, 0, wxEXPAND);
                 vert_sizer->AddStretchSpacer(1);

-                if ( (m_style & wxAUI_TB_TEXT) && !item.GetLabel().empty() )
+                if ( (m_style & wxAUI_TB_TEXT) &&
+                     m_tool_text_orientation == wxAUI_TBTOOL_TEXT_BOTTOM &&
+                     !item.GetLabel().empty() )

                 {
                     wxSize s = GetLabelSize(item.GetLabel());
                     vert_sizer->Add(1, s.y);
                 {
                     wxSize s = GetLabelSize(item.GetLabel());
                     vert_sizer->Add(1, s.y);