diff --git a/docs/changes.txt b/docs/changes.txt index 8f6576841c..b7ef0a1474 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -68,6 +68,9 @@ INCOMPATIBLE CHANGES SINCE 3.1.0: 3.1.0, have been renamed to HasCheckBoxes and EnableCheckBoxes respectively for consistency with wxCheckBox naming. +- The enum value wxTASKBAR_JUMP_LIST_DESTIONATION, which was added in 3.1.0, + contains a typo and has been renamed to wxTASKBAR_JUMP_LIST_DESTINATION. + All: diff --git a/include/wx/taskbarbutton.h b/include/wx/taskbarbutton.h index 68759d21f3..e62db4bf5c 100644 --- a/include/wx/taskbarbutton.h +++ b/include/wx/taskbarbutton.h @@ -142,7 +142,7 @@ enum wxTaskBarJumpListItemType { wxTASKBAR_JUMP_LIST_SEPARATOR, wxTASKBAR_JUMP_LIST_TASK, - wxTASKBAR_JUMP_LIST_DESTIONATION + wxTASKBAR_JUMP_LIST_DESTINATION }; class WXDLLIMPEXP_CORE wxTaskBarJumpListItem diff --git a/interface/wx/taskbarbutton.h b/interface/wx/taskbarbutton.h index fdd9bf34b1..3bcc09341b 100644 --- a/interface/wx/taskbarbutton.h +++ b/interface/wx/taskbarbutton.h @@ -345,7 +345,7 @@ enum wxTaskBarJumpListItemType wxTASKBAR_JUMP_LIST_TASK, /** Item acts as a link to a file that the application can open. */ - wxTASKBAR_JUMP_LIST_DESTIONATION + wxTASKBAR_JUMP_LIST_DESTINATION }; /** @@ -374,7 +374,7 @@ public: The title of this item. @param filePath The filePath of this item, the meaning of which depends on the type - of this item: If the item type is wxTASKBAR_JUMP_LIST_DESTIONATION, + of this item: If the item type is wxTASKBAR_JUMP_LIST_DESTINATION, filePath is the path to a file that can be opened by an application. If the item type is wxTASKBAR_JUMP_LIST_TASK, filePath is the path to an executable that is executed when this item is clicked by the diff --git a/samples/taskbarbutton/taskbarbutton.cpp b/samples/taskbarbutton/taskbarbutton.cpp index 4e04e3510b..5fc078d09e 100644 --- a/samples/taskbarbutton/taskbarbutton.cpp +++ b/samples/taskbarbutton/taskbarbutton.cpp @@ -166,7 +166,7 @@ bool MyApp::OnInit() new wxTaskBarJumpListCategory(&jumpList, wxT("Custom")); wxTaskBarJumpListItem* item3 = new wxTaskBarJumpListItem( customCategory, - wxTASKBAR_JUMP_LIST_DESTIONATION, + wxTASKBAR_JUMP_LIST_DESTINATION, wxT("Help"), wxStandardPaths::Get().GetExecutablePath(), wxT("--help"), diff --git a/src/msw/taskbarbutton.cpp b/src/msw/taskbarbutton.cpp index de4bc3a566..c7df79b056 100644 --- a/src/msw/taskbarbutton.cpp +++ b/src/msw/taskbarbutton.cpp @@ -396,7 +396,7 @@ bool AddShellLink(IObjectCollection *collection, } if ( item.GetType() == wxTASKBAR_JUMP_LIST_TASK || - item.GetType() == wxTASKBAR_JUMP_LIST_DESTIONATION ) + item.GetType() == wxTASKBAR_JUMP_LIST_DESTINATION ) { if ( !item.GetFilePath().IsEmpty() ) shellLink->SetPath(item.GetFilePath().wc_str()); @@ -421,7 +421,7 @@ bool AddShellLink(IObjectCollection *collection, PROPVARIANT pv; if ( item.GetType() == wxTASKBAR_JUMP_LIST_TASK || - item.GetType() == wxTASKBAR_JUMP_LIST_DESTIONATION ) + item.GetType() == wxTASKBAR_JUMP_LIST_DESTINATION ) { hr = InitPropVariantFromString(item.GetTitle().wc_str(), &pv); if ( SUCCEEDED(hr) ) @@ -455,7 +455,7 @@ wxTaskBarJumpListItem* GetItemFromIShellLink(IShellLink* link) return NULL; wxTaskBarJumpListItem* item = - new wxTaskBarJumpListItem(NULL, wxTASKBAR_JUMP_LIST_DESTIONATION); + new wxTaskBarJumpListItem(NULL, wxTASKBAR_JUMP_LIST_DESTINATION); wxCOMPtr linkProps; HRESULT hr = link->QueryInterface @@ -496,7 +496,7 @@ wxTaskBarJumpListItem* GetItemFromIShellItem(IShellItem *shellItem) return NULL; wxTaskBarJumpListItem *item = - new wxTaskBarJumpListItem(NULL, wxTASKBAR_JUMP_LIST_DESTIONATION); + new wxTaskBarJumpListItem(NULL, wxTASKBAR_JUMP_LIST_DESTINATION); wchar_t *name; shellItem->GetDisplayName(SIGDN_FILESYSPATH, &name); @@ -577,7 +577,7 @@ private: bool BeginUpdate(); bool CommitUpdate(); void AddTasksToDestinationList(); - void AddCustomCategoriesToDestionationList(); + void AddCustomCategoriesToDestinationList(); void LoadKnownCategory(const wxString& title); wxTaskBarJumpList *m_jumpList; @@ -1315,7 +1315,7 @@ void wxTaskBarJumpListImpl::Update() return; AddTasksToDestinationList(); - AddCustomCategoriesToDestionationList(); + AddCustomCategoriesToDestinationList(); if ( m_recent_visible ) m_destinationList->AppendKnownCategory(KDC_RECENT); if ( m_frequent_visible ) @@ -1450,7 +1450,7 @@ void wxTaskBarJumpListImpl::AddTasksToDestinationList() m_destinationList->AddUserTasks(collection); } -void wxTaskBarJumpListImpl::AddCustomCategoriesToDestionationList() +void wxTaskBarJumpListImpl::AddCustomCategoriesToDestinationList() { for ( wxTaskBarJumpListCategories::iterator it = m_customCategories.begin(); it != m_customCategories.end(); @@ -1466,7 +1466,7 @@ void wxTaskBarJumpListImpl::AddCustomCategoriesToDestionationList() ++iter ) { wxASSERT_MSG( - (*iter)->GetType() == wxTASKBAR_JUMP_LIST_DESTIONATION, + (*iter)->GetType() == wxTASKBAR_JUMP_LIST_DESTINATION, "Invalid category item." ); AddShellLink(collection, *(*iter)); }