Added event Clone functions

[wxWidgets.git] / src / msw / window.cpp

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index dc8a9563588b2c9bfc6f6f28a06343acb8bf6fd9..10d88547e1da44228fb3beaf2eaaa90ef0305d1d 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -118,7 +118,6 @@
     #endif
 #endif
 
     #endif
 #endif
 

-

 // ---------------------------------------------------------------------------
 // global variables
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // global variables
 // ---------------------------------------------------------------------------


@@ -2594,14 +2593,11 @@ long wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam
 // wxWindow <-> HWND map
 // ----------------------------------------------------------------------------
 
 // wxWindow <-> HWND map
 // ----------------------------------------------------------------------------
 

-wxList *wxWinHandleList = NULL;
+wxWinHashTable *wxWinHandleHash = NULL;

 
 wxWindow *wxFindWinFromHandle(WXHWND hWnd)
 {
 
 wxWindow *wxFindWinFromHandle(WXHWND hWnd)
 {

-    wxNode *node = wxWinHandleList->Find((long)hWnd);
-    if ( !node )
-        return NULL;
-    return (wxWindow *)node->Data();
+    return wxWinHandleHash->Get((long)hWnd);

 }
 
 void wxAssociateWinWithHandle(HWND hWnd, wxWindowMSW *win)
 }
 
 void wxAssociateWinWithHandle(HWND hWnd, wxWindowMSW *win)


@@ -2622,13 +2618,13 @@ void wxAssociateWinWithHandle(HWND hWnd, wxWindowMSW *win)
 #endif // __WXDEBUG__
     if (!oldWin)
     {
 #endif // __WXDEBUG__
     if (!oldWin)
     {

-        wxWinHandleList->Append((long)hWnd, win);
+        wxWinHandleHash->Put((long)hWnd, win);

     }
 }
 
 void wxRemoveHandleAssociation(wxWindowMSW *win)
 {
     }
 }
 
 void wxRemoveHandleAssociation(wxWindowMSW *win)
 {

-    wxWinHandleList->DeleteObject(win);
+    wxWinHandleHash->Delete((long)win->GetHWND());

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -3067,11 +3063,9 @@ bool wxWindowMSW::HandleDropFiles(WXWPARAM wParam)
 {
 #ifndef __WXMICROWIN__
     HDROP hFilesInfo = (HDROP) wParam;
 {
 #ifndef __WXMICROWIN__
     HDROP hFilesInfo = (HDROP) wParam;

-    POINT dropPoint;
-    DragQueryPoint(hFilesInfo, (LPPOINT) &dropPoint);

 
     // Get the total number of files dropped
 
     // Get the total number of files dropped

-    WORD gwFilesDropped = (WORD)::DragQueryFile
+    UINT gwFilesDropped = ::DragQueryFile

                             (
                                 (HDROP)hFilesInfo,
                                 (UINT)-1,
                             (
                                 (HDROP)hFilesInfo,
                                 (UINT)-1,


@@ -3080,24 +3074,28 @@ bool wxWindowMSW::HandleDropFiles(WXWPARAM wParam)
                             );
 
     wxString *files = new wxString[gwFilesDropped];
                             );
 
     wxString *files = new wxString[gwFilesDropped];

-    int wIndex;
-    for (wIndex=0; wIndex < (int)gwFilesDropped; wIndex++)
+    for ( UINT wIndex = 0; wIndex < gwFilesDropped; wIndex++ )

     {
     {

-        DragQueryFile (hFilesInfo, wIndex, (LPTSTR) wxBuffer, 1000);
-        files[wIndex] = wxBuffer;
+        // first get the needed buffer length (+1 for terminating NUL)
+        size_t len = ::DragQueryFile(hFilesInfo, wIndex, NULL, 0) + 1;
+
+        // and now get the file name
+        ::DragQueryFile(hFilesInfo, wIndex,
+                        files[wIndex].GetWriteBuf(len), len);
+
+        files[wIndex].UngetWriteBuf();

     }
     DragFinish (hFilesInfo);
 
     wxDropFilesEvent event(wxEVT_DROP_FILES, gwFilesDropped, files);
     event.m_eventObject = this;
     }
     DragFinish (hFilesInfo);
 
     wxDropFilesEvent event(wxEVT_DROP_FILES, gwFilesDropped, files);
     event.m_eventObject = this;

+
+    POINT dropPoint;
+    DragQueryPoint(hFilesInfo, (LPPOINT) &dropPoint);

     event.m_pos.x = dropPoint.x;
     event.m_pos.y = dropPoint.y;
 
     event.m_pos.x = dropPoint.x;
     event.m_pos.y = dropPoint.y;
 

-    bool rc = GetEventHandler()->ProcessEvent(event);
-
-    delete[] files;
-
-    return rc;
+    return GetEventHandler()->ProcessEvent(event);

 #else // __WXMICROWIN__
     return FALSE;
 #endif
 #else // __WXMICROWIN__
     return FALSE;
 #endif


@@ -3526,7 +3524,7 @@ bool wxWindowMSW::HandleGetMinMaxInfo(void *mmInfo)
 bool wxWindowMSW::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control)
 {
 #if wxUSE_MENUS_NATIVE
 bool wxWindowMSW::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control)
 {
 #if wxUSE_MENUS_NATIVE

-    if ( wxCurrentPopupMenu )
+    if ( !cmd && wxCurrentPopupMenu )

     {
         wxMenu *popupMenu = wxCurrentPopupMenu;
         wxCurrentPopupMenu = NULL;
     {
         wxMenu *popupMenu = wxCurrentPopupMenu;
         wxCurrentPopupMenu = NULL;


@@ -3535,14 +3533,14 @@ bool wxWindowMSW::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control)
     }
 #endif // wxUSE_MENUS_NATIVE
 
     }
 #endif // wxUSE_MENUS_NATIVE
 

-    wxWindow *win = (wxWindow*) NULL;
+    wxWindow *win = NULL;

     if ( cmd == 0 || cmd == 1 ) // menu or accel - use id
     {
         // must cast to a signed type before comparing with other ids!
         win = FindItem((signed short)id);
     }
 
     if ( cmd == 0 || cmd == 1 ) // menu or accel - use id
     {
         // must cast to a signed type before comparing with other ids!
         win = FindItem((signed short)id);
     }
 

-    if (!win && control)
+    if ( !win && control )

     {
         // find it from HWND - this works even with the broken programs using
         // the same ids for different controls
     {
         // find it from HWND - this works even with the broken programs using
         // the same ids for different controls