diff --git a/include/wx/msw/winundef.h b/include/wx/msw/winundef.h
index 3d657f4c21..25bcb7d67e 100644
--- a/include/wx/msw/winundef.h
+++ b/include/wx/msw/winundef.h
@@ -144,7 +144,20 @@
       return GetObjectW(h, i, buffer);
    #else
       return GetObjectA(h, i, buffer);
-   #endif   
+   #endif
+   }
+#endif
+
+
+#ifdef GetMessage
+   #undef GetMessage
+   inline int GetMessage(LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT wMsgFilterMax)
+   {
+   #ifdef _UNICODE
+      return GetMessageW(lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax);
+   #else
+      return GetMessageA(lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax);
+   #endif
    }
 #endif