diff --git a/docs/changes.txt b/docs/changes.txt
index aa9cfbb8c5..fad051e735 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -600,6 +600,7 @@ wxMSW:
 - Fix autosize after expanding/collapsing items in wxDataViewCtrl (ciglesias).
 - Fix inserting tools removed from wxToolBar back into it (sbrowne).
 - Fix disabling submenu items in the menus (Artur Wieczorek).
+- Fix wxEVT_TREE_STATE_IMAGE_CLICK generation (Antal).
 
 wxOSX:
 
diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index 754ea316c3..e150cfc6d7 100644
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -3639,8 +3639,8 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
             {
                 DWORD pos = GetMessagePos();
                 POINT point;
-                point.x = LOWORD(pos);
-                point.y = HIWORD(pos);
+                point.x = GET_X_LPARAM(pos);
+                point.y = GET_Y_LPARAM(pos);
                 ::MapWindowPoints(HWND_DESKTOP, GetHwnd(), &point, 1);
                 int htFlags = 0;
                 wxTreeItemId item = HitTest(wxPoint(point.x, point.y), htFlags);