Fix 'destionation' typos

Rename relatively new enum value wxTASKBAR_JUMP_LIST_DESTIONATION to
wxTASKBAR_JUMP_LIST_DESTINATION as well as a private function containing
the same typo.
This commit is contained in:
Dimitri Schoolwerth
2017-06-21 22:48:08 +04:00
parent bb306b7ed0
commit 07c8f15e43
5 changed files with 15 additions and 12 deletions

View File

@@ -68,6 +68,9 @@ INCOMPATIBLE CHANGES SINCE 3.1.0:
3.1.0, have been renamed to HasCheckBoxes and EnableCheckBoxes respectively 3.1.0, have been renamed to HasCheckBoxes and EnableCheckBoxes respectively
for consistency with wxCheckBox naming. 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: All:

View File

@@ -142,7 +142,7 @@ enum wxTaskBarJumpListItemType
{ {
wxTASKBAR_JUMP_LIST_SEPARATOR, wxTASKBAR_JUMP_LIST_SEPARATOR,
wxTASKBAR_JUMP_LIST_TASK, wxTASKBAR_JUMP_LIST_TASK,
wxTASKBAR_JUMP_LIST_DESTIONATION wxTASKBAR_JUMP_LIST_DESTINATION
}; };
class WXDLLIMPEXP_CORE wxTaskBarJumpListItem class WXDLLIMPEXP_CORE wxTaskBarJumpListItem

View File

@@ -345,7 +345,7 @@ enum wxTaskBarJumpListItemType
wxTASKBAR_JUMP_LIST_TASK, wxTASKBAR_JUMP_LIST_TASK,
/** Item acts as a link to a file that the application can open. */ /** 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. The title of this item.
@param filePath @param filePath
The filePath of this item, the meaning of which depends on the type 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. 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 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 to an executable that is executed when this item is clicked by the

View File

@@ -166,7 +166,7 @@ bool MyApp::OnInit()
new wxTaskBarJumpListCategory(&jumpList, wxT("Custom")); new wxTaskBarJumpListCategory(&jumpList, wxT("Custom"));
wxTaskBarJumpListItem* item3 = new wxTaskBarJumpListItem( wxTaskBarJumpListItem* item3 = new wxTaskBarJumpListItem(
customCategory, customCategory,
wxTASKBAR_JUMP_LIST_DESTIONATION, wxTASKBAR_JUMP_LIST_DESTINATION,
wxT("Help"), wxT("Help"),
wxStandardPaths::Get().GetExecutablePath(), wxStandardPaths::Get().GetExecutablePath(),
wxT("--help"), wxT("--help"),

View File

@@ -396,7 +396,7 @@ bool AddShellLink(IObjectCollection *collection,
} }
if ( item.GetType() == wxTASKBAR_JUMP_LIST_TASK || if ( item.GetType() == wxTASKBAR_JUMP_LIST_TASK ||
item.GetType() == wxTASKBAR_JUMP_LIST_DESTIONATION ) item.GetType() == wxTASKBAR_JUMP_LIST_DESTINATION )
{ {
if ( !item.GetFilePath().IsEmpty() ) if ( !item.GetFilePath().IsEmpty() )
shellLink->SetPath(item.GetFilePath().wc_str()); shellLink->SetPath(item.GetFilePath().wc_str());
@@ -421,7 +421,7 @@ bool AddShellLink(IObjectCollection *collection,
PROPVARIANT pv; PROPVARIANT pv;
if ( item.GetType() == wxTASKBAR_JUMP_LIST_TASK || 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); hr = InitPropVariantFromString(item.GetTitle().wc_str(), &pv);
if ( SUCCEEDED(hr) ) if ( SUCCEEDED(hr) )
@@ -455,7 +455,7 @@ wxTaskBarJumpListItem* GetItemFromIShellLink(IShellLink* link)
return NULL; return NULL;
wxTaskBarJumpListItem* item = wxTaskBarJumpListItem* item =
new wxTaskBarJumpListItem(NULL, wxTASKBAR_JUMP_LIST_DESTIONATION); new wxTaskBarJumpListItem(NULL, wxTASKBAR_JUMP_LIST_DESTINATION);
wxCOMPtr<IPropertyStore> linkProps; wxCOMPtr<IPropertyStore> linkProps;
HRESULT hr = link->QueryInterface HRESULT hr = link->QueryInterface
@@ -496,7 +496,7 @@ wxTaskBarJumpListItem* GetItemFromIShellItem(IShellItem *shellItem)
return NULL; return NULL;
wxTaskBarJumpListItem *item = wxTaskBarJumpListItem *item =
new wxTaskBarJumpListItem(NULL, wxTASKBAR_JUMP_LIST_DESTIONATION); new wxTaskBarJumpListItem(NULL, wxTASKBAR_JUMP_LIST_DESTINATION);
wchar_t *name; wchar_t *name;
shellItem->GetDisplayName(SIGDN_FILESYSPATH, &name); shellItem->GetDisplayName(SIGDN_FILESYSPATH, &name);
@@ -577,7 +577,7 @@ private:
bool BeginUpdate(); bool BeginUpdate();
bool CommitUpdate(); bool CommitUpdate();
void AddTasksToDestinationList(); void AddTasksToDestinationList();
void AddCustomCategoriesToDestionationList(); void AddCustomCategoriesToDestinationList();
void LoadKnownCategory(const wxString& title); void LoadKnownCategory(const wxString& title);
wxTaskBarJumpList *m_jumpList; wxTaskBarJumpList *m_jumpList;
@@ -1315,7 +1315,7 @@ void wxTaskBarJumpListImpl::Update()
return; return;
AddTasksToDestinationList(); AddTasksToDestinationList();
AddCustomCategoriesToDestionationList(); AddCustomCategoriesToDestinationList();
if ( m_recent_visible ) if ( m_recent_visible )
m_destinationList->AppendKnownCategory(KDC_RECENT); m_destinationList->AppendKnownCategory(KDC_RECENT);
if ( m_frequent_visible ) if ( m_frequent_visible )
@@ -1450,7 +1450,7 @@ void wxTaskBarJumpListImpl::AddTasksToDestinationList()
m_destinationList->AddUserTasks(collection); m_destinationList->AddUserTasks(collection);
} }
void wxTaskBarJumpListImpl::AddCustomCategoriesToDestionationList() void wxTaskBarJumpListImpl::AddCustomCategoriesToDestinationList()
{ {
for ( wxTaskBarJumpListCategories::iterator it = m_customCategories.begin(); for ( wxTaskBarJumpListCategories::iterator it = m_customCategories.begin();
it != m_customCategories.end(); it != m_customCategories.end();
@@ -1466,7 +1466,7 @@ void wxTaskBarJumpListImpl::AddCustomCategoriesToDestionationList()
++iter ) ++iter )
{ {
wxASSERT_MSG( wxASSERT_MSG(
(*iter)->GetType() == wxTASKBAR_JUMP_LIST_DESTIONATION, (*iter)->GetType() == wxTASKBAR_JUMP_LIST_DESTINATION,
"Invalid category item." ); "Invalid category item." );
AddShellLink(collection, *(*iter)); AddShellLink(collection, *(*iter));
} }