X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/36307fdf51fbd35a20e0c16ecf08209bdba8ff08..13b4df952c77383f50696e51fcbaa2d8bbd3b3b9:/src/aui/auibar.cpp diff --git a/src/aui/auibar.cpp b/src/aui/auibar.cpp index b2b88c2210..d9bb3046b4 100644 --- a/src/aui/auibar.cpp +++ b/src/aui/auibar.cpp @@ -1664,8 +1664,9 @@ wxSize wxAuiToolBar::GetHintSize(int dock_direction) const case wxAUI_DOCK_LEFT: return m_vertHintSize; default: - wxCHECK_MSG(false, wxDefaultSize, "invalid dock location value"); + wxFAIL_MSG("invalid dock location value"); } + return wxDefaultSize; } bool wxAuiToolBar::IsPaneValid(const wxAuiPaneInfo& pane) const @@ -2149,7 +2150,7 @@ void wxAuiToolBar::DoIdleUpdate() { bool is_enabled; if (item.m_window) - is_enabled = item.m_window->IsEnabled(); + is_enabled = item.m_window->IsThisEnabled(); else is_enabled = (item.m_state & wxAUI_BUTTON_STATE_DISABLED) ? false : true;