AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

compilation fix after wxMouseState changes (closes #10756)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60437 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2009-04-30 12:23:00 +00:00
parent c6b22707d3
commit 4549681014
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/aui/auibar.cpp
View File

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

4
src/aui/floatpane.cpp
View File

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