Compilation fix for non-MSW: don't use ProcessCommand().

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

diff --git a/src/aui/auibar.cpp b/src/aui/auibar.cpp
index 552b76aebbfd6145b16927ac6f1d08c67ce87acc..c7583b9d88d430e73b730f7e9d634b0671a3bac2 100644 (file)
--- a/src/aui/auibar.cpp
+++ b/src/aui/auibar.cpp
@@ -38,8 +38,6 @@
 
 #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"


@@ -227,6 +225,21 @@ void wxAuiDefaultToolBarArt::SetTextOrientation(int orientation)
     m_text_orientation = orientation;
 }
 
     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),
 void wxAuiDefaultToolBarArt::DrawBackground(
                                     wxDC& dc,
                                     wxWindow* WXUNUSED(wnd),


@@ -540,6 +553,12 @@ wxSize wxAuiDefaultToolBarArt::GetLabelSize(
     // get item's width
     width = item.GetMinSize().GetWidth();
 
     // get item's width
     width = item.GetMinSize().GetWidth();
 

+    if (width == -1)
+    {
+        // no width specified, measure the text ourselves
+        width = dc.GetTextExtent(item.GetLabel()).GetX();
+    }
+

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


@@ -713,9 +732,9 @@ void wxAuiDefaultToolBarArt::SetElementSize(int element_id, int size)
 {
     switch (element_id)
     {
 {
     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;

     }
 }
 
     }
 }
 


@@ -818,7 +837,7 @@ wxAuiToolBar::wxAuiToolBar(wxWindow* parent,
     m_gripper_sizer_item = NULL;
     m_overflow_sizer_item = NULL;
     m_dragging = false;
     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;
     m_gripper_visible = (m_style & wxAUI_TB_GRIPPER) ? true : false;
     m_overflow_visible = (m_style & wxAUI_TB_OVERFLOW) ? true : false;
     m_overflow_state = 0;


@@ -828,6 +847,7 @@ wxAuiToolBar::wxAuiToolBar(wxWindow* parent,
     SetExtraStyle(wxWS_EX_PROCESS_IDLE);
     if (style & wxAUI_TB_HORZ_LAYOUT)
         SetToolTextOrientation(wxAUI_TBTOOL_TEXT_RIGHT);
     SetExtraStyle(wxWS_EX_PROCESS_IDLE);
     if (style & wxAUI_TB_HORZ_LAYOUT)
         SetToolTextOrientation(wxAUI_TBTOOL_TEXT_RIGHT);

+    SetBackgroundStyle(wxBG_STYLE_CUSTOM);

 }
 
 
 }
 
 


@@ -865,6 +885,10 @@ void wxAuiToolBar::SetWindowStyleFlag(long style)
         SetToolTextOrientation(wxAUI_TBTOOL_TEXT_BOTTOM);
 }
 
         SetToolTextOrientation(wxAUI_TBTOOL_TEXT_BOTTOM);
 }
 

+long wxAuiToolBar::GetWindowStyleFlag() const
+{
+    return m_style;
+}

 
 void wxAuiToolBar::SetArtProvider(wxAuiToolBarArt* art)
 {
 
 void wxAuiToolBar::SetArtProvider(wxAuiToolBarArt* art)
 {


@@ -932,6 +956,9 @@ wxAuiToolBarItem* wxAuiToolBar::AddTool(int tool_id,
     item.user_data = 0;
     item.sticky = false;
 
     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
     if (!item.disabled_bitmap.IsOk())
     {
         // no disabled bitmap specified, we need to make one


@@ -996,6 +1023,9 @@ wxAuiToolBarItem* wxAuiToolBar::AddLabel(int tool_id,
     item.user_data = 0;
     item.sticky = false;
 
     item.user_data = 0;
     item.sticky = false;
 

+    if (item.id == wxID_ANY)
+        item.id = wxNewId();
+

     m_items.Add(item);
     return &m_items.Last();
 }
     m_items.Add(item);
     return &m_items.Last();
 }


@@ -1338,6 +1368,8 @@ void wxAuiToolBar::SetGripperVisible(bool visible)
     m_gripper_visible = visible;
     if (visible)
         m_style |= wxAUI_TB_GRIPPER;
     m_gripper_visible = visible;
     if (visible)
         m_style |= wxAUI_TB_GRIPPER;

+    else
+        m_style &= ~wxAUI_TB_GRIPPER;

     Realize();
     Refresh(false);
 }
     Realize();
     Refresh(false);
 }


@@ -1353,6 +1385,8 @@ void wxAuiToolBar::SetOverflowVisible(bool visible)
     m_overflow_visible = visible;
     if (visible)
         m_style |= wxAUI_TB_OVERFLOW;
     m_overflow_visible = visible;
     if (visible)
         m_style |= wxAUI_TB_OVERFLOW;

+    else
+        m_style &= ~wxAUI_TB_OVERFLOW;

     Refresh(false);
 }
 
     Refresh(false);
 }
 


