X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e1a6fc11e208d85b5dae82a8adc0dc7535cd5958..02e8b2f9fbdfcd25080c42082d637da257c20094:/src/msw/mdi.cpp

diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp
index cc61bb583a..2ec45d19b7 100644
--- a/src/msw/mdi.cpp
+++ b/src/msw/mdi.cpp
@@ -487,6 +487,7 @@ bool wxMDIParentFrame::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control)
     if (win)
       return win->MSWCommand(cmd, id);
 
+/*
     if (wxCurrentPopupMenu)
     {
         wxMenu *popupMenu = wxCurrentPopupMenu;
@@ -494,6 +495,7 @@ bool wxMDIParentFrame::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control)
         if (!popupMenu->MSWCommand(cmd, id))
             return TRUE;
     }
+*/
 
     switch (id)
     {
@@ -1223,7 +1225,7 @@ long wxMDIClientWindow::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPa
 long wxMDIClientWindow::MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {
 	if ( MSWGetOldWndProc() != 0)
-  		return ::CallWindowProc(CASTWNDPROC (FARPROC) MSWGetOldWndProc(), (HWND) GetHWND(), (UINT) nMsg, (WPARAM) wParam, (LPARAM) lParam);
+  		return ::CallWindowProc(CASTWNDPROC MSWGetOldWndProc(), (HWND) GetHWND(), (UINT) nMsg, (WPARAM) wParam, (LPARAM) lParam);
 	else
 		return ::DefWindowProc((HWND) m_hWnd, (UINT) nMsg, (WPARAM) wParam, (LPARAM) lParam);
 }