Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix reverting to standard cursor in widgets sample

Browse Source 
Don't set the cursor to wxSTANDARD_CURSOR, but set it to wxNullCursor so the
default system cursor is used.
This commit is contained in:
Maarten Bent
2020-01-19 14:53:33 +01:00
parent a31cf55a8d
commit b3f259c99c
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
samples/widgets/widgets.cpp
View File

@@ -992,8 +992,8 @@ void WidgetsFrame::OnToggleGlobalBusyCursor(wxCommandEvent& event)
void WidgetsFrame::OnToggleBusyCursor(wxCommandEvent& event) void WidgetsFrame::OnToggleBusyCursor(wxCommandEvent& event)
{ {
WidgetsPage::GetAttrs().m_cursor = *(event.IsChecked() ? wxHOURGLASS_CURSOR WidgetsPage::GetAttrs().m_cursor = (event.IsChecked() ? *wxHOURGLASS_CURSOR
: wxSTANDARD_CURSOR); : wxNullCursor);
CurrentPage()->SetUpWidget(); CurrentPage()->SetUpWidget();
} }
@@ -1359,10 +1359,7 @@ void WidgetsPage::SetUpWidget()
(*it)->Enable(GetAttrs().m_enabled); (*it)->Enable(GetAttrs().m_enabled);
(*it)->Show(GetAttrs().m_show); (*it)->Show(GetAttrs().m_show);
if ( GetAttrs().m_cursor.IsOk() ) (*it)->SetCursor(GetAttrs().m_cursor);
{
(*it)->SetCursor(GetAttrs().m_cursor);
}
(*it)->SetWindowVariant(GetAttrs().m_variant); (*it)->SetWindowVariant(GetAttrs().m_variant);

2
samples/widgets/widgets.h
View File

@@ -97,7 +97,7 @@ struct WidgetAttributes
m_show = true; m_show = true;
m_dir = wxLayout_LeftToRight; m_dir = wxLayout_LeftToRight;
m_variant = wxWINDOW_VARIANT_NORMAL; m_variant = wxWINDOW_VARIANT_NORMAL;
m_cursor = *wxSTANDARD_CURSOR; m_cursor = wxNullCursor;
m_defaultFlags = wxBORDER_DEFAULT; m_defaultFlags = wxBORDER_DEFAULT;
} }