@@ -1440,7 +1474,7 @@ void wxAuiToolBar::RefreshOverflowState()
     // find out if the mouse cursor is inside the dropdown rectangle
     if (overflow_rect.Contains(pt.x, pt.y))
     {
     // 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
             overflow_state = wxAUI_BUTTON_STATE_HOVER;
             overflow_state = wxAUI_BUTTON_STATE_PRESSED;
         else
             overflow_state = wxAUI_BUTTON_STATE_HOVER;


@@ -1460,15 +1494,39 @@ void wxAuiToolBar::ToggleTool(int tool_id, bool state)
 {
     wxAuiToolBarItem* tool = FindTool(tool_id);
 
 {
     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;
             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;
+        }

     }
 }
 
     }
 }
 


@@ -1478,7 +1536,7 @@ bool wxAuiToolBar::GetToolToggled(int tool_id) const
 
     if (tool)
     {
 
     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;
             return false;
 
         return (tool->state & wxAUI_BUTTON_STATE_CHECKED) ? true : false;


@@ -1733,7 +1791,7 @@ bool wxAuiToolBar::Realize()
                 sizer_item = sizer->Add(size.x + (m_tool_border_padding*2),
                                         size.y + (m_tool_border_padding*2),
                                         item.proportion,
                 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);
                 if (i+1 < count)
                 {
                     sizer->AddSpacer(m_tool_packing);


@@ -1744,12 +1802,13 @@ bool wxAuiToolBar::Realize()
 
             case wxITEM_CHECK:
             case wxITEM_NORMAL:
 
             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,
             {
                 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)
                 {
                 // add tool packing
                 if (i+1 < count)
                 {


@@ -2127,7 +2186,7 @@ void wxAuiToolBar::OnIdle(wxIdleEvent& evt)
 
 void wxAuiToolBar::OnPaint(wxPaintEvent& WXUNUSED(evt))
 {
 
 void wxAuiToolBar::OnPaint(wxPaintEvent& WXUNUSED(evt))
 {

-    wxBufferedPaintDC dc(this);
+    wxAutoBufferedPaintDC dc(this);

     wxRect cli_rect(wxPoint(0,0), GetClientSize());
 
 
     wxRect cli_rect(wxPoint(0,0), GetClientSize());
 
 


@@ -2202,6 +2261,11 @@ void wxAuiToolBar::OnPaint(wxPaintEvent& WXUNUSED(evt))
             // 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_RADIO)
+        {
+            // draw a toggle button
+            m_art->DrawButton(dc, this, item, item_rect);
+        }

         else if (item.kind == wxITEM_CONTROL)
         {
             // draw the control's label
         else if (item.kind == wxITEM_CONTROL)
         {
             // draw the control's label


@@ -2371,7 +2435,7 @@ void wxAuiToolBar::OnLeftUp(wxMouseEvent& evt)
         {
             UnsetToolTip();
 
         {
             UnsetToolTip();
 

-            if (hit_item->kind == wxITEM_CHECK)
+            if (hit_item->kind == wxITEM_CHECK || hit_item->kind == wxITEM_RADIO)

             {
                 bool toggle = false;
 
             {
                 bool toggle = false;
 


@@ -2382,8 +2446,13 @@ void wxAuiToolBar::OnLeftUp(wxMouseEvent& evt)
 
                 ToggleTool(m_action_item->id, toggle);
 
 
                 ToggleTool(m_action_item->id, toggle);
 

+                // repaint immediately
+                Refresh(false);
+                Update();
+

                 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);

+                e.SetInt (toggle);

                 GetEventHandler()->ProcessEvent(e);
                 DoIdleUpdate();
             }
                 GetEventHandler()->ProcessEvent(e);
                 DoIdleUpdate();
             }