X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/289532452089421ddadbd4726a8469511a19ab76..74a8f67d96591cec101def2a7d47c64072aff7fd:/src/msw/frame.cpp

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index c1c96bb1ce..9126afb4d9 100644
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -864,15 +864,7 @@ bool wxFrame::HandleInitMenuPopup(WXHMENU hMenu)
     wxMenu* menu = NULL;
     if (GetMenuBar())
     {
-        int nCount = GetMenuBar()->GetMenuCount();
-        for (int n = 0; n < nCount; n++)
-        {
-            if (GetMenuBar()->GetMenu(n)->GetHMenu() == hMenu)
-            {
-                menu = GetMenuBar()->GetMenu(n);
-                break;
-            }
-        }
+        menu = GetMenuBar()->MSWGetMenu(hMenu);
     }
 
     wxMenuEvent event(wxEVT_MENU_OPEN, 0, menu);
@@ -946,7 +938,7 @@ WXLRESULT wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lPara
         case WM_QUERYDRAGICON:
             {
                 const wxIcon& icon = GetIcon();
-                HICON hIcon = icon.Ok() ? GetHiconOf(icon)
+                HICON hIcon = icon.IsOk() ? GetHiconOf(icon)
                                         : (HICON)GetDefaultIcon();
                 rc = (WXLRESULT)hIcon;
                 processed = rc != 0;