no real changes, just fixed all occurences of 'occurence' typo

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

diff --git a/src/aui/auibar.cpp b/src/aui/auibar.cpp
index 009f435fc2977bcb42e34ac0cd22f83a816f6a84..da42c3bc4269d261471d523f9f6a893569e4fa49 100644 (file)
--- a/src/aui/auibar.cpp
+++ b/src/aui/auibar.cpp
@@ -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"


@@ -259,7 +261,7 @@ void wxAuiDefaultToolBarArt::DrawLabel(
     int text_x, text_y;
     text_x = rect.x + 1;
     text_y = rect.y + (rect.height-text_height)/2;
     int text_x, text_y;
     text_x = rect.x + 1;
     text_y = rect.y + (rect.height-text_height)/2;

-    dc.DrawText(item.label, text_x, text_y);
+    dc.DrawText(item.GetLabel(), text_x, text_y);

     dc.DestroyClippingRegion();
 }
 
     dc.DestroyClippingRegion();
 }
 


@@ -280,7 +282,7 @@ void wxAuiDefaultToolBarArt::DrawButton(
 
         dc.GetTextExtent(wxT("ABCDHgj"), &tx, &text_height);
         text_width = 0;
 
         dc.GetTextExtent(wxT("ABCDHgj"), &tx, &text_height);
         text_width = 0;

-        dc.GetTextExtent(item.label, &text_width, &ty);
+        dc.GetTextExtent(item.GetLabel(), &text_width, &ty);

     }
 
     int bmp_x = 0, bmp_y = 0;
     }
 
     int bmp_x = 0, bmp_y = 0;


@@ -290,51 +292,51 @@ void wxAuiDefaultToolBarArt::DrawButton(
     {
         bmp_x = rect.x +
                 (rect.width/2) -
     {
         bmp_x = rect.x +
                 (rect.width/2) -

-                (item.bitmap.GetWidth()/2);
+                (item.GetBitmap().GetWidth()/2);

 
         bmp_y = rect.y +
                 ((rect.height-text_height)/2) -
 
         bmp_y = rect.y +
                 ((rect.height-text_height)/2) -

-                (item.bitmap.GetHeight()/2);
+                (item.GetBitmap().GetHeight()/2);

 
         text_x = rect.x + (rect.width/2) - (text_width/2) + 1;
         text_y = rect.y + rect.height - text_height - 1;
     }
 
         text_x = rect.x + (rect.width/2) - (text_width/2) + 1;
         text_y = rect.y + rect.height - text_height - 1;
     }

-     else if (m_text_orientation == wxAUI_TBTOOL_TEXT_RIGHT)
+    else if (m_text_orientation == wxAUI_TBTOOL_TEXT_RIGHT)

     {
         bmp_x = rect.x + 3;
 
         bmp_y = rect.y +
                 (rect.height/2) -
     {
         bmp_x = rect.x + 3;
 
         bmp_y = rect.y +
                 (rect.height/2) -

-                (item.bitmap.GetHeight()/2);
+                (item.GetBitmap().GetHeight()/2);

 
 

-        text_x = bmp_x + 3 + item.bitmap.GetWidth();
+        text_x = bmp_x + 3 + item.GetBitmap().GetWidth();

         text_y = rect.y +
                  (rect.height/2) -
                  (text_height/2);
     }
 
 
         text_y = rect.y +
                  (rect.height/2) -
                  (text_height/2);
     }
 
 

-    if (!(item.state & wxAUI_BUTTON_STATE_DISABLED))
+    if (!(item.GetState() & wxAUI_BUTTON_STATE_DISABLED))

     {
     {

-        if (item.state & wxAUI_BUTTON_STATE_PRESSED)
+        if (item.GetState() & wxAUI_BUTTON_STATE_PRESSED)

         {
             dc.SetPen(wxPen(m_highlight_colour));
             dc.SetBrush(wxBrush(wxAuiStepColour(m_highlight_colour, 150)));
             dc.DrawRectangle(rect);
         }
         {
             dc.SetPen(wxPen(m_highlight_colour));
             dc.SetBrush(wxBrush(wxAuiStepColour(m_highlight_colour, 150)));
             dc.DrawRectangle(rect);
         }

-         else if ((item.state & wxAUI_BUTTON_STATE_HOVER) || item.sticky == true)
+        else if ((item.GetState() & wxAUI_BUTTON_STATE_HOVER) || item.IsSticky())

         {
             dc.SetPen(wxPen(m_highlight_colour));
             dc.SetBrush(wxBrush(wxAuiStepColour(m_highlight_colour, 170)));
 
             // draw an even lighter background for checked item hovers (since
             // the hover background is the same color as the check background)
         {
             dc.SetPen(wxPen(m_highlight_colour));
             dc.SetBrush(wxBrush(wxAuiStepColour(m_highlight_colour, 170)));
 
             // draw an even lighter background for checked item hovers (since
             // the hover background is the same color as the check background)

-            if (item.state & wxAUI_BUTTON_STATE_CHECKED)
+            if (item.GetState() & wxAUI_BUTTON_STATE_CHECKED)

                 dc.SetBrush(wxBrush(wxAuiStepColour(m_highlight_colour, 180)));
 
             dc.DrawRectangle(rect);
         }
                 dc.SetBrush(wxBrush(wxAuiStepColour(m_highlight_colour, 180)));
 
             dc.DrawRectangle(rect);
         }

-         else if (item.state & wxAUI_BUTTON_STATE_CHECKED)
+        else if (item.GetState() & wxAUI_BUTTON_STATE_CHECKED)

         {
             // it's important to put this code in an else statment after the
             // hover, otherwise hovers won't draw properly for checked items
         {
             // it's important to put this code in an else statment after the
             // hover, otherwise hovers won't draw properly for checked items


@@ -345,10 +347,10 @@ void wxAuiDefaultToolBarArt::DrawButton(
     }
 
     wxBitmap bmp;
     }
 
     wxBitmap bmp;

-    if (item.state & wxAUI_BUTTON_STATE_DISABLED)
-        bmp = item.disabled_bitmap;
-         else
-        bmp = item.bitmap;
+    if (item.GetState() & wxAUI_BUTTON_STATE_DISABLED)
+        bmp = item.GetDisabledBitmap();
+    else
+        bmp = item.GetBitmap();

 
     if (!bmp.IsOk())
         return;
 
     if (!bmp.IsOk())
         return;


@@ -357,12 +359,12 @@ void wxAuiDefaultToolBarArt::DrawButton(
 
     // set the item's text color based on if it is disabled
     dc.SetTextForeground(*wxBLACK);
 
     // set the item's text color based on if it is disabled
     dc.SetTextForeground(*wxBLACK);

-    if (item.state & wxAUI_BUTTON_STATE_DISABLED)
+    if (item.GetState() & wxAUI_BUTTON_STATE_DISABLED)

         dc.SetTextForeground(DISABLED_TEXT_COLOR);
 
         dc.SetTextForeground(DISABLED_TEXT_COLOR);
 

-    if ((m_flags & wxAUI_TB_TEXT) && item.label.Length() > 0)
+    if ( (m_flags & wxAUI_TB_TEXT) && !item.GetLabel().empty() )

     {
     {

-        dc.DrawText(item.label, text_x, text_y);
+        dc.DrawText(item.GetLabel(), text_x, text_y);

     }
 }
 
     }
 }
 


@@ -396,7 +398,7 @@ void wxAuiDefaultToolBarArt::DrawDropDownButton(
             text_width = 0;
         }
 
             text_width = 0;
         }
 

-        dc.GetTextExtent(item.label, &text_width, &ty);
+        dc.GetTextExtent(item.GetLabel(), &text_width, &ty);

     }
 
 
     }
 
 


