X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c089c47f344926e2f95a8aa342992ed844fe609..90e586840b79c936751bf8305ea4f51c6c283791:/src/msw/mdi.cpp diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp index 7f7c044db0..b076f851be 100644 --- a/src/msw/mdi.cpp +++ b/src/msw/mdi.cpp @@ -6,7 +6,7 @@ // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -34,13 +34,14 @@ #include "wx/mdi.h" #include "wx/msw/private.h" -#if USE_NATIVE_STATUSBAR +#if wxUSE_NATIVE_STATUSBAR #include #endif #include extern wxList wxModelessWindows; +extern wxMenu *wxCurrentPopupMenu; #define IDM_WINDOWTILE 4001 #define IDM_WINDOWCASCADE 4002 @@ -76,26 +77,24 @@ END_EVENT_TABLE() #endif -wxMDIParentFrame::wxMDIParentFrame(void) +wxMDIParentFrame::wxMDIParentFrame() { m_clientWindow = NULL; m_currentChild = NULL; m_windowMenu = 0; m_parentFrameActive = TRUE; - m_frameToolBar = NULL ; } bool wxMDIParentFrame::Create(wxWindow *parent, - const wxWindowID id, + wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, - const long style, + long style, const wxString& name) { m_defaultIcon = (WXHICON) (wxSTD_MDIPARENTFRAME_ICON ? wxSTD_MDIPARENTFRAME_ICON : wxDEFAULT_MDIPARENTFRAME_ICON); - m_frameToolBar = NULL ; m_clientWindow = NULL; m_currentChild = NULL; m_windowMenu = 0; @@ -121,13 +120,7 @@ bool wxMDIParentFrame::Create(wxWindow *parent, m_windowMenu = (WXHMENU) ::LoadMenu(wxGetInstance(), "wxWindowMenu"); -#if DEBUG > 1 - wxDebugMsg("Loaded m_windowMenu %d\n", m_windowMenu); -#endif - - // Adding WS_CLIPCHILDREN causes children not to be properly - // drawn when first displaying them. - DWORD msflags = WS_OVERLAPPED ; // | WS_CLIPCHILDREN ; + DWORD msflags = WS_OVERLAPPED ; if (style & wxMINIMIZE_BOX) msflags |= WS_MINIMIZEBOX; if (style & wxMAXIMIZE_BOX) @@ -142,8 +135,11 @@ bool wxMDIParentFrame::Create(wxWindow *parent, msflags |= WS_MAXIMIZE; if (style & wxCAPTION) msflags |= WS_CAPTION; - if (style & wxCLIP_CHILDREN) - msflags |= WS_CLIPCHILDREN; + + // Adding WS_CLIPCHILDREN causes children not to be properly + // drawn when first displaying them. +// if (style & wxCLIP_CHILDREN) +// msflags |= WS_CLIPCHILDREN; wxWindow::MSWCreate(m_windowId, parent, wxMDIFrameClassName, this, title, x, y, width, height, msflags); @@ -153,7 +149,7 @@ bool wxMDIParentFrame::Create(wxWindow *parent, return TRUE; } -wxMDIParentFrame::~wxMDIParentFrame(void) +wxMDIParentFrame::~wxMDIParentFrame() { DestroyChildren(); @@ -161,7 +157,7 @@ wxMDIParentFrame::~wxMDIParentFrame(void) m_windowMenu = 0; if (m_clientWindow->MSWGetOldWndProc()) - m_clientWindow->UnsubclassWin(); + m_clientWindow->UnsubclassWin(); m_clientWindow->m_hWnd = 0; delete m_clientWindow; @@ -171,25 +167,22 @@ wxMDIParentFrame::~wxMDIParentFrame(void) void wxMDIParentFrame::GetClientSize(int *x, int *y) const { RECT rect; - GetClientRect((HWND) GetHWND(), &rect); + ::GetClientRect((HWND) GetHWND(), &rect); 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; - GetStatusBar()->GetSize(&sw, &sh); - cheight -= sh; + int sw, sh; + GetStatusBar()->GetSize(&sw, &sh); + cheight -= sh; } + wxPoint pt(GetClientAreaOrigin()); + cheight -= pt.y; + cwidth -= pt.x; + *x = cwidth; *y = cheight; } @@ -201,41 +194,24 @@ void wxMDIParentFrame::SetMenuBar(wxMenuBar *menu_bar) m_frameMenuBar = NULL; return; } - - if (menu_bar->m_menuBarFrame) - return; - int i; - HMENU menu = CreateMenu(); + if ( menu_bar->IsAttached() ) + return; - for (i = 0; i < menu_bar->m_menuCount; i ++) - { - HMENU popup = (HMENU)menu_bar->m_menus[i]->m_hMenu; - // - // After looking Bounds Checker result, it seems that all - // menus must be individually destroyed. So, don't reset m_hMenu, - // to allow ~wxMenu to do the job. - // - menu_bar->m_menus[i]->m_savehMenu = (WXHMENU) popup; - // Uncommenting for the moment... JACS - menu_bar->m_menus[i]->m_hMenu = (WXHMENU) NULL; - AppendMenu(menu, MF_POPUP | MF_STRING, (UINT)popup, menu_bar->m_titles[i]); - } + m_hMenu = menu_bar->Create(); - menu_bar->m_hMenu = (WXHMENU)menu; if (m_frameMenuBar) delete m_frameMenuBar; - this->m_hMenu = (WXHMENU) menu; - // MDI parent-specific code follows HMENU subMenu = GetSubMenu((HMENU) m_windowMenu, 0); // Try to insert Window menu in front of Help, otherwise append it. + HMENU menu = (HMENU)m_hMenu; int N = GetMenuItemCount(menu); bool success = FALSE; - for (i = 0; i < N; i++) + for (int i = 0; i < N; i++) { char buf[100]; int chars = GetMenuString(menu, i, buf, 100, MF_BYPOSITION); @@ -264,12 +240,12 @@ void wxMDIParentFrame::SetMenuBar(wxMenuBar *menu_bar) DrawMenuBar((HWND) GetHWND()); m_frameMenuBar = menu_bar; - menu_bar->m_menuBarFrame = this; + menu_bar->Attach(this); } void wxMDIParentFrame::OnSize(wxSizeEvent& event) { -#if USE_CONSTRAINTS +#if wxUSE_CONSTRAINTS if (GetAutoLayout()) Layout(); #endif @@ -277,77 +253,27 @@ void wxMDIParentFrame::OnSize(wxSizeEvent& event) 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); +/* 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 -} - -void wxMDIParentFrame::OnActivate(wxActivateEvent& event) -{ - // Do nothing -} - -#if WXWIN_COMPATIBILITY -void wxMDIParentFrame::OldOnSize(int x, int y) -{ -#if WXWIN_COMPATIBILITY == 1 - wxSizeEvent event(wxSize(x, y), m_windowId); - event.SetEventObject( this ); - GetEventHandler()->ProcessEvent(event); -#else - -#if USE_CONSTRAINTS - if (GetAutoLayout()) - Layout(); -#endif - int x = 0; - int y = 0; - int width, height; - GetClientSize(&width, &height); - if ( GetToolBar() ) - { - int wt, ht; - GetToolBar()->GetSize(&wt, &ht); - height -= ht; - y += ht; - } - - if ( GetClientWindow() ) - GetClientWindow()->SetSize(x, y, width, height); +*/ -#endif } -// Default activation behaviour - nothing. -// Default activation behaviour - override dedault wxFrame behaviour -void wxMDIParentFrame::OldOnActivate(bool flag) +void wxMDIParentFrame::OnActivate(wxActivateEvent& event) { -#if WXWIN_COMPATIBILITY == 1 - wxActivateEvent event(wxEVT_ACTIVATE, flag, m_windowId); - event.SetEventObject( this ); - GetEventHandler()->ProcessEvent(event); -#else -#endif + // Do nothing } -#endif - // Returns the active MDI child window -wxMDIChildFrame *wxMDIParentFrame::GetActiveChild(void) const +wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const { // HWND hWnd = (HWND)LOWORD(SendMessage((HWND) GetClientWindow()->GetHWND(), WM_MDIGETACTIVE, 0, 0L)); HWND hWnd = (HWND)SendMessage((HWND) GetClientWindow()->GetHWND(), WM_MDIGETACTIVE, 0, 0L); @@ -359,9 +285,9 @@ wxMDIChildFrame *wxMDIParentFrame::GetActiveChild(void) const // Create the client window class (don't Create the window, // just return a new class) -wxMDIClientWindow *wxMDIParentFrame::OnCreateClient(void) +wxMDIClientWindow *wxMDIParentFrame::OnCreateClient() { - return new wxMDIClientWindow ; + return new wxMDIClientWindow ; } // Responds to colour changes, and passes event on to children. @@ -386,27 +312,27 @@ void wxMDIParentFrame::OnSysColourChanged(wxSysColourChangedEvent& event) } // MDI operations -void wxMDIParentFrame::Cascade(void) +void wxMDIParentFrame::Cascade() { ::SendMessage( (HWND) GetClientWindow()->GetHWND(), WM_MDICASCADE, 0, 0); } -void wxMDIParentFrame::Tile(void) +void wxMDIParentFrame::Tile() { ::SendMessage( (HWND) GetClientWindow()->GetHWND(), WM_MDITILE, MDITILE_HORIZONTAL, 0); } -void wxMDIParentFrame::ArrangeIcons(void) +void wxMDIParentFrame::ArrangeIcons() { ::SendMessage( (HWND) GetClientWindow()->GetHWND(), WM_MDIICONARRANGE, 0, 0); } -void wxMDIParentFrame::ActivateNext(void) +void wxMDIParentFrame::ActivateNext() { ::SendMessage( (HWND) GetClientWindow()->GetHWND(), WM_MDINEXT, 0, 0); } -void wxMDIParentFrame::ActivatePrevious(void) +void wxMDIParentFrame::ActivatePrevious() { ::SendMessage( (HWND) GetClientWindow()->GetHWND(), WM_MDINEXT, 0, 1); } @@ -415,25 +341,25 @@ void wxMDIParentFrame::ActivatePrevious(void) /* // Returns a style for the client window - usually 0 // or, for example, wxHSCROLL | wxVSCROLL -long wxMDIParentFrame::GetClientStyle(void) const +long wxMDIParentFrame::GetClientStyle() const { - return wxHSCROLL | wxVSCROLL ; + return wxHSCROLL | wxVSCROLL ; } */ -bool wxMDIParentFrame::MSWOnDestroy(void) +bool wxMDIParentFrame::MSWOnDestroy() { return FALSE; } void wxMDIParentFrame::MSWOnCreate(WXLPCREATESTRUCT WXUNUSED(cs)) { - m_clientWindow = new wxMDIClientWindow; - // Uses own style for client style - m_clientWindow->CreateClient(this, GetWindowStyleFlag()); + m_clientWindow = OnCreateClient(); + // Uses own style for client style + m_clientWindow->CreateClient(this, GetWindowStyleFlag()); } -void wxMDIParentFrame::MSWOnSize(const int x, const int y, const WXUINT id) +void wxMDIParentFrame::MSWOnSize(int x, int y, WXUINT id) { switch (id) { @@ -449,7 +375,7 @@ void wxMDIParentFrame::MSWOnSize(const int x, const int y, const WXUINT id) 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()); @@ -459,41 +385,50 @@ void wxMDIParentFrame::MSWOnSize(const int x, const int y, const WXUINT id) } #endif - PositionStatusBar(); + PositionStatusBar(); + PositionToolBar(); - GetEventHandler()->OldOnSize(x, y); + wxSizeEvent event(wxSize(x, y), m_windowId); + event.SetEventObject( this ); + if (!GetEventHandler()->ProcessEvent(event)) + Default(); } } -bool wxMDIParentFrame::MSWOnActivate(const int state, const bool minimized, const WXHWND activate) +bool wxMDIParentFrame::MSWOnActivate(int state, bool minimized, WXHWND activate) { - wxWindow::MSWOnActivate(state, minimized, activate); + wxWindow::MSWOnActivate(state, minimized, activate); // If this window is an MDI parent, we must also send an OnActivate message // to the current child. if ((m_currentChild != NULL) && ((state == WA_ACTIVE) || (state == WA_CLICKACTIVE))) - { -#if WXWIN_COMPATIBILITY - m_currentChild->GetEventHandler()->OldOnActivate(TRUE); -#else - wxActivateEvent event(wxEVT_ACTIVATE, TRUE, - m_currentChild.m_windowId); - event.eventObject = m_currentChild; - m_currentChild->GetEventHandler()->ProcessEvent(event); -#endif + { + wxActivateEvent event(wxEVT_ACTIVATE, TRUE, m_currentChild->GetId()); + event.SetEventObject( m_currentChild ); + m_currentChild->GetEventHandler()->ProcessEvent(event); } return 0; } -bool wxMDIParentFrame::MSWOnCommand(const WXWORD id, const WXWORD cmd, const 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); +/* + if (wxCurrentPopupMenu) + { + wxMenu *popupMenu = wxCurrentPopupMenu; + wxCurrentPopupMenu = NULL; + if (!popupMenu->MSWCommand(cmd, id)) + return TRUE; + } +*/ + switch (id) { case IDM_WINDOWCASCADE: @@ -513,12 +448,9 @@ bool wxMDIParentFrame::MSWOnCommand(const WXWORD id, const WXWORD cmd, const WXH } if (id >= 0xF000) { -#if DEBUG > 1 - wxDebugMsg("wxMDIFrame::OnCommand %d: system command: calling default window proc\n", GetHWND()); -#endif return FALSE; // Get WndProc to call default proc } - + if (m_parentFrameActive && (id < wxFIRST_MDI_CHILD || id > wxLAST_MDI_CHILD)) { ProcessCommand(id); @@ -526,15 +458,12 @@ bool wxMDIParentFrame::MSWOnCommand(const WXWORD id, const WXWORD cmd, const WXH } else if (m_currentChild && (id < wxFIRST_MDI_CHILD || id > wxLAST_MDI_CHILD)) { -#if DEBUG > 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) { - wxNode* node = GetChildren()->First(); + wxNode* node = GetChildren().First(); while (node) { wxWindow* child = (wxWindow*) node->Data(); @@ -563,18 +492,25 @@ bool wxMDIParentFrame::MSWOnCommand(const WXWORD id, const WXWORD cmd, const WXH */ } - return FALSE; + return wxWindow::MSWOnCommand(id, cmd, control); } -void wxMDIParentFrame::MSWOnMenuHighlight(const WXWORD nItem, const WXWORD nFlags, const WXHMENU hSysMenu) +void wxMDIParentFrame::MSWOnMenuHighlight(WXWORD nItem, WXWORD nFlags, WXHMENU hSysMenu) { if (m_parentFrameActive) { - // TODO if (nFlags == 0xFFFF && hSysMenu == (WXHMENU) NULL) - GetEventHandler()->OldOnMenuSelect(-1); + { + wxMenuEvent event(wxEVT_MENU_HIGHLIGHT, -1); + event.SetEventObject( this ); + GetEventHandler()->ProcessEvent(event); + } else if (nFlags != MF_SEPARATOR) - GetEventHandler()->OldOnMenuSelect(nItem); + { + wxMenuEvent event(wxEVT_MENU_HIGHLIGHT, nItem); + event.SetEventObject( this ); + GetEventHandler()->ProcessEvent(event); + } } else if (m_currentChild) { @@ -584,24 +520,32 @@ void wxMDIParentFrame::MSWOnMenuHighlight(const WXWORD nItem, const WXWORD nFlag long wxMDIParentFrame::MSWDefWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) { - WXHWND clientWnd; - if ( GetClientWindow() ) - clientWnd = GetClientWindow()->GetHWND(); - else - clientWnd = 0; + WXHWND clientWnd; + if ( GetClientWindow() ) + clientWnd = GetClientWindow()->GetHWND(); + else + clientWnd = 0; return DefFrameProc((HWND) GetHWND(), (HWND) clientWnd, message, wParam, lParam); } 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; - 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; - - if (m_acceleratorTable != (WXHANDLE) NULL && - ::TranslateAccelerator((HWND) GetHWND(), (HANDLE) 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) @@ -613,7 +557,8 @@ bool wxMDIParentFrame::MSWProcessMessage(WXMSG* msg) return FALSE; } -bool wxMDIParentFrame::MSWOnEraseBkgnd(const WXHDC WXUNUSED(pDC)) + +bool wxMDIParentFrame::MSWOnEraseBkgnd(WXHDC WXUNUSED(pDC)) { return TRUE; } @@ -621,17 +566,17 @@ bool wxMDIParentFrame::MSWOnEraseBkgnd(const WXHDC WXUNUSED(pDC)) extern wxWindow *wxWndHook; extern wxList *wxWinHandleList; -wxMDIChildFrame::wxMDIChildFrame(void) +wxMDIChildFrame::wxMDIChildFrame() { -// m_active = FALSE; +// m_active = FALSE; } bool wxMDIChildFrame::Create(wxMDIParentFrame *parent, - const wxWindowID id, + wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, - const long style, + long style, const wxString& name) { m_defaultIcon = (WXHICON) (wxSTD_MDICHILDFRAME_ICON ? wxSTD_MDICHILDFRAME_ICON : wxDEFAULT_MDICHILDFRAME_ICON); @@ -653,7 +598,7 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent, int height = size.y; MDICREATESTRUCT mcs; - + mcs.szClass = wxMDIChildFrameClassName; mcs.szTitle = title; mcs.hOwner = wxGetInstance(); @@ -690,7 +635,7 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent, mcs.lParam = 0; DWORD Return = SendMessage((HWND) parent->GetClientWindow()->GetHWND(), - WM_MDICREATE, 0, (LONG)(LPSTR)&mcs); + WM_MDICREATE, 0, (LONG)(LPSTR)&mcs); //handle = (HWND)LOWORD(Return); // Must be the DWORRD for WIN32. And in 16 bits, HIWORD=0 (says Microsoft) @@ -708,21 +653,21 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent, return TRUE; } -wxMDIChildFrame::~wxMDIChildFrame(void) +wxMDIChildFrame::~wxMDIChildFrame() { - MSWDestroyWindow(); + MSWDestroyWindow(); ResetWindowStyle(NULL); } // Set the client size (i.e. leave the calculation of borders etc. // to wxWindows) -void wxMDIChildFrame::SetClientSize(const int width, const int height) +void wxMDIChildFrame::SetClientSize(int width, int height) { HWND hWnd = (HWND) GetHWND(); RECT rect; - GetClientRect(hWnd, &rect); + ::GetClientRect(hWnd, &rect); RECT rect2; GetWindowRect(hWnd, &rect2); @@ -735,8 +680,8 @@ void wxMDIChildFrame::SetClientSize(const int width, const int height) if (GetStatusBar()) { - int sx, sy; - GetStatusBar()->GetSize(&sx, &sy); + int sx, sy; + GetStatusBar()->GetSize(&sx, &sy); actual_height += sy; } @@ -750,13 +695,10 @@ void wxMDIChildFrame::SetClientSize(const int width, const int height) ::ScreenToClient((HWND) mdiParent->GetClientWindow()->GetHWND(), &point); MoveWindow(hWnd, point.x, point.y, actual_width, actual_height, (BOOL)TRUE); -#if WXWIN_COMPATIBILITY - GetEventHandler()->OldOnSize(width, height); -#else + wxSizeEvent event(wxSize(width, height), m_windowId); - event.eventObject = this; + event.SetEventObject( this ); GetEventHandler()->ProcessEvent(event); -#endif } void wxMDIChildFrame::GetPosition(int *x, int *y) const @@ -783,42 +725,25 @@ void wxMDIChildFrame::SetMenuBar(wxMenuBar *menu_bar) m_frameMenuBar = NULL; return; } - - if (menu_bar->m_menuBarFrame) - return; - int i; - HMENU menu = CreateMenu(); + if ( menu_bar->IsAttached() ) + return; - for (i = 0; i < menu_bar->m_menuCount; i ++) - { - HMENU popup = (HMENU)menu_bar->m_menus[i]->m_hMenu; - // - // After looking Bounds Checker result, it seems that all - // menus must be individually destroyed. So, don't reset m_hMenu, - // to allow ~wxMenu to do the job. - // - menu_bar->m_menus[i]->m_savehMenu = (WXHMENU) popup; - // Uncommenting for the moment... JACS - menu_bar->m_menus[i]->m_hMenu = 0; - ::AppendMenu((HMENU) menu, MF_POPUP | MF_STRING, (UINT)popup, menu_bar->m_titles[i]); - } + m_hMenu = menu_bar->Create(); - menu_bar->m_hMenu = (WXHMENU)menu; if (m_frameMenuBar) delete m_frameMenuBar; - this->m_hMenu = (WXHMENU) menu; - 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. + HMENU menu = (HMENU)m_hMenu; int N = GetMenuItemCount(menu); bool success = FALSE; - for (i = 0; i < N; i++) + for (int i = 0; i < N; i++) { char buf[100]; int chars = GetMenuString(menu, i, buf, 100, MF_BYPOSITION); @@ -846,25 +771,25 @@ void wxMDIChildFrame::SetMenuBar(wxMenuBar *menu_bar) DrawMenuBar((HWND) parent->GetHWND()); m_frameMenuBar = menu_bar; - menu_bar->m_menuBarFrame = this; + menu_bar->Attach(this); } // MDI operations -void wxMDIChildFrame::Maximize(void) +void wxMDIChildFrame::Maximize() { wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent(); if ( parent && parent->GetClientWindow() ) ::SendMessage( (HWND) parent->GetClientWindow()->GetHWND(), WM_MDIMAXIMIZE, (WPARAM) (HWND) GetHWND(), 0); } -void wxMDIChildFrame::Restore(void) +void wxMDIChildFrame::Restore() { wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent(); if ( parent && parent->GetClientWindow() ) ::SendMessage( (HWND) parent->GetClientWindow()->GetHWND(), WM_MDIRESTORE, (WPARAM) (HWND) GetHWND(), 0); } -void wxMDIChildFrame::Activate(void) +void wxMDIChildFrame::Activate() { wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent(); if ( parent && parent->GetClientWindow() ) @@ -872,18 +797,15 @@ void wxMDIChildFrame::Activate(void) } static HWND invalidHandle = 0; -void wxMDIChildFrame::MSWOnSize(const int x, const int y, const WXUINT id) +void wxMDIChildFrame::MSWOnSize(int x, int y, WXUINT id) { if (!GetHWND()) return; if (invalidHandle == (HWND) GetHWND()) { -#if DEBUG > 1 - wxDebugMsg("wxMDIChildFrame::OnSize %d: invalid, so returning.\n", GetHWND()); -#endif return; } - + (void)MSWDefWindowProc(m_lastMsg, m_lastWParam, m_lastLParam); switch (id) @@ -900,7 +822,7 @@ void wxMDIChildFrame::MSWOnSize(const int x, const int y, const WXUINT id) 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()); @@ -911,23 +833,30 @@ void wxMDIChildFrame::MSWOnSize(const int x, const int y, const WXUINT id) #endif PositionStatusBar(); + PositionToolBar(); wxWindow::MSWOnSize(x, y, id); } } -bool wxMDIChildFrame::MSWOnCommand(const WXWORD id, const WXWORD cmd, const WXHWND control) +bool wxMDIChildFrame::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control) { -#if DEBUG > 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); + if (wxCurrentPopupMenu) + { + wxMenu *popupMenu = wxCurrentPopupMenu; + wxCurrentPopupMenu = NULL; + if (popupMenu->MSWCommand(cmd, id)) + return TRUE; + } + if (GetMenuBar() && GetMenuBar()->FindItemForId(id)) { ProcessCommand(id); @@ -938,7 +867,7 @@ bool wxMDIChildFrame::MSWOnCommand(const WXWORD id, const WXWORD cmd, const WXHW return TRUE; } else - return FALSE; + return wxWindow::MSWOnCommand(id, cmd, control); } long wxMDIChildFrame::MSWDefWindowProc(WXUINT message, WXUINT wParam, WXLPARAM lParam) @@ -949,28 +878,28 @@ long wxMDIChildFrame::MSWDefWindowProc(WXUINT message, WXUINT wParam, WXLPARAM l } bool wxMDIChildFrame::MSWProcessMessage(WXMSG *msg) +{ + return FALSE; +} + +bool wxMDIChildFrame::MSWTranslateMessage(WXMSG* msg) { MSG *pMsg = (MSG *)msg; - if (m_acceleratorTable && GetHWND()) + if (m_acceleratorTable.Ok()) { 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; } -long wxMDIChildFrame::MSWOnMDIActivate(const long activate, const WXHWND WXUNUSED(one), const WXHWND WXUNUSED(two)) +long wxMDIChildFrame::MSWOnMDIActivate(long activate, WXHWND WXUNUSED(one), WXHWND WXUNUSED(two)) { wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent(); HMENU parent_menu = (HMENU) parent->GetWinMenu(); -#if DEBUG > 1 - wxDebugMsg("Parent menu is %d\n", parent_menu); -#endif HMENU child_menu = (HMENU) GetWinMenu(); -#if DEBUG > 1 - wxDebugMsg("Child menu is %d\n", child_menu); -#endif if (activate) { @@ -980,10 +909,6 @@ long wxMDIChildFrame::MSWOnMDIActivate(const long activate, const WXHWND WXUNUSE { parent->m_parentFrameActive = FALSE; HMENU subMenu = GetSubMenu((HMENU) parent->GetWindowMenu(), 0); -#if DEBUG > 1 - wxDebugMsg("Window submenu is %d\n", subMenu); -#endif -// HMENU subMenu = 0; #ifdef __WIN32__ ::SendMessage((HWND) parent->GetClientWindow()->GetHWND(), WM_MDISETMENU, (WPARAM)child_menu, @@ -995,23 +920,24 @@ long wxMDIChildFrame::MSWOnMDIActivate(const long activate, const WXHWND WXUNUSE ::DrawMenuBar((HWND) parent->GetHWND()); } - GetEventHandler()->OldOnActivate(TRUE); + wxActivateEvent event(wxEVT_ACTIVATE, TRUE, m_windowId); + event.SetEventObject( this ); + GetEventHandler()->ProcessEvent(event); } else { if (parent->m_currentChild == this) parent->m_currentChild = NULL; - GetEventHandler()->OldOnActivate(FALSE); + + wxActivateEvent event(wxEVT_ACTIVATE, FALSE, m_windowId); + event.SetEventObject( this ); + GetEventHandler()->ProcessEvent(event); // m_active = FALSE; if (parent_menu) { parent->m_parentFrameActive = TRUE; HMENU subMenu = GetSubMenu((HMENU) parent->GetWindowMenu(), 0); -#if DEBUG > 1 - wxDebugMsg("Window submenu is %d\n", subMenu); -#endif -// HMENU subMenu = 0; #ifdef __WIN32__ ::SendMessage((HWND) parent->GetClientWindow()->GetHWND(), WM_MDISETMENU, (WPARAM)parent_menu, @@ -1024,16 +950,14 @@ long wxMDIChildFrame::MSWOnMDIActivate(const long activate, const WXHWND WXUNUSE ::DrawMenuBar((HWND) parent->GetHWND()); } } - // TODO bool flag = (activate != 0); - GetEventHandler()->OldOnActivate(flag); -#if DEBUG > 1 - wxDebugMsg("Finished (de)activating\n"); -#endif + wxActivateEvent event(wxEVT_ACTIVATE, flag, m_windowId); + event.SetEventObject( this ); + GetEventHandler()->ProcessEvent(event); return 0; } -void wxMDIChildFrame::MSWDestroyWindow(void) +void wxMDIChildFrame::MSWDestroyWindow() { MSWDetachWindowMenu(); invalidHandle = (HWND) GetHWND(); @@ -1046,16 +970,10 @@ void wxMDIChildFrame::MSWDestroyWindow(void) // destroyed. HWND oldHandle = (HWND)GetHWND(); -#if DEBUG > 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); -#endif -#if DEBUG > 1 - wxDebugMsg("*** Finished DestroyWindow MDI child %d\n", oldHandle); #endif invalidHandle = 0; @@ -1074,30 +992,30 @@ bool wxMDIChildFrame::ResetWindowStyle(void *vrect) { #if defined(__WIN95__) RECT *rect = (RECT *)vrect; - wxMDIParentFrame* pFrameWnd = (wxMDIParentFrame *)GetParent(); - wxMDIChildFrame* pChild = pFrameWnd->GetActiveChild(); - if (!pChild || (pChild == this)) - { - DWORD dwStyle = ::GetWindowLong((HWND) pFrameWnd->GetClientWindow()->GetHWND(), GWL_EXSTYLE); + wxMDIParentFrame* pFrameWnd = (wxMDIParentFrame *)GetParent(); + wxMDIChildFrame* pChild = pFrameWnd->GetActiveChild(); + if (!pChild || (pChild == this)) + { + DWORD dwStyle = ::GetWindowLong((HWND) pFrameWnd->GetClientWindow()->GetHWND(), GWL_EXSTYLE); DWORD dwThisStyle = ::GetWindowLong((HWND) GetHWND(), GWL_STYLE); - DWORD dwNewStyle = dwStyle; - if (pChild != NULL && (dwThisStyle & WS_MAXIMIZE)) - dwNewStyle &= ~(WS_EX_CLIENTEDGE); - else - dwNewStyle |= WS_EX_CLIENTEDGE; - - if (dwStyle != dwNewStyle) - { - ::RedrawWindow((HWND) pFrameWnd->GetClientWindow()->GetHWND(), NULL, NULL, RDW_INVALIDATE | RDW_ALLCHILDREN); - ::SetWindowLong((HWND) pFrameWnd->GetClientWindow()->GetHWND(), GWL_EXSTYLE, dwNewStyle); - ::SetWindowPos((HWND) pFrameWnd->GetClientWindow()->GetHWND(), NULL, 0, 0, 0, 0, - SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOCOPYBITS); - if (rect) - ::GetClientRect((HWND) pFrameWnd->GetClientWindow()->GetHWND(), rect); - return TRUE; - } - } - return FALSE; + DWORD dwNewStyle = dwStyle; + if (pChild != NULL && (dwThisStyle & WS_MAXIMIZE)) + dwNewStyle &= ~(WS_EX_CLIENTEDGE); + else + dwNewStyle |= WS_EX_CLIENTEDGE; + + if (dwStyle != dwNewStyle) + { + ::RedrawWindow((HWND) pFrameWnd->GetClientWindow()->GetHWND(), NULL, NULL, RDW_INVALIDATE | RDW_ALLCHILDREN); + ::SetWindowLong((HWND) pFrameWnd->GetClientWindow()->GetHWND(), GWL_EXSTYLE, dwNewStyle); + ::SetWindowPos((HWND) pFrameWnd->GetClientWindow()->GetHWND(), NULL, 0, 0, 0, 0, + SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOCOPYBITS); + if (rect) + ::GetClientRect((HWND) pFrameWnd->GetClientWindow()->GetHWND(), rect); + return TRUE; + } + } + return FALSE; #else return FALSE; #endif @@ -1108,55 +1026,55 @@ void wxMDIChildFrame::MSWOnWindowPosChanging(void *pos) WINDOWPOS *lpPos = (WINDOWPOS *)pos; #if defined(__WIN95__) if (!(lpPos->flags & SWP_NOSIZE)) - { - RECT rectClient; - DWORD dwExStyle = ::GetWindowLong((HWND) GetHWND(), GWL_EXSTYLE); + { + RECT rectClient; + DWORD dwExStyle = ::GetWindowLong((HWND) GetHWND(), GWL_EXSTYLE); DWORD dwStyle = ::GetWindowLong((HWND) GetHWND(), GWL_STYLE); - if (ResetWindowStyle((void *) & rectClient) && (dwStyle & WS_MAXIMIZE)) - { - ::AdjustWindowRectEx(&rectClient, dwStyle, FALSE, dwExStyle); - lpPos->x = rectClient.left; + if (ResetWindowStyle((void *) & rectClient) && (dwStyle & WS_MAXIMIZE)) + { + ::AdjustWindowRectEx(&rectClient, dwStyle, FALSE, dwExStyle); + lpPos->x = rectClient.left; lpPos->y = rectClient.top; - lpPos->cx = rectClient.right - rectClient.left; + lpPos->cx = rectClient.right - rectClient.left; lpPos->cy = rectClient.bottom - rectClient.top; - } - wxMDIParentFrame* pFrameWnd = (wxMDIParentFrame *)GetParent(); + } + wxMDIParentFrame* pFrameWnd = (wxMDIParentFrame *)GetParent(); if (pFrameWnd && pFrameWnd->GetToolBar()) { pFrameWnd->GetToolBar()->Refresh(); } - } + } #endif Default(); } // Client window -wxMDIClientWindow::wxMDIClientWindow(void) +wxMDIClientWindow::wxMDIClientWindow() { m_scrollX = 0; m_scrollY = 0; } -wxMDIClientWindow::~wxMDIClientWindow(void) +wxMDIClientWindow::~wxMDIClientWindow() { } -bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, const long style) +bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style) { m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE); CLIENTCREATESTRUCT ccs; m_windowStyle = style; m_windowParent = parent; - + ccs.hWindowMenu = (HMENU) parent->GetWindowMenu(); ccs.idFirstChild = wxFIRST_MDI_CHILD; DWORD msStyle = WS_VISIBLE | WS_CHILD | WS_CLIPCHILDREN ; if ( parent->GetWindowStyleFlag() & wxHSCROLL ) - msStyle |= WS_HSCROLL; + msStyle |= WS_HSCROLL; if ( parent->GetWindowStyleFlag() & wxVSCROLL ) - msStyle |= WS_VSCROLL ; + msStyle |= WS_VSCROLL ; #if defined(__WIN95__) DWORD exStyle = WS_EX_CLIENTEDGE; @@ -1183,10 +1101,10 @@ long wxMDIClientWindow::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPa 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); - else - return ::DefWindowProc((HWND) m_hWnd, (UINT) nMsg, (WPARAM) wParam, (LPARAM) lParam); + if ( MSWGetOldWndProc() != 0) + return ::CallWindowProc(CASTWNDPROC MSWGetOldWndProc(), (HWND) GetHWND(), (UINT) nMsg, (WPARAM) wParam, (LPARAM) lParam); + else + return ::DefWindowProc((HWND) m_hWnd, (UINT) nMsg, (WPARAM) wParam, (LPARAM) lParam); } // Explicitly call default scroll behaviour @@ -1203,11 +1121,11 @@ void wxMDIClientWindow::OnScroll(wxScrollEvent& event) else m_scrollY = event.GetPosition(); // Always returns zero! - Default(); + Default(); } // Should hand the message to the default proc -long wxMDIClientWindow::MSWOnMDIActivate(const long bActivate, const WXHWND, const WXHWND) +long wxMDIClientWindow::MSWOnMDIActivate(long bActivate, WXHWND, WXHWND) { return Default(); }