Changed the "delete win" to the more proper "win->Destroy()" in

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

diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp
index 55998c12407ae11af4cd3ffba45b6cdc4fee3704..61653c10fe32b846063a8d3659107ca57ee3ca55 100644 (file)
--- a/src/msw/mdi.cpp
+++ b/src/msw/mdi.cpp
@@ -34,13 +34,14 @@
 #include "wx/mdi.h"
 #include "wx/msw/private.h"
 
 #include "wx/mdi.h"
 #include "wx/msw/private.h"
 

-#if USE_NATIVE_STATUSBAR
+#if wxUSE_NATIVE_STATUSBAR

 #include <wx/msw/statbr95.h>
 #endif
 
 #include <string.h>
 
 extern wxList wxModelessWindows;
 #include <wx/msw/statbr95.h>
 #endif
 
 #include <string.h>
 
 extern wxList wxModelessWindows;

+extern wxMenu *wxCurrentPopupMenu;

 
 #define IDM_WINDOWTILE  4001
 #define IDM_WINDOWCASCADE 4002
 
 #define IDM_WINDOWTILE  4001
 #define IDM_WINDOWCASCADE 4002


@@ -119,10 +120,6 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
 
   m_windowMenu = (WXHMENU) ::LoadMenu(wxGetInstance(), "wxWindowMenu");
 
 
   m_windowMenu = (WXHMENU) ::LoadMenu(wxGetInstance(), "wxWindowMenu");
 

-#if WXDEBUG > 1
-  wxDebugMsg("Loaded m_windowMenu %d\n", m_windowMenu);
-#endif
-

   DWORD msflags = WS_OVERLAPPED ;
   if (style & wxMINIMIZE_BOX)
     msflags |= WS_MINIMIZEBOX;
   DWORD msflags = WS_OVERLAPPED ;
   if (style & wxMINIMIZE_BOX)
     msflags |= WS_MINIMIZEBOX;


