button bug fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43169 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -180,7 +180,7 @@ public:
|
|||||||
|
|
||||||
int GetBestTabCtrlSize(wxWindow* wnd);
|
int GetBestTabCtrlSize(wxWindow* wnd);
|
||||||
|
|
||||||
private:
|
protected:
|
||||||
|
|
||||||
wxFont m_normal_font;
|
wxFont m_normal_font;
|
||||||
wxFont m_selected_font;
|
wxFont m_selected_font;
|
||||||
@@ -263,7 +263,7 @@ public:
|
|||||||
|
|
||||||
int GetBestTabCtrlSize(wxWindow* wnd);
|
int GetBestTabCtrlSize(wxWindow* wnd);
|
||||||
|
|
||||||
private:
|
protected:
|
||||||
|
|
||||||
wxFont m_normal_font;
|
wxFont m_normal_font;
|
||||||
wxFont m_selected_font;
|
wxFont m_selected_font;
|
||||||
|
@@ -1863,9 +1863,13 @@ void wxAuiTabCtrl::OnLeftDown(wxMouseEvent& evt)
|
|||||||
m_is_dragging = false;
|
m_is_dragging = false;
|
||||||
m_click_tab = NULL;
|
m_click_tab = NULL;
|
||||||
|
|
||||||
|
|
||||||
wxWindow* wnd;
|
wxWindow* wnd;
|
||||||
if (TabHitTest(evt.m_x, evt.m_y, &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);
|
wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, m_windowId);
|
||||||
e.SetSelection(GetIdxFromWindow(wnd));
|
e.SetSelection(GetIdxFromWindow(wnd));
|
||||||
e.SetOldSelection(GetActivePage());
|
e.SetOldSelection(GetActivePage());
|
||||||
@@ -1876,7 +1880,7 @@ void wxAuiTabCtrl::OnLeftDown(wxMouseEvent& evt)
|
|||||||
m_click_pt.y = evt.m_y;
|
m_click_pt.y = evt.m_y;
|
||||||
m_click_tab = wnd;
|
m_click_tab = wnd;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (m_hover_button)
|
if (m_hover_button)
|
||||||
{
|
{
|
||||||
m_hover_button->cur_state = wxAUI_BUTTON_STATE_PRESSED;
|
m_hover_button->cur_state = wxAUI_BUTTON_STATE_PRESSED;
|
||||||
|
Reference in New Issue
Block a user