@@ -413,38 +415,38 @@ void wxAuiDefaultToolBarArt::DrawDropDownButton(
     {
         bmp_x = button_rect.x +
                 (button_rect.width/2) -
     {
         bmp_x = button_rect.x +
                 (button_rect.width/2) -

-                (item.bitmap.GetWidth()/2);
+                (item.GetBitmap().GetWidth()/2);

         bmp_y = button_rect.y +
                 ((button_rect.height-text_height)/2) -
         bmp_y = button_rect.y +
                 ((button_rect.height-text_height)/2) -

-                (item.bitmap.GetHeight()/2);
+                (item.GetBitmap().GetHeight()/2);

 
         text_x = rect.x + (rect.width/2) - (text_width/2) + 1;
         text_y = rect.y + rect.height - text_height - 1;
     }
 
         text_x = rect.x + (rect.width/2) - (text_width/2) + 1;
         text_y = rect.y + rect.height - text_height - 1;
     }

-     else if (m_text_orientation == wxAUI_TBTOOL_TEXT_RIGHT)
+    else if (m_text_orientation == wxAUI_TBTOOL_TEXT_RIGHT)

     {
         bmp_x = rect.x + 3;
 
         bmp_y = rect.y +
                 (rect.height/2) -
     {
         bmp_x = rect.x + 3;
 
         bmp_y = rect.y +
                 (rect.height/2) -

-                (item.bitmap.GetHeight()/2);
+                (item.GetBitmap().GetHeight()/2);

 
 

-        text_x = bmp_x + 3 + item.bitmap.GetWidth();
+        text_x = bmp_x + 3 + item.GetBitmap().GetWidth();

         text_y = rect.y +
                  (rect.height/2) -
                  (text_height/2);
     }
 
 
         text_y = rect.y +
                  (rect.height/2) -
                  (text_height/2);
     }
 
 

-    if (item.state & wxAUI_BUTTON_STATE_PRESSED)
+    if (item.GetState() & wxAUI_BUTTON_STATE_PRESSED)

     {
         dc.SetPen(wxPen(m_highlight_colour));
         dc.SetBrush(wxBrush(wxAuiStepColour(m_highlight_colour, 140)));
         dc.DrawRectangle(button_rect);
         dc.DrawRectangle(dropdown_rect);
     }
     {
         dc.SetPen(wxPen(m_highlight_colour));
         dc.SetBrush(wxBrush(wxAuiStepColour(m_highlight_colour, 140)));
         dc.DrawRectangle(button_rect);
         dc.DrawRectangle(dropdown_rect);
     }

-     else if (item.state & wxAUI_BUTTON_STATE_HOVER ||
-              item.sticky == true)
+    else if (item.GetState() & wxAUI_BUTTON_STATE_HOVER ||
+             item.IsSticky())

     {
         dc.SetPen(wxPen(m_highlight_colour));
         dc.SetBrush(wxBrush(wxAuiStepColour(m_highlight_colour, 170)));
     {
         dc.SetPen(wxPen(m_highlight_colour));
         dc.SetBrush(wxBrush(wxAuiStepColour(m_highlight_colour, 170)));


@@ -454,14 +456,14 @@ void wxAuiDefaultToolBarArt::DrawDropDownButton(
 
     wxBitmap bmp;
     wxBitmap dropbmp;
 
     wxBitmap bmp;
     wxBitmap dropbmp;

-    if (item.state & wxAUI_BUTTON_STATE_DISABLED)
+    if (item.GetState() & wxAUI_BUTTON_STATE_DISABLED)

     {
     {

-        bmp = item.disabled_bitmap;
+        bmp = item.GetDisabledBitmap();

         dropbmp = m_disabled_button_dropdown_bmp;
     }
         dropbmp = m_disabled_button_dropdown_bmp;
     }

-     else
+    else

     {
     {

-        bmp = item.bitmap;
+        bmp = item.GetBitmap();

         dropbmp = m_button_dropdown_bmp;
     }
 
         dropbmp = m_button_dropdown_bmp;
     }
 


@@ -473,12 +475,12 @@ void wxAuiDefaultToolBarArt::DrawDropDownButton(
 
     // set the item's text color based on if it is disabled
     dc.SetTextForeground(*wxBLACK);
 
     // set the item's text color based on if it is disabled
     dc.SetTextForeground(*wxBLACK);

-    if (item.state & wxAUI_BUTTON_STATE_DISABLED)
+    if (item.GetState() & wxAUI_BUTTON_STATE_DISABLED)

         dc.SetTextForeground(DISABLED_TEXT_COLOR);
 
         dc.SetTextForeground(DISABLED_TEXT_COLOR);
 

-    if ((m_flags & wxAUI_TB_TEXT) && item.label.Length() > 0)
+    if ( (m_flags & wxAUI_TB_TEXT) && !item.GetLabel().empty() )

     {
     {

-        dc.DrawText(item.label, text_x, text_y);
+        dc.DrawText(item.GetLabel(), text_x, text_y);

     }
 }
 
     }
 }
 


@@ -506,7 +508,7 @@ void wxAuiDefaultToolBarArt::DrawControlLabel(
         text_width = 0;
     }
 
         text_width = 0;
     }
 

-    dc.GetTextExtent(item.label, &text_width, &ty);
+    dc.GetTextExtent(item.GetLabel(), &text_width, &ty);

 
     // don't draw the label if it is wider than the item width
     if (text_width > rect.width)
 
     // don't draw the label if it is wider than the item width
     if (text_width > rect.width)


@@ -518,9 +520,9 @@ void wxAuiDefaultToolBarArt::DrawControlLabel(
     text_x = rect.x + (rect.width/2) - (text_width/2) + 1;
     text_y = rect.y + rect.height - text_height - 1;
 
     text_x = rect.x + (rect.width/2) - (text_width/2) + 1;
     text_y = rect.y + rect.height - text_height - 1;
 

-    if ((m_flags & wxAUI_TB_TEXT) && item.label.Length() > 0)
+    if ( (m_flags & wxAUI_TB_TEXT) && !item.GetLabel().empty() )

     {
     {

-        dc.DrawText(item.label, text_x, text_y);
+        dc.DrawText(item.GetLabel(), text_x, text_y);

     }
 }
 
     }
 }
 


@@ -536,7 +538,7 @@ wxSize wxAuiDefaultToolBarArt::GetLabelSize(
     dc.GetTextExtent(wxT("ABCDHgj"), &width, &height);
 
     // get item's width
     dc.GetTextExtent(wxT("ABCDHgj"), &width, &height);
 
     // get item's width

-    width = item.min_size.GetWidth();
+    width = item.GetMinSize().GetWidth();

 
     return wxSize(width, height);
 }
 
     return wxSize(width, height);
 }


