Pop event handler from wxDVC edit control before destroying it.

[wxWidgets.git] / include / wx / msw / private / fswatcher.h

diff --git a/include/wx/msw/private/fswatcher.h b/include/wx/msw/private/fswatcher.h
index 664c8eccaa124eed203ed259515eedcc26d39509..99d2a21b1746f2cc8c44debeed2149d5af7ec337 100644 (file)
--- a/include/wx/msw/private/fswatcher.h
+++ b/include/wx/msw/private/fswatcher.h
@@ -78,10 +78,13 @@ private:
     // asynchronous watched with ReadDirectoryChangesW
     static HANDLE OpenDir(const wxString& path)
     {
     // asynchronous watched with ReadDirectoryChangesW
     static HANDLE OpenDir(const wxString& path)
     {

-        HANDLE handle = CreateFile(path, FILE_LIST_DIRECTORY,
-                                   FILE_SHARE_READ | FILE_SHARE_WRITE |
+        HANDLE handle = CreateFile(path.t_str(),
+                                   FILE_LIST_DIRECTORY,
+                                   FILE_SHARE_READ |
+                                   FILE_SHARE_WRITE |

                                    FILE_SHARE_DELETE,
                                    FILE_SHARE_DELETE,

-                                   NULL, OPEN_EXISTING,
+                                   NULL,
+                                   OPEN_EXISTING,

                                    FILE_FLAG_BACKUP_SEMANTICS |
                                    FILE_FLAG_OVERLAPPED,
                                    NULL);
                                    FILE_FLAG_BACKUP_SEMANTICS |
                                    FILE_FLAG_OVERLAPPED,
                                    NULL);


@@ -158,7 +161,7 @@ public:
     {
         wxCHECK_MSG( m_iocp != INVALID_HANDLE_VALUE, false, "IOCP not init" );
 
     {
         wxCHECK_MSG( m_iocp != INVALID_HANDLE_VALUE, false, "IOCP not init" );
 

-        int ret = PostQueuedCompletionStatus(m_iocp, 0, NULL, NULL);
+        int ret = PostQueuedCompletionStatus(m_iocp, 0, 0, NULL);

         if (!ret)
         {
             wxLogSysError(_("Unable to post completion status"));
         if (!ret)
         {
             wxLogSysError(_("Unable to post completion status"));


@@ -179,7 +182,7 @@ public:
         wxCHECK_MSG( overlapped != NULL, false,
                      "Null out parameter 'overlapped'");
 
         wxCHECK_MSG( overlapped != NULL, false,
                      "Null out parameter 'overlapped'");
 

-        int ret = GetQueuedCompletionStatus(m_iocp, count, (PULONG_PTR)watch,
+        int ret = GetQueuedCompletionStatus(m_iocp, count, (ULONG_PTR *)watch,

                                             overlapped, INFINITE);
         if (!ret)
         {
                                             overlapped, INFINITE);
         if (!ret)
         {