From 760d3542ec63db3a0eb4cc398520640203b8d6b0 Mon Sep 17 00:00:00 2001 From: Benjamin Williams Date: Tue, 7 Nov 2006 20:02:38 +0000 Subject: [PATCH] button bug fixed git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43169 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/aui/auibook.h | 4 ++-- src/aui/auibook.cpp | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/include/wx/aui/auibook.h b/include/wx/aui/auibook.h index 0dd02f4644..7bfabe35e1 100644 --- a/include/wx/aui/auibook.h +++ b/include/wx/aui/auibook.h @@ -180,7 +180,7 @@ public: int GetBestTabCtrlSize(wxWindow* wnd); -private: +protected: wxFont m_normal_font; wxFont m_selected_font; @@ -263,7 +263,7 @@ public: int GetBestTabCtrlSize(wxWindow* wnd); -private: +protected: wxFont m_normal_font; wxFont m_selected_font; diff --git a/src/aui/auibook.cpp b/src/aui/auibook.cpp index 0bff20b468..d97bd4daae 100644 --- a/src/aui/auibook.cpp +++ b/src/aui/auibook.cpp @@ -1863,9 +1863,13 @@ void wxAuiTabCtrl::OnLeftDown(wxMouseEvent& evt) m_is_dragging = false; m_click_tab = NULL; + wxWindow* wnd; if (TabHitTest(evt.m_x, evt.m_y, &wnd)) { + if (m_flags & wxAUI_NB_CLOSE_ON_ACTIVE_TAB) + m_hover_button = NULL; + wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, m_windowId); e.SetSelection(GetIdxFromWindow(wnd)); e.SetOldSelection(GetActivePage()); @@ -1876,7 +1880,7 @@ void wxAuiTabCtrl::OnLeftDown(wxMouseEvent& evt) m_click_pt.y = evt.m_y; m_click_tab = wnd; } - + if (m_hover_button) { m_hover_button->cur_state = wxAUI_BUTTON_STATE_PRESSED; -- 2.47.2