* Removed BASE_AND_GUI_MAC_SRC. At the moment DARWIN/MAC are identical

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

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 2e3515e690ad1d80f49cefc5cb4ad73e43d95b6b..76bba0ef4b8bc592a88add4332833ebcf2399041 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -455,7 +455,7 @@ void wxFrame::PositionToolBar()
 // on the desktop, but are iconized/restored with it
 void wxFrame::IconizeChildFrames(bool bIconize)
 {
-    for ( wxWindowList::Node *node = GetChildren().GetFirst();
+    for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
           node;
           node = node->GetNext() )
     {
@@ -744,10 +744,6 @@ long wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
             }
             break;
 
-        case WM_INITMENU:
-            processed = HandleInitMenu();
-            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;
-            
-        // 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;
-#endif
+
         case WM_EXITMENULOOP:
             processed = HandleMenuLoop(wxEVT_MENU_CLOSE, wParam);
             break;
@@ -800,8 +792,6 @@ bool wxFrame::HandleInitMenu()
     event.SetEventObject(this);
 
     return GetEventHandler()->ProcessEvent(event);
-    
-    return TRUE;
 }