@@ -265,7 +262,7 @@ void wxMDIParentFrame::SetMenuBar(wxMenuBar *menu_bar)
 
 void wxMDIParentFrame::OnSize(wxSizeEvent& event)
 {
 
 void wxMDIParentFrame::OnSize(wxSizeEvent& event)
 {

-#if USE_CONSTRAINTS
+#if wxUSE_CONSTRAINTS

     if (GetAutoLayout())
       Layout();
 #endif
     if (GetAutoLayout())
       Layout();
 #endif


@@ -279,7 +276,7 @@ void wxMDIParentFrame::OnSize(wxSizeEvent& event)
 
 /* Already done in MSWOnSize
   // forward WM_SIZE to status bar control
 
 /* Already done in MSWOnSize
   // forward WM_SIZE to status bar control

-#if USE_NATIVE_STATUSBAR
+#if wxUSE_NATIVE_STATUSBAR

   if (m_frameStatusBar && m_frameStatusBar->IsKindOf(CLASSINFO(wxStatusBar95)))
     ((wxStatusBar95 *)m_frameStatusBar)->OnSize(event);
 #endif
   if (m_frameStatusBar && m_frameStatusBar->IsKindOf(CLASSINFO(wxStatusBar95)))
     ((wxStatusBar95 *)m_frameStatusBar)->OnSize(event);
 #endif


@@ -302,7 +299,7 @@ void wxMDIParentFrame::OldOnSize(int x, int y)
   GetEventHandler()->ProcessEvent(event);
 #else
 
   GetEventHandler()->ProcessEvent(event);
 #else
 

-#if USE_CONSTRAINTS
+#if wxUSE_CONSTRAINTS

   if (GetAutoLayout())
     Layout();
 #endif
   if (GetAutoLayout())
     Layout();
 #endif


@@ -442,7 +439,7 @@ void wxMDIParentFrame::MSWOnSize(int x, int y, WXUINT id)
  if (!m_iconized)
  {
   // forward WM_SIZE to status bar control
  if (!m_iconized)
  {
   // forward WM_SIZE to status bar control

-#if USE_NATIVE_STATUSBAR
+#if wxUSE_NATIVE_STATUSBAR

   if (m_frameStatusBar && m_frameStatusBar->IsKindOf(CLASSINFO(wxStatusBar95)))
   {
     wxSizeEvent event(wxSize(x, y), m_frameStatusBar->GetId());
   if (m_frameStatusBar && m_frameStatusBar->IsKindOf(CLASSINFO(wxStatusBar95)))
   {
     wxSizeEvent event(wxSize(x, y), m_frameStatusBar->GetId());


@@ -479,13 +476,23 @@ bool wxMDIParentFrame::MSWOnActivate(int state, bool minimized, WXHWND activate)
 
 bool wxMDIParentFrame::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control)
 {
 
 bool wxMDIParentFrame::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control)
 {

-  if (cmd == 0)
+//  if (cmd == 0) // Why did I do this test?

   {
     // In case it's e.g. a toolbar.
     wxWindow *win = wxFindWinFromHandle(control);
     if (win)
       return win->MSWCommand(cmd, id);
 
   {
     // In case it's e.g. a toolbar.
     wxWindow *win = wxFindWinFromHandle(control);
     if (win)
       return win->MSWCommand(cmd, id);
 

+/*
+    if (wxCurrentPopupMenu)
+    {
+        wxMenu *popupMenu = wxCurrentPopupMenu;
+        wxCurrentPopupMenu = NULL;
+        if (!popupMenu->MSWCommand(cmd, id))
+            return TRUE;
+    }
+*/
+

     switch (id)
     {
       case IDM_WINDOWCASCADE:
     switch (id)
     {
       case IDM_WINDOWCASCADE:


@@ -505,9 +512,6 @@ bool wxMDIParentFrame::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control)
      }
     if (id >= 0xF000)
     {
      }
     if (id >= 0xF000)
     {

-#if WXDEBUG > 1
-      wxDebugMsg("wxMDIFrame::OnCommand %d: system command: calling default window proc\n", GetHWND());
-#endif

       return FALSE; // Get WndProc to call default proc
     }
     
       return FALSE; // Get WndProc to call default proc
     }
     


@@ -518,15 +522,12 @@ bool wxMDIParentFrame::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control)
     }
     else if (m_currentChild && (id < wxFIRST_MDI_CHILD || id > wxLAST_MDI_CHILD))
     {
     }
     else if (m_currentChild && (id < wxFIRST_MDI_CHILD || id > wxLAST_MDI_CHILD))
     {

-#if WXDEBUG > 1
-      wxDebugMsg("wxMDIFrame::MSWOnCommand %d: calling child OnCommand\n", GetHWND());
-#endif

       return m_currentChild->MSWOnCommand(id, cmd, control);
     }
   }
   if (id >= wxFIRST_MDI_CHILD && id <= wxLAST_MDI_CHILD)
   {
       return m_currentChild->MSWOnCommand(id, cmd, control);
     }
   }
   if (id >= wxFIRST_MDI_CHILD && id <= wxLAST_MDI_CHILD)
   {

-    wxNode* node = GetChildren()->First();
+    wxNode* node = GetChildren().First();

     while (node)
     {
         wxWindow* child = (wxWindow*) node->Data();
     while (node)
     {
         wxWindow* child = (wxWindow*) node->Data();


@@ -593,14 +594,22 @@ long wxMDIParentFrame::MSWDefWindowProc(WXUINT message, WXWPARAM wParam, WXLPARA
 }
 
 bool wxMDIParentFrame::MSWProcessMessage(WXMSG* msg)
 }
 
 bool wxMDIParentFrame::MSWProcessMessage(WXMSG* msg)

+{
+  if ((m_currentChild != (wxWindow *)NULL) && (m_currentChild->GetHWND() != (WXHWND) NULL) && m_currentChild->MSWProcessMessage(msg))
+     return TRUE;
+       
+  return FALSE;
+}
+
+bool wxMDIParentFrame::MSWTranslateMessage(WXMSG* msg)

 {
   MSG *pMsg = (MSG *)msg;
 
 {
   MSG *pMsg = (MSG *)msg;
 

-  if ((m_currentChild != (wxWindow *)NULL) && (m_currentChild->GetHWND() != (WXHWND) NULL) && m_currentChild->MSWProcessMessage(msg))
+  if ((m_currentChild != (wxWindow *)NULL) && (m_currentChild->GetHWND() != (WXHWND) NULL) && m_currentChild->MSWTranslateMessage(msg))

      return TRUE;
        
      return TRUE;
        

-  if (m_acceleratorTable != (WXHANDLE) NULL &&
-          ::TranslateAccelerator((HWND) GetHWND(), (HACCEL) m_acceleratorTable, pMsg))
+  if (m_acceleratorTable.Ok() &&
+          ::TranslateAccelerator((HWND) GetHWND(), (HACCEL) m_acceleratorTable.GetHACCEL(), pMsg))

     return TRUE;
 
   if (pMsg->message == WM_KEYDOWN || pMsg->message == WM_SYSKEYDOWN)
     return TRUE;
 
   if (pMsg->message == WM_KEYDOWN || pMsg->message == WM_SYSKEYDOWN)


@@ -612,6 +621,7 @@ bool wxMDIParentFrame::MSWProcessMessage(WXMSG* msg)
   return FALSE;
 }
 
   return FALSE;
 }
 

+

 bool wxMDIParentFrame::MSWOnEraseBkgnd(WXHDC WXUNUSED(pDC))
 {
   return TRUE;
 bool wxMDIParentFrame::MSWOnEraseBkgnd(WXHDC WXUNUSED(pDC))
 {
   return TRUE;


@@ -874,9 +884,6 @@ void wxMDIChildFrame::MSWOnSize(int x, int y, WXUINT id)
 
   if (invalidHandle == (HWND) GetHWND())
   {
 
   if (invalidHandle == (HWND) GetHWND())
   {

-#if WXDEBUG > 1
-  wxDebugMsg("wxMDIChildFrame::OnSize %d: invalid, so returning.\n", GetHWND());
-#endif

     return;
   }
   
     return;
   }
   


@@ -896,7 +903,7 @@ void wxMDIChildFrame::MSWOnSize(int x, int y, WXUINT id)
   if (!m_iconized)
   {
     // forward WM_SIZE to status bar control
   if (!m_iconized)
   {
     // forward WM_SIZE to status bar control

-#if USE_NATIVE_STATUSBAR
+#if wxUSE_NATIVE_STATUSBAR

     if (m_frameStatusBar && m_frameStatusBar->IsKindOf(CLASSINFO(wxStatusBar95)))
     {
       wxSizeEvent event(wxSize(x, y), m_frameStatusBar->GetId());
     if (m_frameStatusBar && m_frameStatusBar->IsKindOf(CLASSINFO(wxStatusBar95)))
     {
       wxSizeEvent event(wxSize(x, y), m_frameStatusBar->GetId());


@@ -915,16 +922,22 @@ void wxMDIChildFrame::MSWOnSize(int x, int y, WXUINT id)
 
 bool wxMDIChildFrame::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control)
 {
 
 bool wxMDIChildFrame::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control)
 {

-#if WXDEBUG > 1
-  wxDebugMsg("wxMDIChildFrame::MSWOnCommand %d\n", GetHWND());
-#endif
-  if ((cmd == 0) && GetHWND())
+//  if ((cmd == 0) && GetHWND())
+  if (GetHWND())

   {
     // In case it's e.g. a toolbar.
     wxWindow *win = wxFindWinFromHandle(control);
     if (win)
       return win->MSWCommand(cmd, id);
 
   {
     // In case it's e.g. a toolbar.
     wxWindow *win = wxFindWinFromHandle(control);
     if (win)
       return win->MSWCommand(cmd, id);
 

+    if (wxCurrentPopupMenu)
+    {
+        wxMenu *popupMenu = wxCurrentPopupMenu;
+        wxCurrentPopupMenu = NULL;
+        if (popupMenu->MSWCommand(cmd, id))
+            return TRUE;
+    }
+

     if (GetMenuBar() && GetMenuBar()->FindItemForId(id))
     {
       ProcessCommand(id);
     if (GetMenuBar() && GetMenuBar()->FindItemForId(id))
     {
       ProcessCommand(id);


@@ -946,14 +959,20 @@ long wxMDIChildFrame::MSWDefWindowProc(WXUINT message, WXUINT wParam, WXLPARAM l
 }
 
 bool wxMDIChildFrame::MSWProcessMessage(WXMSG *msg)
 }
 
 bool wxMDIChildFrame::MSWProcessMessage(WXMSG *msg)

+{
+  return FALSE;
+}
+
+bool wxMDIChildFrame::MSWTranslateMessage(WXMSG* msg)

 {
   MSG *pMsg = (MSG *)msg;
 {
   MSG *pMsg = (MSG *)msg;

-  if (m_acceleratorTable && GetHWND())
+  if (m_acceleratorTable.Ok())

   {
     wxFrame *parent = (wxFrame *)GetParent();
     HWND parent_hwnd = (HWND) parent->GetHWND();
   {
     wxFrame *parent = (wxFrame *)GetParent();
     HWND parent_hwnd = (HWND) parent->GetHWND();

-    return (::TranslateAccelerator(parent_hwnd, (HACCEL) m_acceleratorTable, pMsg) != 0);
+    return (::TranslateAccelerator(parent_hwnd, (HACCEL) m_acceleratorTable.GetHACCEL(), pMsg) != 0);

   }
   }

+

   return FALSE;
 }
 
   return FALSE;
 }
 


@@ -961,13 +980,7 @@ long wxMDIChildFrame::MSWOnMDIActivate(long activate, WXHWND WXUNUSED(one), WXHW
 {
   wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
   HMENU parent_menu = (HMENU) parent->GetWinMenu();
 {
   wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
   HMENU parent_menu = (HMENU) parent->GetWinMenu();

-#if WXDEBUG > 1
-  wxDebugMsg("Parent menu is %d\n", parent_menu);
-#endif

   HMENU child_menu = (HMENU) GetWinMenu();
   HMENU child_menu = (HMENU) GetWinMenu();

-#if WXDEBUG > 1
-  wxDebugMsg("Child menu is %d\n", child_menu);
-#endif

 
   if (activate)
   {
 
   if (activate)
   {


@@ -977,10 +990,6 @@ long wxMDIChildFrame::MSWOnMDIActivate(long activate, WXHWND WXUNUSED(one), WXHW
     {
       parent->m_parentFrameActive = FALSE;
       HMENU subMenu = GetSubMenu((HMENU) parent->GetWindowMenu(), 0);
     {
       parent->m_parentFrameActive = FALSE;
       HMENU subMenu = GetSubMenu((HMENU) parent->GetWindowMenu(), 0);

-#if WXDEBUG > 1
-      wxDebugMsg("Window submenu is %d\n", subMenu);
-#endif
-//      HMENU subMenu = 0;

 #ifdef __WIN32__
       ::SendMessage((HWND) parent->GetClientWindow()->GetHWND(), WM_MDISETMENU,
                     (WPARAM)child_menu,
 #ifdef __WIN32__
       ::SendMessage((HWND) parent->GetClientWindow()->GetHWND(), WM_MDISETMENU,
                     (WPARAM)child_menu,


@@ -1010,10 +1019,6 @@ long wxMDIChildFrame::MSWOnMDIActivate(long activate, WXHWND WXUNUSED(one), WXHW
     {
       parent->m_parentFrameActive = TRUE;
       HMENU subMenu = GetSubMenu((HMENU) parent->GetWindowMenu(), 0);
     {
       parent->m_parentFrameActive = TRUE;
       HMENU subMenu = GetSubMenu((HMENU) parent->GetWindowMenu(), 0);

-#if WXDEBUG > 1
-      wxDebugMsg("Window submenu is %d\n", subMenu);
-#endif
-//      HMENU subMenu = 0;

 #ifdef __WIN32__
       ::SendMessage((HWND) parent->GetClientWindow()->GetHWND(), WM_MDISETMENU,
                     (WPARAM)parent_menu,
 #ifdef __WIN32__
       ::SendMessage((HWND) parent->GetClientWindow()->GetHWND(), WM_MDISETMENU,
                     (WPARAM)parent_menu,


@@ -1030,10 +1035,6 @@ long wxMDIChildFrame::MSWOnMDIActivate(long activate, WXHWND WXUNUSED(one), WXHW
   wxActivateEvent event(wxEVT_ACTIVATE, flag, m_windowId);
   event.SetEventObject( this );
   GetEventHandler()->ProcessEvent(event);
   wxActivateEvent event(wxEVT_ACTIVATE, flag, m_windowId);
   event.SetEventObject( this );
   GetEventHandler()->ProcessEvent(event);

-
-#if WXDEBUG > 1
-  wxDebugMsg("Finished (de)activating\n");
-#endif

   return 0;
 }
 
   return 0;
 }
 


@@ -1050,16 +1051,10 @@ void wxMDIChildFrame::MSWDestroyWindow(void)
   // destroyed.
 
   HWND oldHandle = (HWND)GetHWND();
   // destroyed.
 
   HWND oldHandle = (HWND)GetHWND();

-#if WXDEBUG > 1
-  wxDebugMsg("*** About to DestroyWindow MDI child %d\n", oldHandle);
-#endif

 #ifdef __WIN32__
   SendMessage((HWND) parent->GetClientWindow()->GetHWND(), WM_MDIDESTROY, (WPARAM)oldHandle, (LPARAM)0);
 #else
   SendMessage((HWND) parent->GetClientWindow()->GetHWND(), WM_MDIDESTROY, (HWND)oldHandle, 0);
 #ifdef __WIN32__
   SendMessage((HWND) parent->GetClientWindow()->GetHWND(), WM_MDIDESTROY, (WPARAM)oldHandle, (LPARAM)0);
 #else
   SendMessage((HWND) parent->GetClientWindow()->GetHWND(), WM_MDIDESTROY, (HWND)oldHandle, 0);

-#endif
-#if WXDEBUG > 1
-  wxDebugMsg("*** Finished DestroyWindow MDI child %d\n", oldHandle);

 #endif
   invalidHandle = 0;
 
 #endif
   invalidHandle = 0;
 


@@ -1188,7 +1183,7 @@ long wxMDIClientWindow::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPa
 long wxMDIClientWindow::MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {
        if ( MSWGetOldWndProc() != 0)
 long wxMDIClientWindow::MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {
        if ( MSWGetOldWndProc() != 0)

-               return ::CallWindowProc(CASTWNDPROC (FARPROC) MSWGetOldWndProc(), (HWND) GetHWND(), (UINT) nMsg, (WPARAM) wParam, (LPARAM) lParam);
+               return ::CallWindowProc(CASTWNDPROC MSWGetOldWndProc(), (HWND) GetHWND(), (UINT) nMsg, (WPARAM) wParam, (LPARAM) lParam);

        else
                return ::DefWindowProc((HWND) m_hWnd, (UINT) nMsg, (WPARAM) wParam, (LPARAM) lParam);
 }
        else
                return ::DefWindowProc((HWND) m_hWnd, (UINT) nMsg, (WPARAM) wParam, (LPARAM) lParam);
 }