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

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

diff --git a/include/wx/msw/private/comptr.h b/include/wx/msw/private/comptr.h
index 26c21573d1ea88b5ded215c96d82ad03a025d6e3..286fcdefc0dc54dd24f75f9fef4f1606f59cb208 100644 (file)
--- a/include/wx/msw/private/comptr.h
+++ b/include/wx/msw/private/comptr.h
@@ -3,7 +3,7 @@
 // Purpose:     Smart pointer for COM interfaces.
 // Author:      PB
 // Created:     2012-04-16
 // Purpose:     Smart pointer for COM interfaces.
 // Author:      PB
 // Created:     2012-04-16

-// RCS-ID:      $Id: $
+// RCS-ID:      $Id$

 // Copyright:   (c) 2012 wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2012 wxWidgets team
 // 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>

diff --git a/src/msw/dirdlg.cpp b/src/msw/dirdlg.cpp
index cdc10224640e769afd881d6db1eb540dec725d99..df4e4ddb541d05481fc7b00c4d8a194f5d6e271d 100644 (file)
--- a/src/msw/dirdlg.cpp
+++ b/src/msw/dirdlg.cpp
@@ -357,21 +357,21 @@ int wxDirDialog::ShowIFileDialog(WXHWND owner)
                                                 REFIID,
                                                 void**);
 
                                                 REFIID,
                                                 void**);
 

-        SHCreateItemFromParsingName_t s_pfnSHCreateItemFromParsingName = NULL;
+        SHCreateItemFromParsingName_t pfnSHCreateItemFromParsingName = NULL;

         wxDynamicLibrary dllShell32;
         if ( dllShell32.Load(wxS("shell32.dll"), wxDL_VERBATIM | wxDL_QUIET) )
         {
         wxDynamicLibrary dllShell32;
         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"));
             return wxID_NONE;
         }
 
         wxCOMPtr<IShellItem> folder;
         {
             wxLogLastError(wxS("SHCreateItemFromParsingName() not found"));
             return wxID_NONE;
         }
 
         wxCOMPtr<IShellItem> folder;

-        hr = s_pfnSHCreateItemFromParsingName(m_path.wc_str(),
+        hr = pfnSHCreateItemFromParsingName(m_path.wc_str(),

                                               NULL,
                                               wxIID_PPV_ARGS(IShellItem,
                                                              &folder));
                                               NULL,
                                               wxIID_PPV_ARGS(IShellItem,
                                                              &folder));