include wx/crt.h needed for wxFprintf() (closes #9509)

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

diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp
index 7114765e93ab331640e7612d3386d34ab33b4a10..5225e86be57ba44b5faa8b93d86cfcbc97ede51a 100644 (file)
--- a/src/msw/mdi.cpp
+++ b/src/msw/mdi.cpp
@@ -44,10 +44,6 @@
 #include "wx/stockitem.h"
 #include "wx/msw/private.h"
 
 #include "wx/stockitem.h"
 #include "wx/msw/private.h"
 

-#if wxUSE_STATUSBAR && wxUSE_NATIVE_STATUSBAR
-    #include "wx/msw/statbr95.h"
-#endif
-

 #include <string.h>
 
 // ---------------------------------------------------------------------------
 #include <string.h>
 
 // ---------------------------------------------------------------------------


@@ -515,15 +511,18 @@ bool wxMDIParentFrame::HandleActivate(int state, bool minimized, WXHWND activate
     {
         wxActivateEvent event(wxEVT_ACTIVATE, true, m_currentChild->GetId());
         event.SetEventObject( m_currentChild );
     {
         wxActivateEvent event(wxEVT_ACTIVATE, true, m_currentChild->GetId());
         event.SetEventObject( m_currentChild );

-        if ( m_currentChild->GetEventHandler()->ProcessEvent(event) )
+        if ( m_currentChild->HandleWindowEvent(event) )

             processed = true;
     }
 
     return processed;
 }
 
             processed = true;
     }
 
     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 )
     {
     // In case it's e.g. a toolbar.
     if ( hwnd )
     {


@@ -601,8 +600,8 @@ bool wxMDIParentFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd)
             wxWindow *child = node->GetData();
             if ( child->GetHWND() )
             {
             wxWindow *child = node->GetData();
             if ( child->GetHWND() )
             {

-                long childId = wxGetWindowId(child->GetHWND());
-                if (childId == (long)id)
+                int childId = wxGetWindowId(child->GetHWND());
+                if ( childId == (signed short)id )

                 {
                     ::SendMessage( GetWinHwnd(GetClientWindow()),
                                    WM_MDIACTIVATE,
                 {
                     ::SendMessage( GetWinHwnd(GetClientWindow()),
                                    WM_MDIACTIVATE,


@@ -694,7 +693,7 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
   if ( id != wxID_ANY )
     m_windowId = id;
   else
   if ( id != wxID_ANY )
     m_windowId = id;
   else

-    m_windowId = (int)NewControlId();
+    m_windowId = NewControlId();

 
   if ( parent )
   {
 
   if ( parent )
   {


@@ -756,7 +755,7 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
   wxWindowCreationHook hook(this);
 
   m_hWnd = (WXHWND)::SendMessage(GetWinHwnd(parent->GetClientWindow()),
   wxWindowCreationHook hook(this);
 
   m_hWnd = (WXHWND)::SendMessage(GetWinHwnd(parent->GetClientWindow()),

-                                 WM_MDICREATE, 0, (LONG)(LPSTR)&mcs);
+                                 WM_MDICREATE, 0, (LPARAM)&mcs);

 
   if ( !m_hWnd )
   {
 
   if ( !m_hWnd )
   {


@@ -806,7 +805,7 @@ bool wxMDIChildFrame::Show(bool show)
 
     // we need to refresh the MDI frame window menu to include (or exclude if
     // we've been hidden) this frame
 
     // we need to refresh the MDI frame window menu to include (or exclude if
     // we've been hidden) this frame

-    wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
+    wxMDIParentFrame *parent = GetMDIParent();

     MDISetMenu(parent->GetClientWindow(), NULL, NULL);
 
     return true;
     MDISetMenu(parent->GetClientWindow(), NULL, NULL);
 
     return true;


@@ -845,7 +844,7 @@ void wxMDIChildFrame::DoSetClientSize(int width, int height)
 
   // If there's an MDI parent, must subtract the parent's top left corner
   // since MoveWindow moves relative to the parent
 
   // If there's an MDI parent, must subtract the parent's top left corner
   // since MoveWindow moves relative to the parent

-  wxMDIParentFrame *mdiParent = (wxMDIParentFrame *)GetParent();
+  wxMDIParentFrame *mdiParent = GetMDIParent();

   ::ScreenToClient((HWND) mdiParent->GetClientWindow()->GetHWND(), &point);
 
   MoveWindow(hWnd, point.x, point.y, actual_width, actual_height, (BOOL)true);
   ::ScreenToClient((HWND) mdiParent->GetClientWindow()->GetHWND(), &point);
 
   MoveWindow(hWnd, point.x, point.y, actual_width, actual_height, (BOOL)true);


@@ -853,7 +852,7 @@ void wxMDIChildFrame::DoSetClientSize(int width, int height)
   wxSize size(width, height);
   wxSizeEvent event(size, m_windowId);
   event.SetEventObject( this );
   wxSize size(width, height);
   wxSizeEvent event(size, m_windowId);
   event.SetEventObject( this );

-  GetEventHandler()->ProcessEvent(event);
+  HandleWindowEvent(event);

 }
 
 // Unlike other wxTopLevelWindowBase, the mdi child's "GetPosition" is not the
 }
 
 // Unlike other wxTopLevelWindowBase, the mdi child's "GetPosition" is not the


@@ -881,7 +880,7 @@ void wxMDIChildFrame::DoGetPosition(int *x, int *y) const
 
   // Since we now have the absolute screen coords,
   // if there's a parent we must subtract its top left corner
 
   // Since we now have the absolute screen coords,
   // if there's a parent we must subtract its top left corner

-  wxMDIParentFrame *mdiParent = (wxMDIParentFrame *)GetParent();
+  wxMDIParentFrame *mdiParent = GetMDIParent();

   ::ScreenToClient((HWND) mdiParent->GetClientWindow()->GetHWND(), &point);
 
   if (x)
   ::ScreenToClient((HWND) mdiParent->GetClientWindow()->GetHWND(), &point);
 
   if (x)


@@ -892,7 +891,7 @@ void wxMDIChildFrame::DoGetPosition(int *x, int *y) const
 
 void wxMDIChildFrame::InternalSetMenuBar()
 {
 
 void wxMDIChildFrame::InternalSetMenuBar()
 {

-    wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
+    wxMDIParentFrame *parent = GetMDIParent();

 
     InsertWindowMenu(parent->GetClientWindow(),
                      m_hMenu, GetMDIWindowMenu(parent));
 
     InsertWindowMenu(parent->GetClientWindow(),
                      m_hMenu, GetMDIWindowMenu(parent));


@@ -918,7 +917,7 @@ WXHICON wxMDIChildFrame::GetDefaultIcon() const
 
 void wxMDIChildFrame::Maximize(bool maximize)
 {
 
 void wxMDIChildFrame::Maximize(bool maximize)
 {

-    wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
+    wxMDIParentFrame *parent = GetMDIParent();

     if ( parent && parent->GetClientWindow() )
     {
         ::SendMessage(GetWinHwnd(parent->GetClientWindow()),
     if ( parent && parent->GetClientWindow() )
     {
         ::SendMessage(GetWinHwnd(parent->GetClientWindow()),


@@ -929,7 +928,7 @@ void wxMDIChildFrame::Maximize(bool maximize)
 
 void wxMDIChildFrame::Restore()
 {
 
 void wxMDIChildFrame::Restore()
 {

-    wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
+    wxMDIParentFrame *parent = GetMDIParent();

     if ( parent && parent->GetClientWindow() )
     {
         ::SendMessage(GetWinHwnd(parent->GetClientWindow()), WM_MDIRESTORE,
     if ( parent && parent->GetClientWindow() )
     {
         ::SendMessage(GetWinHwnd(parent->GetClientWindow()), WM_MDIRESTORE,


@@ -939,7 +938,7 @@ void wxMDIChildFrame::Restore()
 
 void wxMDIChildFrame::Activate()
 {
 
 void wxMDIChildFrame::Activate()
 {

-    wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
+    wxMDIParentFrame *parent = GetMDIParent();

     if ( parent && parent->GetClientWindow() )
     {
         ::SendMessage(GetWinHwnd(parent->GetClientWindow()), WM_MDIACTIVATE,
     if ( parent && parent->GetClientWindow() )
     {
         ::SendMessage(GetWinHwnd(parent->GetClientWindow()), WM_MDIACTIVATE,


@@ -1013,8 +1012,11 @@ WXLRESULT wxMDIChildFrame::MSWWindowProc(WXUINT message,
     return rc;
 }
 
     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 )
     {
     // In case it's e.g. a toolbar.
     if ( hwnd )
     {


@@ -1048,7 +1050,7 @@ bool wxMDIChildFrame::HandleMDIActivate(long WXUNUSED(activate),
                                         WXHWND hwndAct,
                                         WXHWND hwndDeact)
 {
                                         WXHWND hwndAct,
                                         WXHWND hwndDeact)
 {

-    wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
+    wxMDIParentFrame *parent = GetMDIParent();

 
     HMENU menuToSet = 0;
 
 
     HMENU menuToSet = 0;
 


@@ -1103,7 +1105,7 @@ bool wxMDIChildFrame::HandleMDIActivate(long WXUNUSED(activate),
 
     ResetWindowStyle((void *)NULL);
 
 
     ResetWindowStyle((void *)NULL);
 

-    return GetEventHandler()->ProcessEvent(event);
+    return HandleWindowEvent(event);

 }
 
 bool wxMDIChildFrame::HandleWindowPosChanging(void *pos)
 }
 
 bool wxMDIChildFrame::HandleWindowPosChanging(void *pos)


@@ -1172,7 +1174,7 @@ bool wxMDIChildFrame::MSWTranslateMessage(WXMSG* msg)
 {
     // we must pass the parent frame to ::TranslateAccelerator(), otherwise it
     // doesn't do its job correctly for MDI child menus
 {
     // we must pass the parent frame to ::TranslateAccelerator(), otherwise it
     // doesn't do its job correctly for MDI child menus

-    return MSWDoTranslateMessage((wxMDIChildFrame *)GetParent(), msg);
+    return MSWDoTranslateMessage(GetMDIParent(), msg);

 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------


@@ -1181,7 +1183,7 @@ bool wxMDIChildFrame::MSWTranslateMessage(WXMSG* msg)
 
 void wxMDIChildFrame::MSWDestroyWindow()
 {
 
 void wxMDIChildFrame::MSWDestroyWindow()
 {

-    wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
+    wxMDIParentFrame *parent = GetMDIParent();

 
     // Must make sure this handle is invalidated (set to NULL) since all sorts
     // of things could happen after the child client is destroyed, but before
 
     // Must make sure this handle is invalidated (set to NULL) since all sorts
     // of things could happen after the child client is destroyed, but before


@@ -1208,7 +1210,7 @@ void wxMDIChildFrame::MSWDestroyWindow()
 bool wxMDIChildFrame::ResetWindowStyle(void *vrect)
 {
     RECT *rect = (RECT *)vrect;
 bool wxMDIChildFrame::ResetWindowStyle(void *vrect)
 {
     RECT *rect = (RECT *)vrect;

-    wxMDIParentFrame* pFrameWnd = (wxMDIParentFrame *)GetParent();
+    wxMDIParentFrame* pFrameWnd = GetMDIParent();

     wxMDIChildFrame* pChild = pFrameWnd->GetActiveChild();
 
     if (!pChild || (pChild == this))
     wxMDIChildFrame* pChild = pFrameWnd->GetActiveChild();
 
     if (!pChild || (pChild == this))


@@ -1430,14 +1432,15 @@ static void InsertWindowMenu(wxWindow *win, WXHMENU menu, HMENU subMenu)
             {
                 success = true;
                 ::InsertMenu(hmenu, i, MF_BYPOSITION | MF_POPUP | MF_STRING,
             {
                 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 )
         {
                 break;
             }
         }
 
         if ( !success )
         {

-            ::AppendMenu(hmenu, MF_POPUP, (UINT)subMenu, _("&Window").wx_str());
+            ::AppendMenu(hmenu, MF_POPUP,
+                         (UINT_PTR)subMenu, _("&Window").wx_str());

         }
     }
 
         }
     }