no real changes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21833 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 2e3515e690ad1d80f49cefc5cb4ad73e43d95b6b..b4a87c8cc49c69198adcede77813ba2787632a4d 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -744,10 +744,6 @@ long wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
             }
             break;
 
             }
             break;
 

-        case WM_INITMENU:
-            processed = HandleInitMenu();
-            break;
-

         case WM_PAINT:
             processed = HandlePaint();
             break;
         case WM_PAINT:
             processed = HandlePaint();
             break;


@@ -762,15 +758,11 @@ long wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
                 processed = HandleMenuSelect(item, flags, hmenu);
             }
             break;
                 processed = HandleMenuSelect(item, flags, hmenu);
             }
             break;

-            
-        // We don't need to send the wxEVT_MENU_OPEN
-        // when we get WM_ENTERMENULOOP now, because we send
-        // it when we get WM_INITMENU.
-#if 0
-        case WM_ENTERMENULOOP:
-            processed = HandleMenuLoop(wxEVT_MENU_OPEN, wParam);
+
+        case WM_INITMENU:
+            processed = HandleInitMenu();

             break;
             break;

-#endif
+

         case WM_EXITMENULOOP:
             processed = HandleMenuLoop(wxEVT_MENU_CLOSE, wParam);
             break;
         case WM_EXITMENULOOP:
             processed = HandleMenuLoop(wxEVT_MENU_CLOSE, wParam);
             break;


@@ -800,8 +792,6 @@ bool wxFrame::HandleInitMenu()
     event.SetEventObject(this);
 
     return GetEventHandler()->ProcessEvent(event);
     event.SetEventObject(this);
 
     return GetEventHandler()->ProcessEvent(event);

-    
-    return TRUE;

 }
 
 
 }