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

No real changes, just some typo fixes for previous commits.

Browse Source 
Fix wxCOMPtr comment and don't use "s_" for non-static variable.

Closes #14227.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71202 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-04-16 12:12:15 +00:00
parent 580ffdf4c0
commit 6f3320bf3d
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/msw/private/comptr.h
View File

@@ -3,7 +3,7 @@
// Purpose: Smart pointer for COM interfaces. // Purpose: Smart pointer for COM interfaces.
// Author: PB // Author: PB
// Created: 2012-04-16 // Created: 2012-04-16
// RCS-ID: $Id: $ // RCS-ID: $Id$
// Copyright: (c) 2012 wxWidgets team // Copyright: (c) 2012 wxWidgets team
// Licence: wxWindows licence // Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
@@ -12,7 +12,7 @@
#define _WX_MSW_PRIVATE_COMPTR_H_ #define _WX_MSW_PRIVATE_COMPTR_H_
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxCOMPtr: Minimalistic a smart pointer for use with COM interfaces. // wxCOMPtr: A minimalistic smart pointer for use with COM interfaces.
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
template <class T> template <class T>

8
src/msw/dirdlg.cpp
View File

@@ -357,21 +357,21 @@ int wxDirDialog::ShowIFileDialog(WXHWND owner)
REFIID, REFIID,
void**); void**);
SHCreateItemFromParsingName_t s_pfnSHCreateItemFromParsingName = NULL; SHCreateItemFromParsingName_t pfnSHCreateItemFromParsingName = NULL;
wxDynamicLibrary dllShell32; wxDynamicLibrary dllShell32;
if ( dllShell32.Load(wxS("shell32.dll"), wxDL_VERBATIM | wxDL_QUIET) ) if ( dllShell32.Load(wxS("shell32.dll"), wxDL_VERBATIM | wxDL_QUIET) )
{ {
wxDL_INIT_FUNC(s_pfn, SHCreateItemFromParsingName, dllShell32); wxDL_INIT_FUNC(pfn, SHCreateItemFromParsingName, dllShell32);
} }
if ( !s_pfnSHCreateItemFromParsingName ) if ( !pfnSHCreateItemFromParsingName )
{ {
wxLogLastError(wxS("SHCreateItemFromParsingName() not found")); wxLogLastError(wxS("SHCreateItemFromParsingName() not found"));
return wxID_NONE; return wxID_NONE;
} }
wxCOMPtr<IShellItem> folder; wxCOMPtr<IShellItem> folder;
hr = s_pfnSHCreateItemFromParsingName(m_path.wc_str(), hr = pfnSHCreateItemFromParsingName(m_path.wc_str(),
NULL, NULL,
wxIID_PPV_ARGS(IShellItem, wxIID_PPV_ARGS(IShellItem,
&folder)); &folder));