// 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
///////////////////////////////////////////////////////////////////////////////
WX_DEFINE_OBJARRAY(wxAuiToolBarItemArray)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_AUITOOLBAR_TOOL_DROPDOWN)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_AUITOOLBAR_OVERFLOW_CLICK)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_AUITOOLBAR_RIGHT_CLICK)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_AUITOOLBAR_MIDDLE_CLICK)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_AUITOOLBAR_BEGIN_DRAG)
+wxDEFINE_EVENT( wxEVT_COMMAND_AUITOOLBAR_TOOL_DROPDOWN, wxAuiToolBarEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_AUITOOLBAR_OVERFLOW_CLICK, wxAuiToolBarEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_AUITOOLBAR_RIGHT_CLICK, wxAuiToolBarEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_AUITOOLBAR_MIDDLE_CLICK, wxAuiToolBarEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_AUITOOLBAR_BEGIN_DRAG, wxAuiToolBarEvent );
IMPLEMENT_CLASS(wxAuiToolBar, wxControl)
m_gripper_pen2 = wxPen(darker3_colour);
m_gripper_pen3 = *wxWHITE_PEN;
- static unsigned char button_dropdown_bits[] = { 0xe0, 0xf1, 0xfb };
- static unsigned char overflow_bits[] = { 0x80, 0xff, 0x80, 0xc1, 0xe3, 0xf7 };
+ static const unsigned char button_dropdown_bits[] = { 0xe0, 0xf1, 0xfb };
+ static const unsigned char overflow_bits[] = { 0x80, 0xff, 0x80, 0xc1, 0xe3, 0xf7 };
m_button_dropdown_bmp = wxAuiBitmapFromBits(button_dropdown_bits, 5, 3,
*wxBLACK);
m_text_orientation = orientation;
}
+unsigned int wxAuiDefaultToolBarArt::GetFlags()
+{
+ return m_flags;
+}
+
+wxFont wxAuiDefaultToolBarArt::GetFont()
+{
+ return m_font;
+}
+
+int wxAuiDefaultToolBarArt::GetTextOrientation()
+{
+ return m_text_orientation;
+}
+
void wxAuiDefaultToolBarArt::DrawBackground(
wxDC& dc,
wxWindow* WXUNUSED(wnd),
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.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;
{
bmp_x = rect.x +
(rect.width/2) -
- (item.bitmap.GetWidth()/2);
+ (item.GetBitmap().GetWidth()/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;
}
- 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) -
- (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);
}
- 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);
}
- 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)
- 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);
}
- 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
}
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;
// 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);
- 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);
}
}
text_width = 0;
}
- dc.GetTextExtent(item.label, &text_width, &ty);
+ dc.GetTextExtent(item.GetLabel(), &text_width, &ty);
}
{
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) -
- (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;
}
- 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) -
- (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);
}
- 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);
}
- 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)));
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;
}
- else
+ else
{
- bmp = item.bitmap;
+ bmp = item.GetBitmap();
dropbmp = m_button_dropdown_bmp;
}
// 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);
- 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);
}
}
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)
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);
}
}
dc.GetTextExtent(wxT("ABCDHgj"), &width, &height);
// get item's width
- width = item.min_size.GetWidth();
+ width = item.GetMinSize().GetWidth();
+
+ if (width == -1)
+ {
+ // no width specified, measure the text ourselves
+ width = dc.GetTextExtent(item.GetLabel()).GetX();
+ }
return wxSize(width, height);
}
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);
- 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)
{
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);
}
}
- 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
- 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);
}
}
// 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);
rect.y += (rect.height/2) - (new_height/2);
rect.height = new_height;
}
- else
+ else
{
rect.y += (rect.height/2);
rect.height = 1;
if (x > rect.GetWidth()-5)
break;
}
- else
+ else
{
x = rect.x + 3;
y = rect.y + (i*4) + 5;
{
switch (element_id)
{
- case wxAUI_TBART_SEPARATOR_SIZE: m_separator_size = size;
- case wxAUI_TBART_GRIPPER_SIZE: m_gripper_size = size;
- case wxAUI_TBART_OVERFLOW_SIZE: m_overflow_size = size;
+ case wxAUI_TBART_SEPARATOR_SIZE: m_separator_size = size; break;
+ case wxAUI_TBART_GRIPPER_SIZE: m_gripper_size = size; break;
+ case wxAUI_TBART_OVERFLOW_SIZE: m_overflow_size = size; break;
}
}
{
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())
- text = item.label;
+ text = item.GetLabel();
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++;
}
- else if (item.kind == wxITEM_SEPARATOR)
+ else if (item.GetKind() == wxITEM_SEPARATOR)
{
if (items_added > 0)
menuPopup.AppendSeparator();
m_gripper_sizer_item = NULL;
m_overflow_sizer_item = NULL;
m_dragging = false;
- m_style = style;
+ m_style = style | wxBORDER_NONE;
m_gripper_visible = (m_style & wxAUI_TB_GRIPPER) ? true : false;
m_overflow_visible = (m_style & wxAUI_TB_OVERFLOW) ? true : false;
m_overflow_state = 0;
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);
+ SetBackgroundStyle(wxBG_STYLE_CUSTOM);
}
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;
- else
+ else
m_overflow_visible = false;
- if (style & wxAUI_TB_HORZ_TEXT)
+ if (style & wxAUI_TB_HORZ_LAYOUT)
SetToolTextOrientation(wxAUI_TBTOOL_TEXT_RIGHT);
- else
+ else
SetToolTextOrientation(wxAUI_TBTOOL_TEXT_BOTTOM);
}
+long wxAuiToolBar::GetWindowStyleFlag() const
+{
+ return m_style;
+}
void wxAuiToolBar::SetArtProvider(wxAuiToolBarArt* art)
{
-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)
{
- AddTool(tool_id,
+ return AddTool(tool_id,
label,
bitmap,
wxNullBitmap,
}
-void wxAuiToolBar::AddTool(int tool_id,
+wxAuiToolBarItem* wxAuiToolBar::AddTool(int tool_id,
const wxString& label,
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;
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.space_pixels = 0;
+ item.spacer_pixels = 0;
item.id = tool_id;
item.state = 0;
item.proportion = 0;
item.user_data = 0;
item.sticky = false;
+ if (item.id == wxID_ANY)
+ item.id = wxNewId();
+
if (!item.disabled_bitmap.IsOk())
{
// no disabled bitmap specified, we need to make one
item.disabled_bitmap = MakeDisabledBitmap(item.bitmap);
}
}
-
m_items.Add(item);
+ return &m_items.Last();
}
-void wxAuiToolBar::AddControl(wxControl* control,
+wxAuiToolBarItem* wxAuiToolBar::AddControl(wxControl* control,
const wxString& label)
{
wxAuiToolBarItem item;
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.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)
{
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.user_data = 0;
item.sticky = false;
+ if (item.id == wxID_ANY)
+ item.id = wxNewId();
+
m_items.Add(item);
+ return &m_items.Last();
}
-void wxAuiToolBar::AddSeparator()
+wxAuiToolBarItem* wxAuiToolBar::AddSeparator()
{
wxAuiToolBarItem item;
item.window = NULL;
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;
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.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;
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.sticky = false;
m_items.Add(item);
+ return &m_items.Last();
}
void wxAuiToolBar::Clear()
{
if (m_art)
return m_art->GetElementSize(wxAUI_TBART_SEPARATOR_SIZE);
- else
+ else
return 5;
}
m_gripper_visible = visible;
if (visible)
m_style |= wxAUI_TB_GRIPPER;
+ else
+ m_style &= ~wxAUI_TB_GRIPPER;
Realize();
Refresh(false);
}
m_overflow_visible = visible;
if (visible)
m_style |= wxAUI_TB_OVERFLOW;
+ else
+ m_style &= ~wxAUI_TB_OVERFLOW;
Refresh(false);
}
// find out if the mouse cursor is inside the dropdown rectangle
if (overflow_rect.Contains(pt.x, pt.y))
{
- if (::wxGetMouseState().LeftDown())
+ if (::wxGetMouseState().LeftIsDown())
overflow_state = wxAUI_BUTTON_STATE_PRESSED;
- else
+ else
overflow_state = wxAUI_BUTTON_STATE_HOVER;
}
{
wxAuiToolBarItem* tool = FindTool(tool_id);
- if (tool)
+ if (tool && (tool->kind == wxITEM_CHECK || tool->kind == wxITEM_RADIO))
{
- if (tool->kind != wxITEM_CHECK)
- return;
+ if (tool->kind == wxITEM_RADIO)
+ {
+ int i, idx, count;
+ idx = GetToolIndex(tool_id);
+ count = (int)m_items.GetCount();
+
+ if (idx >= 0 && idx < count)
+ {
+ for (i = idx; i < count; ++i)
+ {
+ if (m_items[i].kind != wxITEM_RADIO)
+ break;
+ m_items[i].state &= ~wxAUI_BUTTON_STATE_CHECKED;
+ }
+ for (i = idx; i > 0; i--)
+ {
+ if (m_items[i].kind != wxITEM_RADIO)
+ break;
+ m_items[i].state &= ~wxAUI_BUTTON_STATE_CHECKED;
+ }
+ }
- if (state == true)
tool->state |= wxAUI_BUTTON_STATE_CHECKED;
- else
- tool->state &= ~wxAUI_BUTTON_STATE_CHECKED;
+ }
+ else if (tool->kind == wxITEM_CHECK)
+ {
+ if (state == true)
+ tool->state |= wxAUI_BUTTON_STATE_CHECKED;
+ else
+ tool->state &= ~wxAUI_BUTTON_STATE_CHECKED;
+ }
}
}
if (tool)
{
- if (tool->kind != wxITEM_CHECK)
+ if ( (tool->kind != wxITEM_CHECK) && (tool->kind != wxITEM_RADIO) )
return false;
return (tool->state & wxAUI_BUTTON_STATE_CHECKED) ? true : false;
{
if (state == true)
tool->state &= ~wxAUI_BUTTON_STATE_DISABLED;
- else
+ else
tool->state |= wxAUI_BUTTON_STATE_DISABLED;
}
}
if (rect.y+rect.height < cli_h)
return true;
}
- else
+ else
{
// take the dropdown size into account
if (m_overflow_visible)
{
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);
}
- else
+ else
{
m_gripper_sizer_item = NULL;
}
{
if (horizontal)
sizer->Add(m_left_padding, 1);
- else
+ else
sizer->Add(1, m_left_padding);
}
sizer_item = sizer->Add(size.x + (m_tool_border_padding*2),
size.y + (m_tool_border_padding*2),
item.proportion,
- wxALIGN_CENTER);
+ item.alignment);
if (i+1 < count)
{
sizer->AddSpacer(m_tool_packing);
case wxITEM_CHECK:
case wxITEM_NORMAL:
+ case wxITEM_RADIO:
{
wxSize size = m_art->GetToolSize(dc, this, item);
sizer_item = sizer->Add(size.x + (m_tool_border_padding*2),
size.y + (m_tool_border_padding*2),
0,
- wxALIGN_CENTER);
+ item.alignment);
// add tool packing
if (i+1 < count)
{
{
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
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:
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);
}
{
if (horizontal)
sizer->Add(m_right_padding, 1);
- else
+ else
sizer->Add(1, m_right_padding);
}
{
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);
}
- else
+ else
{
m_overflow_sizer_item = NULL;
}
{
if (horizontal)
outside_sizer->Add(1, m_top_padding);
- else
+ else
outside_sizer->Add(m_top_padding, 1);
}
{
if (horizontal)
outside_sizer->Add(1, m_bottom_padding);
- else
+ else
outside_sizer->Add(m_bottom_padding, 1);
}
{
SetClientSize(new_size);
}
- else
+ else
{
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);
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;
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();
{
item.window->Enable(new_enabled);
}
- else
+ else
{
if (new_enabled)
item.state &= ~wxAUI_BUTTON_STATE_DISABLED;
- else
+ else
item.state |= wxAUI_BUTTON_STATE_DISABLED;
}
need_refresh = true;
{
if (new_checked)
item.state |= wxAUI_BUTTON_STATE_CHECKED;
- else
+ else
item.state &= ~wxAUI_BUTTON_STATE_CHECKED;
need_refresh = true;
if (x > y)
SetOrientation(wxHORIZONTAL);
- else
+ else
SetOrientation(wxVERTICAL);
if (((x >= y) && m_absolute_min_size.x > x) ||
}
}
}
- else
+ else
{
// show all flexible items
size_t i, count;
void wxAuiToolBar::OnPaint(wxPaintEvent& WXUNUSED(evt))
{
- wxBufferedPaintDC dc(this);
+ wxAutoBufferedPaintDC dc(this);
wxRect cli_rect(wxPoint(0,0), GetClientSize());
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);
}
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;
// 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);
}
- 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);
- else
+ else
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);
}
- else if (item.kind == wxITEM_CONTROL)
+ else if (item.kind == wxITEM_RADIO)
+ {
+ // draw a toggle button
+ m_art->DrawButton(dc, this, item, item_rect);
+ }
+ else if (item.kind == wxITEM_CONTROL)
{
// draw the control's label
m_art->DrawControlLabel(dc, this, item, item_rect);
e.SetEventObject(this);
e.SetToolId(-1);
e.SetClickPoint(wxPoint(evt.GetX(), evt.GetY()));
- bool processed = ProcessEvent(e);
+ bool processed = GetEventHandler()->ProcessEvent(e);
if (processed)
{
DoIdleUpdate();
}
- else
+ else
{
size_t i, count;
wxAuiToolBarItemArray overflow_items;
{
wxCommandEvent e(wxEVT_COMMAND_MENU_SELECTED, res);
e.SetEventObject(this);
- GetParent()->ProcessEvent(e);
+ GetParent()->GetEventHandler()->ProcessEvent(e);
}
}
e.SetClickPoint(evt.GetPosition());
e.SetItemRect(rect);
- ProcessEvent(e);
+ GetEventHandler()->ProcessEvent(e);
DoIdleUpdate();
}
}
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)
{
- SetToolTip(NULL);
+ UnsetToolTip();
- if (hit_item->kind == wxITEM_CHECK)
+ if (hit_item->kind == wxITEM_CHECK || hit_item->kind == wxITEM_RADIO)
{
bool toggle = false;
if (m_action_item->state & wxAUI_BUTTON_STATE_CHECKED)
toggle = false;
- else
+ else
toggle = true;
ToggleTool(m_action_item->id, toggle);
+ // repaint immediately
+ Refresh(false);
+ Update();
+
wxCommandEvent e(wxEVT_COMMAND_MENU_SELECTED, m_action_item->id);
e.SetEventObject(this);
- ProcessEvent(e);
+ e.SetInt (toggle);
+ GetEventHandler()->ProcessEvent(e);
DoIdleUpdate();
}
- else
+ else
{
wxCommandEvent e(wxEVT_COMMAND_MENU_SELECTED, m_action_item->id);
e.SetEventObject(this);
- ProcessEvent(e);
+ GetEventHandler()->ProcessEvent(e);
DoIdleUpdate();
}
}
e.SetEventObject(this);
e.SetToolId(m_action_item->id);
e.SetClickPoint(m_action_pos);
- ProcessEvent(e);
+ GetEventHandler()->ProcessEvent(e);
DoIdleUpdate();
}
}
- else
+ else
{
// right-clicked on the invalid area of the toolbar
wxAuiToolBarEvent e(wxEVT_COMMAND_AUITOOLBAR_RIGHT_CLICK, -1);
e.SetEventObject(this);
e.SetToolId(-1);
e.SetClickPoint(m_action_pos);
- ProcessEvent(e);
+ GetEventHandler()->ProcessEvent(e);
DoIdleUpdate();
}
e.SetEventObject(this);
e.SetToolId(m_action_item->id);
e.SetClickPoint(m_action_pos);
- ProcessEvent(e);
+ GetEventHandler()->ProcessEvent(e);
DoIdleUpdate();
}
}
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;
wxAuiToolBarEvent e(wxEVT_COMMAND_AUITOOLBAR_BEGIN_DRAG, GetId());
e.SetEventObject(this);
e.SetToolId(m_action_item->id);
- ProcessEvent(e);
+ GetEventHandler()->ProcessEvent(e);
DoIdleUpdate();
return;
}
{
if (!(hit_item->state & wxAUI_BUTTON_STATE_DISABLED))
SetHoverItem(hit_item);
- else
+ else
SetHoverItem(NULL);
}
- else
+ else
{
// no hit item, remove any hit item
SetHoverItem(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);
- else
- SetToolTip(NULL);
+ else
+ UnsetToolTip();
}
}
- else
+ else
{
- SetToolTip(NULL);
+ UnsetToolTip();
m_tip_item = NULL;
}
{
if (m_action_item == hit_item)
SetPressedItem(m_action_item);
- else
+ else
SetPressedItem(NULL);
}
projects / wxWidgets.git / blobdiff