From 454968101428f2c2b3d836c1132572d3ef2708d9 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 30 Apr 2009 12:23:00 +0000 Subject: [PATCH] compilation fix after wxMouseState changes (closes #10756) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60437 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/aui/auibar.cpp | 26 +++++++++++++------------- src/aui/floatpane.cpp | 4 ++-- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/aui/auibar.cpp b/src/aui/auibar.cpp index d356d353a2..e59d0e97c7 100644 --- a/src/aui/auibar.cpp +++ b/src/aui/auibar.cpp @@ -554,13 +554,13 @@ wxSize wxAuiDefaultToolBarArt::GetLabelSize( // 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); } @@ -956,9 +956,9 @@ wxAuiToolBarItem* wxAuiToolBar::AddTool(int tool_id, item.min_size = wxDefaultSize; item.user_data = 0; item.sticky = false; - - if (item.id == wxID_ANY) - item.id = wxNewId(); + + if (item.id == wxID_ANY) + item.id = wxNewId(); if (!item.disabled_bitmap.IsOk()) { @@ -1024,9 +1024,9 @@ wxAuiToolBarItem* wxAuiToolBar::AddLabel(int tool_id, item.user_data = 0; item.sticky = false; - if (item.id == wxID_ANY) - item.id = wxNewId(); - + if (item.id == wxID_ANY) + item.id = wxNewId(); + m_items.Add(item); return &m_items.Last(); } @@ -1475,7 +1475,7 @@ void wxAuiToolBar::RefreshOverflowState() // 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; @@ -1502,7 +1502,7 @@ void wxAuiToolBar::ToggleTool(int tool_id, bool state) int i, idx, count; idx = GetToolIndex(tool_id); count = (int)m_items.GetCount(); - + if (idx >= 0 && idx < count) { for (i = idx; i < count; ++i) @@ -1518,7 +1518,7 @@ void wxAuiToolBar::ToggleTool(int tool_id, bool state) m_items[i].state &= ~wxAUI_BUTTON_STATE_CHECKED; } } - + tool->state |= wxAUI_BUTTON_STATE_CHECKED; } else if (tool->kind == wxITEM_CHECK) @@ -2446,11 +2446,11 @@ void wxAuiToolBar::OnLeftUp(wxMouseEvent& evt) 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); GetEventHandler()->ProcessEvent(e); diff --git a/src/aui/floatpane.cpp b/src/aui/floatpane.cpp index 2c4a256215..ef7f35e513 100644 --- a/src/aui/floatpane.cpp +++ b/src/aui/floatpane.cpp @@ -144,7 +144,7 @@ void wxAuiFloatingFrame::SetPaneWindow(const wxAuiPaneInfo& pane) SetClientSize(size); } - + if (pane.IsFixed()) { SetWindowStyleFlag(GetWindowStyleFlag() & ~wxRESIZE_BORDER); @@ -323,7 +323,7 @@ void wxAuiFloatingFrame::OnActivate(wxActivateEvent& event) // functionality to wxWidgets itself) bool wxAuiFloatingFrame::isMouseDown() { - return wxGetMouseState().LeftDown(); + return wxGetMouseState().LeftIsDown(); }