@@ -546,11 +548,11 @@ wxSize wxAuiDefaultToolBarArt::GetToolSize(
                                         wxWindow* WXUNUSED(wnd),
                                         const wxAuiToolBarItem& item)
 {
                                         wxWindow* WXUNUSED(wnd),
                                         const wxAuiToolBarItem& item)
 {

-    if (!item.bitmap.IsOk() && !(m_flags & wxAUI_TB_TEXT))
+    if (!item.GetBitmap().IsOk() && !(m_flags & wxAUI_TB_TEXT))

         return wxSize(16,16);
 
         return wxSize(16,16);
 

-    int width = item.bitmap.GetWidth();
-    int height = item.bitmap.GetHeight();
+    int width = item.GetBitmap().GetWidth();
+    int height = item.GetBitmap().GetHeight();

 
     if (m_flags & wxAUI_TB_TEXT)
     {
 
     if (m_flags & wxAUI_TB_TEXT)
     {


@@ -562,20 +564,21 @@ wxSize wxAuiDefaultToolBarArt::GetToolSize(
             dc.GetTextExtent(wxT("ABCDHgj"), &tx, &ty);
             height += ty;
 
             dc.GetTextExtent(wxT("ABCDHgj"), &tx, &ty);
             height += ty;
 

-            if (item.label.Length() > 0)
+            if ( !item.GetLabel().empty() )

             {
             {

-                dc.GetTextExtent(item.label, &tx, &ty);
+                dc.GetTextExtent(item.GetLabel(), &tx, &ty);

                 width = wxMax(width, tx+6);
             }
         }
                 width = wxMax(width, tx+6);
             }
         }

-         else if (m_text_orientation == wxAUI_TBTOOL_TEXT_RIGHT && item.label.Length() > 0)
+        else if ( m_text_orientation == wxAUI_TBTOOL_TEXT_RIGHT &&
+                  !item.GetLabel().empty() )

         {
             width += 3; // space between left border and bitmap
             width += 3; // space between bitmap and text
 
         {
             width += 3; // space between left border and bitmap
             width += 3; // space between bitmap and text
 

-            if (item.label.Length() > 0)
+            if ( !item.GetLabel().empty() )

             {
             {

-                dc.GetTextExtent(item.label, &tx, &ty);
+                dc.GetTextExtent(item.GetLabel(), &tx, &ty);

                 width += tx;
                 height = wxMax(height, ty);
             }
                 width += tx;
                 height = wxMax(height, ty);
             }


@@ -583,7 +586,7 @@ wxSize wxAuiDefaultToolBarArt::GetToolSize(
     }
 
     // if the tool has a dropdown button, add it to the width
     }
 
     // if the tool has a dropdown button, add it to the width

-    if (item.dropdown == true)
+    if (item.HasDropDown())

         width += (BUTTON_DROPDOWN_WIDTH+4);
 
     return wxSize(width, height);
         width += (BUTTON_DROPDOWN_WIDTH+4);
 
     return wxSize(width, height);


@@ -608,7 +611,7 @@ void wxAuiDefaultToolBarArt::DrawSeparator(
         rect.y += (rect.height/2) - (new_height/2);
         rect.height = new_height;
     }
         rect.y += (rect.height/2) - (new_height/2);
         rect.height = new_height;
     }

-     else
+    else

     {
         rect.y += (rect.height/2);
         rect.height = 1;
     {
         rect.y += (rect.height/2);
         rect.height = 1;


@@ -638,7 +641,7 @@ void wxAuiDefaultToolBarArt::DrawGripper(wxDC& dc,
             if (x > rect.GetWidth()-5)
                 break;
         }
             if (x > rect.GetWidth()-5)
                 break;
         }

-         else
+        else

         {
             x = rect.x + 3;
             y = rect.y + (i*4) + 5;
         {
             x = rect.x + 3;
             y = rect.y + (i*4) + 5;


@@ -728,26 +731,22 @@ int wxAuiDefaultToolBarArt::ShowDropDown(wxWindow* wnd,
     {
         wxAuiToolBarItem& item = items.Item(i);
 
     {
         wxAuiToolBarItem& item = items.Item(i);
 

-        if (item.kind == wxITEM_NORMAL)
+        if (item.GetKind() == wxITEM_NORMAL)

         {
         {

-            wxString text = item.short_help;
+            wxString text = item.GetShortHelp();

             if (text.empty())
             if (text.empty())

-                text = item.label;
+                text = item.GetLabel();

 
             if (text.empty())
                 text = wxT(" ");
 
 
             if (text.empty())
                 text = wxT(" ");
 

-            #ifdef __WXMAC__
-            wxMenuItem* m =  new wxMenuItem(&menuPopup, item.id, text, item.short_help);
-            #else
-            wxMenuItem* m =  new wxMenuItem(&menuPopup, item.id, text, item.short_help, false);
-            #endif
+            wxMenuItem* m =  new wxMenuItem(&menuPopup, item.GetId(), text, item.GetShortHelp());

 
 

-            m->SetBitmap(item.bitmap);
+            m->SetBitmap(item.GetBitmap());

             menuPopup.Append(m);
             items_added++;
         }
             menuPopup.Append(m);
             items_added++;
         }

-         else if (item.kind == wxITEM_SEPARATOR)
+        else if (item.GetKind() == wxITEM_SEPARATOR)

         {
             if (items_added > 0)
                 menuPopup.AppendSeparator();
         {
             if (items_added > 0)
                 menuPopup.AppendSeparator();


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


@@ -851,18 +850,18 @@ void wxAuiToolBar::SetWindowStyleFlag(long style)
 
     if (m_style & wxAUI_TB_GRIPPER)
         m_gripper_visible = true;
 
     if (m_style & wxAUI_TB_GRIPPER)
         m_gripper_visible = true;

-         else
+    else

         m_gripper_visible = false;
 
 
     if (m_style & wxAUI_TB_OVERFLOW)
         m_overflow_visible = true;
         m_gripper_visible = false;
 
 
     if (m_style & wxAUI_TB_OVERFLOW)
         m_overflow_visible = true;

-         else
+    else

         m_overflow_visible = false;
 
         m_overflow_visible = false;
 

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

         SetToolTextOrientation(wxAUI_TBTOOL_TEXT_RIGHT);
         SetToolTextOrientation(wxAUI_TBTOOL_TEXT_RIGHT);

-         else
+    else

         SetToolTextOrientation(wxAUI_TBTOOL_TEXT_BOTTOM);
 }
 
         SetToolTextOrientation(wxAUI_TBTOOL_TEXT_BOTTOM);
 }
 


@@ -910,8 +909,8 @@ void wxAuiToolBar::AddTool(int tool_id,
                            const wxBitmap& bitmap,
                            const wxBitmap& disabled_bitmap,
                            wxItemKind kind,
                            const wxBitmap& bitmap,
                            const wxBitmap& disabled_bitmap,
                            wxItemKind kind,

-                           const wxString& WXUNUSED(short_help_string),
-                           const wxString& WXUNUSED(long_help_string),
+                           const wxString& short_help_string,
+                           const wxString& long_help_string,

                            wxObject* WXUNUSED(client_data))
 {
     wxAuiToolBarItem item;
                            wxObject* WXUNUSED(client_data))
 {
     wxAuiToolBarItem item;


@@ -919,9 +918,11 @@ void wxAuiToolBar::AddTool(int tool_id,
     item.label = label;
     item.bitmap = bitmap;
     item.disabled_bitmap = disabled_bitmap;
     item.label = label;
     item.bitmap = bitmap;
     item.disabled_bitmap = disabled_bitmap;

+    item.short_help = short_help_string;
+    item.long_help = long_help_string;

     item.active = true;
     item.dropdown = false;
     item.active = true;
     item.dropdown = false;

-    item.space_pixels = 0;
+    item.spacer_pixels = 0;

     item.id = tool_id;
     item.state = 0;
     item.proportion = 0;
     item.id = tool_id;
     item.state = 0;
     item.proportion = 0;


@@ -956,7 +957,7 @@ void wxAuiToolBar::AddControl(wxControl* control,
     item.disabled_bitmap = wxNullBitmap;
     item.active = true;
     item.dropdown = false;
     item.disabled_bitmap = wxNullBitmap;
     item.active = true;
     item.dropdown = false;

-    item.space_pixels = 0;
+    item.spacer_pixels = 0;

     item.id = control->GetId();
     item.state = 0;
     item.proportion = 0;
     item.id = control->GetId();
     item.state = 0;
     item.proportion = 0;


@@ -984,7 +985,7 @@ void wxAuiToolBar::AddLabel(int tool_id,
     item.disabled_bitmap = wxNullBitmap;
     item.active = true;
     item.dropdown = false;
     item.disabled_bitmap = wxNullBitmap;
     item.active = true;
     item.dropdown = false;

-    item.space_pixels = 0;
+    item.spacer_pixels = 0;

     item.id = tool_id;
     item.state = 0;
     item.proportion = 0;
     item.id = tool_id;
     item.state = 0;
     item.proportion = 0;


@@ -1027,7 +1028,7 @@ void wxAuiToolBar::AddSpacer(int pixels)
     item.disabled_bitmap = wxNullBitmap;
     item.active = true;
     item.dropdown = false;
     item.disabled_bitmap = wxNullBitmap;
     item.active = true;
     item.dropdown = false;

-    item.space_pixels = pixels;
+    item.spacer_pixels = pixels;

     item.id = -1;
     item.state = 0;
     item.proportion = 0;
     item.id = -1;
     item.state = 0;
     item.proportion = 0;


@@ -1049,7 +1050,7 @@ void wxAuiToolBar::AddStretchSpacer(int proportion)
     item.disabled_bitmap = wxNullBitmap;
     item.active = true;
     item.dropdown = false;
     item.disabled_bitmap = wxNullBitmap;
     item.active = true;
     item.dropdown = false;

-    item.space_pixels = 0;
+    item.spacer_pixels = 0;

     item.id = -1;
     item.state = 0;
     item.proportion = proportion;
     item.id = -1;
     item.state = 0;
     item.proportion = proportion;


@@ -1216,7 +1217,7 @@ int wxAuiToolBar::GetToolSeparation() const
 {
     if (m_art)
         return m_art->GetElementSize(wxAUI_TBART_SEPARATOR_SIZE);
 {
     if (m_art)
         return m_art->GetElementSize(wxAUI_TBART_SEPARATOR_SIZE);

-         else
+    else

         return 5;
 }
 
         return 5;
 }
 


@@ -1436,7 +1437,7 @@ void wxAuiToolBar::RefreshOverflowState()
     {
         if (::wxGetMouseState().LeftDown())
             overflow_state = wxAUI_BUTTON_STATE_PRESSED;
     {
         if (::wxGetMouseState().LeftDown())
             overflow_state = wxAUI_BUTTON_STATE_PRESSED;

-             else
+        else

             overflow_state = wxAUI_BUTTON_STATE_HOVER;
     }
 
             overflow_state = wxAUI_BUTTON_STATE_HOVER;
     }
 


@@ -1461,7 +1462,7 @@ void wxAuiToolBar::ToggleTool(int tool_id, bool state)
 
         if (state == true)
             tool->state |= wxAUI_BUTTON_STATE_CHECKED;
 
         if (state == true)
             tool->state |= wxAUI_BUTTON_STATE_CHECKED;

-         else
+        else

             tool->state &= ~wxAUI_BUTTON_STATE_CHECKED;
     }
 }
             tool->state &= ~wxAUI_BUTTON_STATE_CHECKED;
     }
 }


@@ -1489,7 +1490,7 @@ void wxAuiToolBar::EnableTool(int tool_id, bool state)
     {
         if (state == true)
             tool->state &= ~wxAUI_BUTTON_STATE_DISABLED;
     {
         if (state == true)
             tool->state &= ~wxAUI_BUTTON_STATE_DISABLED;

-         else
+        else

             tool->state |= wxAUI_BUTTON_STATE_DISABLED;
     }
 }
             tool->state |= wxAUI_BUTTON_STATE_DISABLED;
     }
 }


@@ -1633,7 +1634,7 @@ bool wxAuiToolBar::GetToolFitsByIndex(int tool_idx) const
         if (rect.y+rect.height < cli_h)
             return true;
     }
         if (rect.y+rect.height < cli_h)
             return true;
     }

-     else
+    else

     {
         // take the dropdown size into account
         if (m_overflow_visible)
     {
         // take the dropdown size into account
         if (m_overflow_visible)


@@ -1696,10 +1697,10 @@ bool wxAuiToolBar::Realize()
     {
         if (horizontal)
             m_gripper_sizer_item = sizer->Add(gripper_size, 1, 0, wxEXPAND);
     {
         if (horizontal)
             m_gripper_sizer_item = sizer->Add(gripper_size, 1, 0, wxEXPAND);

-             else
+        else

             m_gripper_sizer_item = sizer->Add(1, gripper_size, 0, wxEXPAND);
     }
             m_gripper_sizer_item = sizer->Add(1, gripper_size, 0, wxEXPAND);
     }

-     else
+    else

     {
         m_gripper_sizer_item = NULL;
     }
     {
         m_gripper_sizer_item = NULL;
     }


@@ -1709,7 +1710,7 @@ bool wxAuiToolBar::Realize()
     {
         if (horizontal)
             sizer->Add(m_left_padding, 1);
     {
         if (horizontal)
             sizer->Add(m_left_padding, 1);

-             else
+        else

             sizer->Add(1, m_left_padding);
     }
 
             sizer->Add(1, m_left_padding);
     }
 


@@ -1757,7 +1758,7 @@ bool wxAuiToolBar::Realize()
             {
                 if (horizontal)
                     sizer_item = sizer->Add(separator_size, 1, 0, wxEXPAND);
             {
                 if (horizontal)
                     sizer_item = sizer->Add(separator_size, 1, 0, wxEXPAND);

-                     else
+                else

                     sizer_item = sizer->Add(1, separator_size, 0, wxEXPAND);
 
                 // add tool packing
                     sizer_item = sizer->Add(1, separator_size, 0, wxEXPAND);
 
                 // add tool packing


@@ -1772,8 +1773,8 @@ bool wxAuiToolBar::Realize()
             case wxITEM_SPACER:
                 if (item.proportion > 0)
                     sizer_item = sizer->AddStretchSpacer(item.proportion);
             case wxITEM_SPACER:
                 if (item.proportion > 0)
                     sizer_item = sizer->AddStretchSpacer(item.proportion);

-                 else
-                    sizer_item = sizer->Add(item.space_pixels, 1);
+                else
+                    sizer_item = sizer->Add(item.spacer_pixels, 1);

                 break;
 
             case wxITEM_CONTROL:
                 break;
 
             case wxITEM_CONTROL:


@@ -1785,9 +1786,11 @@ 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.label.Length() > 0)
+                if ( (m_style & wxAUI_TB_TEXT) &&
+                     m_tool_text_orientation == wxAUI_TBTOOL_TEXT_BOTTOM &&
+                     !item.GetLabel().empty() )

                 {
                 {

-                    wxSize s = GetLabelSize(item.label);
+                    wxSize s = GetLabelSize(item.GetLabel());

                     vert_sizer->Add(1, s.y);
                 }
 
                     vert_sizer->Add(1, s.y);
                 }
 


@@ -1826,7 +1829,7 @@ bool wxAuiToolBar::Realize()
     {
         if (horizontal)
             sizer->Add(m_right_padding, 1);
     {
         if (horizontal)
             sizer->Add(m_right_padding, 1);

-             else
+        else

             sizer->Add(1, m_right_padding);
     }
 
             sizer->Add(1, m_right_padding);
     }
 


@@ -1840,10 +1843,10 @@ bool wxAuiToolBar::Realize()
         {
             if (horizontal)
                 m_overflow_sizer_item = sizer->Add(overflow_size, 1, 0, wxEXPAND);
         {
             if (horizontal)
                 m_overflow_sizer_item = sizer->Add(overflow_size, 1, 0, wxEXPAND);

-                 else
+            else

                 m_overflow_sizer_item = sizer->Add(1, overflow_size, 0, wxEXPAND);
         }
                 m_overflow_sizer_item = sizer->Add(1, overflow_size, 0, wxEXPAND);
         }

-         else
+        else

         {
             m_overflow_sizer_item = NULL;
         }
         {
             m_overflow_sizer_item = NULL;
         }


@@ -1858,7 +1861,7 @@ bool wxAuiToolBar::Realize()
     {
         if (horizontal)
             outside_sizer->Add(1, m_top_padding);
     {
         if (horizontal)
             outside_sizer->Add(1, m_top_padding);

-             else
+        else

             outside_sizer->Add(m_top_padding, 1);
     }
 
             outside_sizer->Add(m_top_padding, 1);
     }
 


@@ -1870,7 +1873,7 @@ bool wxAuiToolBar::Realize()
     {
         if (horizontal)
             outside_sizer->Add(1, m_bottom_padding);
     {
         if (horizontal)
             outside_sizer->Add(1, m_bottom_padding);

-             else
+        else

             outside_sizer->Add(m_bottom_padding, 1);
     }
 
             outside_sizer->Add(m_bottom_padding, 1);
     }
 


@@ -1908,12 +1911,12 @@ bool wxAuiToolBar::Realize()
         {
             SetClientSize(new_size);
         }
         {
             SetClientSize(new_size);
         }

-         else
+        else

         {
             m_sizer->SetDimension(0, 0, cur_size.x, cur_size.y);
         }
     }
         {
             m_sizer->SetDimension(0, 0, cur_size.x, cur_size.y);
         }
     }

-     else
+    else

     {
         wxSize cur_size = GetClientSize();
         m_sizer->SetDimension(0, 0, cur_size.x, cur_size.y);
     {
         wxSize cur_size = GetClientSize();
         m_sizer->SetDimension(0, 0, cur_size.x, cur_size.y);


@@ -1941,7 +1944,7 @@ wxRect wxAuiToolBar::GetOverflowRect() const
         overflow_rect.width = cli_rect.width;
         overflow_rect.height = overflow_size;
     }
         overflow_rect.width = cli_rect.width;
         overflow_rect.height = overflow_size;
     }

-     else
+    else

     {
         overflow_rect.x = cli_rect.width - overflow_size;
         overflow_rect.y = 0;
     {
         overflow_rect.x = cli_rect.width - overflow_size;
         overflow_rect.y = 0;


@@ -1995,7 +1998,7 @@ void wxAuiToolBar::DoIdleUpdate()
                 bool is_enabled;
                 if (item.window)
                     is_enabled = item.window->IsEnabled();
                 bool is_enabled;
                 if (item.window)
                     is_enabled = item.window->IsEnabled();

-                     else
+                else

                     is_enabled = (item.state & wxAUI_BUTTON_STATE_DISABLED) ? false : true;
 
                 bool new_enabled = evt.GetEnabled();
                     is_enabled = (item.state & wxAUI_BUTTON_STATE_DISABLED) ? false : true;
 
                 bool new_enabled = evt.GetEnabled();


@@ -2005,11 +2008,11 @@ void wxAuiToolBar::DoIdleUpdate()
                     {
                         item.window->Enable(new_enabled);
                     }
                     {
                         item.window->Enable(new_enabled);
                     }

-                     else
+                    else

                     {
                         if (new_enabled)
                             item.state &= ~wxAUI_BUTTON_STATE_DISABLED;
                     {
                         if (new_enabled)
                             item.state &= ~wxAUI_BUTTON_STATE_DISABLED;

-                             else
+                        else

                             item.state |= wxAUI_BUTTON_STATE_DISABLED;
                     }
                     need_refresh = true;
                             item.state |= wxAUI_BUTTON_STATE_DISABLED;
                     }
                     need_refresh = true;


@@ -2029,7 +2032,7 @@ void wxAuiToolBar::DoIdleUpdate()
                 {
                     if (new_checked)
                         item.state |= wxAUI_BUTTON_STATE_CHECKED;
                 {
                     if (new_checked)
                         item.state |= wxAUI_BUTTON_STATE_CHECKED;

-                         else
+                    else

                         item.state &= ~wxAUI_BUTTON_STATE_CHECKED;
 
                     need_refresh = true;
                         item.state &= ~wxAUI_BUTTON_STATE_CHECKED;
 
                     need_refresh = true;


@@ -2054,7 +2057,7 @@ void wxAuiToolBar::OnSize(wxSizeEvent& WXUNUSED(evt))
 
     if (x > y)
         SetOrientation(wxHORIZONTAL);
 
     if (x > y)
         SetOrientation(wxHORIZONTAL);

-         else
+    else

         SetOrientation(wxVERTICAL);
 
     if (((x >= y) && m_absolute_min_size.x > x) ||
         SetOrientation(wxVERTICAL);
 
     if (((x >= y) && m_absolute_min_size.x > x) ||


@@ -2072,7 +2075,7 @@ void wxAuiToolBar::OnSize(wxSizeEvent& WXUNUSED(evt))
             }
         }
     }
             }
         }
     }

-     else
+    else

     {
         // show all flexible items
         size_t i, count;
     {
         // show all flexible items
         size_t i, count;


@@ -2139,7 +2142,7 @@ void wxAuiToolBar::OnPaint(wxPaintEvent& WXUNUSED(evt))
         wxRect gripper_rect = m_gripper_sizer_item->GetRect();
         if (horizontal)
             gripper_rect.width = gripper_size;
         wxRect gripper_rect = m_gripper_sizer_item->GetRect();
         if (horizontal)
             gripper_rect.width = gripper_size;

-             else
+        else

             gripper_rect.height = gripper_size;
         m_art->DrawGripper(dc, this, gripper_rect);
     }
             gripper_rect.height = gripper_size;
         m_art->DrawGripper(dc, this, gripper_rect);
     }


@@ -2148,7 +2151,7 @@ void wxAuiToolBar::OnPaint(wxPaintEvent& WXUNUSED(evt))
     int last_extent;
     if (horizontal)
         last_extent = cli_rect.width;
     int last_extent;
     if (horizontal)
         last_extent = cli_rect.width;

-         else
+    else

         last_extent = cli_rect.height;
     if (m_overflow_visible)
         last_extent -= dropdown_size;
         last_extent = cli_rect.height;
     if (m_overflow_visible)
         last_extent -= dropdown_size;


@@ -2176,25 +2179,25 @@ void wxAuiToolBar::OnPaint(wxPaintEvent& WXUNUSED(evt))
             // draw a separator
             m_art->DrawSeparator(dc, this, item_rect);
         }
             // draw a separator
             m_art->DrawSeparator(dc, this, item_rect);
         }

-         else if (item.kind == wxITEM_LABEL)
+        else if (item.kind == wxITEM_LABEL)

         {
             // draw a text label only
             m_art->DrawLabel(dc, this, item, item_rect);
         }
         {
             // draw a text label only
             m_art->DrawLabel(dc, this, item, item_rect);
         }

-         else if (item.kind == wxITEM_NORMAL)
+        else if (item.kind == wxITEM_NORMAL)

         {
             // draw a regular button or dropdown button
             if (!item.dropdown)
                 m_art->DrawButton(dc, this, item, item_rect);
         {
             // draw a regular button or dropdown button
             if (!item.dropdown)
                 m_art->DrawButton(dc, this, item, item_rect);

-             else
+            else

                 m_art->DrawDropDownButton(dc, this, item, item_rect);
         }
                 m_art->DrawDropDownButton(dc, this, item, item_rect);
         }

-         else if (item.kind == wxITEM_CHECK)
+        else if (item.kind == wxITEM_CHECK)

         {
             // draw a toggle button
             m_art->DrawButton(dc, this, item, item_rect);
         }
         {
             // draw a toggle button
             m_art->DrawButton(dc, this, item, item_rect);
         }

-         else if (item.kind == wxITEM_CONTROL)
+        else if (item.kind == wxITEM_CONTROL)

         {
             // draw the control's label
             m_art->DrawControlLabel(dc, this, item, item_rect);
         {
             // draw the control's label
             m_art->DrawControlLabel(dc, this, item, item_rect);


@@ -2258,7 +2261,7 @@ void wxAuiToolBar::OnLeftDown(wxMouseEvent& evt)
             {
                 DoIdleUpdate();
             }
             {
                 DoIdleUpdate();
             }

-             else
+            else

             {
                 size_t i, count;
                 wxAuiToolBarItemArray overflow_items;
             {
                 size_t i, count;
                 wxAuiToolBarItemArray overflow_items;


@@ -2354,14 +2357,14 @@ void wxAuiToolBar::OnLeftUp(wxMouseEvent& evt)
         m_action_item = NULL;
         return;
     }
         m_action_item = NULL;
         return;
     }

-     else
+    else

     {
         wxAuiToolBarItem* hit_item;
         hit_item = FindToolByPosition(evt.GetX(), evt.GetY());
 
         if (m_action_item && hit_item == m_action_item)
         {
     {
         wxAuiToolBarItem* hit_item;
         hit_item = FindToolByPosition(evt.GetX(), evt.GetY());
 
         if (m_action_item && hit_item == m_action_item)
         {

-            SetToolTip(NULL);
+            UnsetToolTip();

 
             if (hit_item->kind == wxITEM_CHECK)
             {
 
             if (hit_item->kind == wxITEM_CHECK)
             {


@@ -2369,7 +2372,7 @@ void wxAuiToolBar::OnLeftUp(wxMouseEvent& evt)
 
                 if (m_action_item->state & wxAUI_BUTTON_STATE_CHECKED)
                     toggle = false;
 
                 if (m_action_item->state & wxAUI_BUTTON_STATE_CHECKED)
                     toggle = false;

-                 else
+                else

                     toggle = true;
 
                 ToggleTool(m_action_item->id, toggle);
                     toggle = true;
 
                 ToggleTool(m_action_item->id, toggle);


@@ -2379,7 +2382,7 @@ void wxAuiToolBar::OnLeftUp(wxMouseEvent& evt)
                 ProcessEvent(e);
                 DoIdleUpdate();
             }
                 ProcessEvent(e);
                 DoIdleUpdate();
             }

-             else
+            else

             {
                 wxCommandEvent e(wxEVT_COMMAND_MENU_SELECTED, m_action_item->id);
                 e.SetEventObject(this);
             {
                 wxCommandEvent e(wxEVT_COMMAND_MENU_SELECTED, m_action_item->id);
                 e.SetEventObject(this);


@@ -2450,7 +2453,7 @@ void wxAuiToolBar::OnRightUp(wxMouseEvent& evt)
             DoIdleUpdate();
         }
     }
             DoIdleUpdate();
         }
     }

-     else
+    else

     {
         // right-clicked on the invalid area of the toolbar
         wxAuiToolBarEvent e(wxEVT_COMMAND_AUITOOLBAR_RIGHT_CLICK, -1);
     {
         // right-clicked on the invalid area of the toolbar
         wxAuiToolBarEvent e(wxEVT_COMMAND_AUITOOLBAR_RIGHT_CLICK, -1);


@@ -2535,7 +2538,7 @@ void wxAuiToolBar::OnMotion(wxMouseEvent& evt)
         m_action_pos != wxPoint(-1,-1) &&
         abs(evt.m_x - m_action_pos.x) + abs(evt.m_y - m_action_pos.y) > 5)
     {
         m_action_pos != wxPoint(-1,-1) &&
         abs(evt.m_x - m_action_pos.x) + abs(evt.m_y - m_action_pos.y) > 5)
     {

-        SetToolTip(NULL);
+        UnsetToolTip();

 
         m_dragging = true;
 
 
         m_dragging = true;
 


@@ -2552,10 +2555,10 @@ void wxAuiToolBar::OnMotion(wxMouseEvent& evt)
     {
         if (!(hit_item->state & wxAUI_BUTTON_STATE_DISABLED))
             SetHoverItem(hit_item);
     {
         if (!(hit_item->state & wxAUI_BUTTON_STATE_DISABLED))
             SetHoverItem(hit_item);

-             else
+        else

             SetHoverItem(NULL);
     }
             SetHoverItem(NULL);
     }

-     else
+    else

     {
         // no hit item, remove any hit item
         SetHoverItem(hit_item);
     {
         // no hit item, remove any hit item
         SetHoverItem(hit_item);


@@ -2570,15 +2573,15 @@ void wxAuiToolBar::OnMotion(wxMouseEvent& evt)
         {
             m_tip_item = packing_hit_item;
 
         {
             m_tip_item = packing_hit_item;
 

-            if (packing_hit_item->short_help.Length() > 0)
+            if ( !packing_hit_item->short_help.empty() )

                 SetToolTip(packing_hit_item->short_help);
                 SetToolTip(packing_hit_item->short_help);

-                 else
-                SetToolTip(NULL);
+            else
+                UnsetToolTip();

         }
     }
         }
     }

-     else
+    else

     {
     {

-        SetToolTip(NULL);
+        UnsetToolTip();

         m_tip_item = NULL;
     }
 
         m_tip_item = NULL;
     }
 


@@ -2588,7 +2591,7 @@ void wxAuiToolBar::OnMotion(wxMouseEvent& evt)
     {
         if (m_action_item == hit_item)
             SetPressedItem(m_action_item);
     {
         if (m_action_item == hit_item)
             SetPressedItem(m_action_item);

-         else
+        else

             SetPressedItem(NULL);
     }
 
             SetPressedItem(NULL);
     }