X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/55ae15512cbb4a36648fcd7543c6f816105b6228..ad66316ffbcfd10a4fb448116371d27db3613d17:/src/msw/mdi.cpp?ds=sidebyside

diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp
index 25ff340af8..c854040c05 100644
--- a/src/msw/mdi.cpp
+++ b/src/msw/mdi.cpp
@@ -44,10 +44,6 @@
 #include "wx/stockitem.h"
 #include "wx/msw/private.h"
 
-#if wxUSE_STATUSBAR && wxUSE_NATIVE_STATUSBAR
-    #include "wx/msw/statbr95.h"
-#endif
-
 #include <string.h>
 
 // ---------------------------------------------------------------------------
@@ -348,10 +344,8 @@ void wxMDIParentFrame::OnIconized(wxIconizeEvent& event)
 {
     event.Skip();
 
-    if ( !event.Iconized() )
-    {
+    if ( !event.IsIconized() )
         UpdateClientSize();
-    }
 }
 
 // Returns the active MDI child window
@@ -522,8 +516,11 @@ bool wxMDIParentFrame::HandleActivate(int state, bool minimized, WXHWND activate
     return processed;
 }
 
-bool wxMDIParentFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd)
+bool wxMDIParentFrame::HandleCommand(WXWORD id_, WXWORD cmd, WXHWND hwnd)
 {
+    // sign extend to int from short before comparing with the other int ids
+    int id = (signed short)id_;
+
     // In case it's e.g. a toolbar.
     if ( hwnd )
     {
@@ -756,7 +753,7 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
   wxWindowCreationHook hook(this);
 
   m_hWnd = (WXHWND)::SendMessage(GetWinHwnd(parent->GetClientWindow()),
-                                 WM_MDICREATE, 0, (LONG)(LPSTR)&mcs);
+                                 WM_MDICREATE, 0, (LPARAM)&mcs);
 
   if ( !m_hWnd )
   {
@@ -1013,8 +1010,11 @@ WXLRESULT wxMDIChildFrame::MSWWindowProc(WXUINT message,
     return rc;
 }
 
-bool wxMDIChildFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd)
+bool wxMDIChildFrame::HandleCommand(WXWORD id_, WXWORD cmd, WXHWND hwnd)
 {
+    // sign extend to int from short before comparing with the other int ids
+    int id = (signed short)id_;
+
     // In case it's e.g. a toolbar.
     if ( hwnd )
     {
@@ -1430,14 +1430,15 @@ static void InsertWindowMenu(wxWindow *win, WXHMENU menu, HMENU subMenu)
             {
                 success = true;
                 ::InsertMenu(hmenu, i, MF_BYPOSITION | MF_POPUP | MF_STRING,
-                             (UINT)subMenu, _("&Window").wx_str());
+                             (UINT_PTR)subMenu, _("&Window").wx_str());
                 break;
             }
         }
 
         if ( !success )
         {
-            ::AppendMenu(hmenu, MF_POPUP, (UINT)subMenu, _("&Window").wx_str());
+            ::AppendMenu(hmenu, MF_POPUP,
+                         (UINT_PTR)subMenu, _("&Window").wx_str());
         }
     }