wxUpdateUIEvent derives from wxCommandEvent now

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

diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp
index 0e90215e9d21b5edb5cdfc8023fcbe1630ba09ce..fdb27c0822bcc8fb45fbe7b45dcad3754945a983 100644 (file)
--- a/src/msw/mdi.cpp
+++ b/src/msw/mdi.cpp
@@ -41,6 +41,7 @@
 #include <string.h>
 
 extern wxList wxModelessWindows;
 #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


@@ -82,7 +83,6 @@ wxMDIParentFrame::wxMDIParentFrame(void)
     m_currentChild = NULL;
     m_windowMenu = 0;
     m_parentFrameActive = TRUE;
     m_currentChild = NULL;
     m_windowMenu = 0;
     m_parentFrameActive = TRUE;

-       m_frameToolBar = NULL ;

 }
 
 bool wxMDIParentFrame::Create(wxWindow *parent,
 }
 
 bool wxMDIParentFrame::Create(wxWindow *parent,


@@ -95,7 +95,6 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
 {
   m_defaultIcon = (WXHICON) (wxSTD_MDIPARENTFRAME_ICON ? wxSTD_MDIPARENTFRAME_ICON : wxDEFAULT_MDIPARENTFRAME_ICON);
 
 {
   m_defaultIcon = (WXHICON) (wxSTD_MDIPARENTFRAME_ICON ? wxSTD_MDIPARENTFRAME_ICON : wxDEFAULT_MDIPARENTFRAME_ICON);
 

-  m_frameToolBar = NULL ;

   m_clientWindow = NULL;
   m_currentChild = NULL;
   m_windowMenu = 0;
   m_clientWindow = NULL;
   m_currentChild = NULL;
   m_windowMenu = 0;


@@ -176,14 +175,7 @@ void wxMDIParentFrame::GetClientSize(int *x, int *y) const
 
   int cwidth = rect.right;
   int cheight = rect.bottom;
 
   int cwidth = rect.right;
   int cheight = rect.bottom;

-/*
-  if (m_frameToolBar)
-  {
-    int tw, th;
-    m_frameToolBar->GetSize(&tw, &th);
-    cheight -= th;
-  }
-*/
+

   if ( GetStatusBar() )
   {
        int sw, sh;
   if ( GetStatusBar() )
   {
        int sw, sh;


@@ -191,6 +183,10 @@ void wxMDIParentFrame::GetClientSize(int *x, int *y) const
        cheight -= sh;
   }
 
        cheight -= sh;
   }
 

+  wxPoint pt(GetClientAreaOrigin());
+  cheight -= pt.y;
+  cwidth -= pt.x;
+

   *x = cwidth;
   *y = cheight;
 }
   *x = cwidth;
   *y = cheight;
 }


@@ -278,23 +274,18 @@ void wxMDIParentFrame::OnSize(wxSizeEvent& event)
     int y = 0;
     int width, height;
     GetClientSize(&width, &height);
     int y = 0;
     int width, height;
     GetClientSize(&width, &height);

-    if ( GetToolBar() )
-    {
-        int wt, ht;
-        GetToolBar()->GetSize(&wt, &ht);
-        height -= ht;
-        y += ht;
-        GetToolBar()->SetSize(0, 0, width, ht);
-    }

 
     if ( GetClientWindow() )
         GetClientWindow()->SetSize(x, y, width, height);
 
 
     if ( GetClientWindow() )
         GetClientWindow()->SetSize(x, y, width, height);
 

+/* Already done in MSWOnSize

   // forward WM_SIZE to status bar control
 #if USE_NATIVE_STATUSBAR
   if (m_frameStatusBar && m_frameStatusBar->IsKindOf(CLASSINFO(wxStatusBar95)))
     ((wxStatusBar95 *)m_frameStatusBar)->OnSize(event);
 #endif
   // forward WM_SIZE to status bar control
 #if USE_NATIVE_STATUSBAR
   if (m_frameStatusBar && m_frameStatusBar->IsKindOf(CLASSINFO(wxStatusBar95)))
     ((wxStatusBar95 *)m_frameStatusBar)->OnSize(event);
 #endif

+*/
+

 }
 
 void wxMDIParentFrame::OnActivate(wxActivateEvent& event)
 }
 
 void wxMDIParentFrame::OnActivate(wxActivateEvent& event)


@@ -463,6 +454,7 @@ void wxMDIParentFrame::MSWOnSize(int x, int y, WXUINT id)
 #endif
 
        PositionStatusBar();
 #endif
 
        PositionStatusBar();

+    PositionToolBar();

 
     wxSizeEvent event(wxSize(x, y), m_windowId);
     event.SetEventObject( this );
 
     wxSizeEvent event(wxSize(x, y), m_windowId);
     event.SetEventObject( this );


@@ -488,13 +480,21 @@ 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:


@@ -608,8 +608,18 @@ bool wxMDIParentFrame::MSWProcessMessage(WXMSG* msg)
   if ((m_currentChild != (wxWindow *)NULL) && (m_currentChild->GetHWND() != (WXHWND) NULL) && m_currentChild->MSWProcessMessage(msg))
      return TRUE;
        
   if ((m_currentChild != (wxWindow *)NULL) && (m_currentChild->GetHWND() != (WXHWND) NULL) && m_currentChild->MSWProcessMessage(msg))
      return TRUE;
        

-  if (m_acceleratorTable != (WXHANDLE) NULL &&
-          ::TranslateAccelerator((HWND) GetHWND(), (HANDLE) m_acceleratorTable, pMsg))
+  return FALSE;
+}
+
+bool wxMDIParentFrame::MSWTranslateMessage(WXMSG* msg)
+{
+  MSG *pMsg = (MSG *)msg;
+
+  if ((m_currentChild != (wxWindow *)NULL) && (m_currentChild->GetHWND() != (WXHWND) NULL) && m_currentChild->MSWTranslateMessage(msg))
+     return TRUE;
+       
+  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)


@@ -621,6 +631,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;


@@ -818,7 +829,7 @@ void wxMDIChildFrame::SetMenuBar(wxMenuBar *menu_bar)
    wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
 
    parent->m_parentFrameActive = FALSE;
    wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
 
    parent->m_parentFrameActive = FALSE;

-   HMENU subMenu = GetSubMenu((HWND) parent->GetWindowMenu(), 0);
+   HMENU subMenu = GetSubMenu((HMENU) parent->GetWindowMenu(), 0);

 
    // Try to insert Window menu in front of Help, otherwise append it.
    int N = GetMenuItemCount(menu);
 
    // Try to insert Window menu in front of Help, otherwise append it.
    int N = GetMenuItemCount(menu);


@@ -916,6 +927,7 @@ void wxMDIChildFrame::MSWOnSize(int x, int y, WXUINT id)
 #endif
 
     PositionStatusBar();
 #endif
 
     PositionStatusBar();

+    PositionToolBar();

 
     wxWindow::MSWOnSize(x, y, id);
   }
 
     wxWindow::MSWOnSize(x, y, id);
   }


@@ -926,13 +938,22 @@ bool wxMDIChildFrame::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control)
 #if WXDEBUG > 1
   wxDebugMsg("wxMDIChildFrame::MSWOnCommand %d\n", GetHWND());
 #endif
 #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);


@@ -954,14 +975,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, (HANDLE) m_acceleratorTable, pMsg) != 0);
+    return (::TranslateAccelerator(parent_hwnd, (HACCEL) m_acceleratorTable.GetHACCEL(), pMsg) != 0);

   }
   }

+

   return FALSE;
 }
 
   return FALSE;
 }
 


@@ -1196,7 +1223,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);
 }