X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ea723360eee14e34f7e0e027e8655be4f87948c5..adb799d6ef8e1ba754ab08b26e64fa40219f95f8:/src/msw/mdi.cpp?ds=sidebyside diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp index 5d1b5fd01d..6f14a8a454 100644 --- a/src/msw/mdi.cpp +++ b/src/msw/mdi.cpp @@ -17,7 +17,7 @@ // headers // --------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "mdi.h" #endif @@ -28,6 +28,8 @@ #pragma hdrstop #endif +#if wxUSE_MDI && !defined(__WXUNIVERSAL__) + #ifndef WX_PRECOMP #include "wx/setup.h" #include "wx/frame.h" @@ -43,8 +45,6 @@ #include "wx/log.h" #endif -#if wxUSE_MDI_ARCHITECTURE && !defined(__WXUNIVERSAL__) - #include "wx/mdi.h" #include "wx/msw/private.h" @@ -62,17 +62,12 @@ // global variables // --------------------------------------------------------------------------- -extern wxWindowList wxModelessWindows; // from dialog.cpp extern wxMenu *wxCurrentPopupMenu; extern const wxChar *wxMDIFrameClassName; // from app.cpp extern const wxChar *wxMDIChildFrameClassName; extern const wxChar *wxMDIChildFrameClassNameNoRedraw; -#ifdef __DIGITALMARS__ -extern "C" void wxAssociateWinWithHandle(HWND hWnd, wxWindow *win); -#else extern void wxAssociateWinWithHandle(HWND hWnd, wxWindow *win); -#endif extern void wxRemoveHandleAssociation(wxWindow *win); static HWND invalidHandle = 0; @@ -227,8 +222,6 @@ bool wxMDIParentFrame::Create(wxWindow *parent, return false; } - wxModelessWindows.Append(this); - // unlike (almost?) all other windows, frames are created hidden m_isShown = false; @@ -237,12 +230,14 @@ bool wxMDIParentFrame::Create(wxWindow *parent, wxMDIParentFrame::~wxMDIParentFrame() { - DestroyChildren(); - - // already delete by DestroyChildren() + // see comment in ~wxMDIChildFrame +#if wxUSE_TOOLBAR m_frameToolBar = NULL; +#endif m_frameStatusBar = NULL; + DestroyChildren(); + if (m_windowMenu) { delete m_windowMenu; @@ -346,8 +341,8 @@ void wxMDIParentFrame::OnSysColourChanged(wxSysColourChangedEvent& event) WXHICON wxMDIParentFrame::GetDefaultIcon() const { - return (WXHICON)(wxSTD_MDIPARENTFRAME_ICON ? wxSTD_MDIPARENTFRAME_ICON - : wxDEFAULT_MDIPARENTFRAME_ICON); + // we don't have any standard icons (any more) + return (WXHICON)0; } // --------------------------------------------------------------------------- @@ -384,11 +379,11 @@ void wxMDIParentFrame::ActivatePrevious() // the MDI parent frame window proc // --------------------------------------------------------------------------- -long wxMDIParentFrame::MSWWindowProc(WXUINT message, +WXLRESULT wxMDIParentFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) { - long rc = 0; + WXLRESULT rc = 0; bool processed = false; switch ( message ) @@ -412,13 +407,13 @@ long wxMDIParentFrame::MSWWindowProc(WXUINT message, (void)HandleCommand(id, cmd, hwnd); // even if the frame didn't process it, there is no need to try it - // once again (i.e. call wxFrame::HandleCommand()) - we just dud it, + // once again (i.e. call wxFrame::HandleCommand()) - we just did it, // so pretend we processed the message anyhow processed = true; } // always pass this message DefFrameProc(), otherwise MDI menu - // commands (and sys commands - more surprizingly!) won't work + // commands (and sys commands - more surprisingly!) won't work MSWDefWindowProc(message, wParam, lParam); break; @@ -562,7 +557,7 @@ bool wxMDIParentFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd) if ( IsMdiCommandId(id) ) { - wxWindowList::Node *node = GetChildren().GetFirst(); + wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); while ( node ) { wxWindow *child = node->GetData(); @@ -598,7 +593,7 @@ bool wxMDIParentFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd) return false; } -long wxMDIParentFrame::MSWDefWindowProc(WXUINT message, +WXLRESULT wxMDIParentFrame::MSWDefWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) { @@ -675,9 +670,9 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent, MDICREATESTRUCT mcs; - mcs.szClass = style & wxNO_FULL_REPAINT_ON_RESIZE - ? wxMDIChildFrameClassNameNoRedraw - : wxMDIChildFrameClassName; + mcs.szClass = style & wxFULL_REPAINT_ON_RESIZE + ? wxMDIChildFrameClassName + : wxMDIChildFrameClassNameNoRedraw; mcs.szTitle = title; mcs.hOwner = wxGetInstance(); if (x > -1) @@ -700,7 +695,7 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent, else mcs.cy = CW_USEDEFAULT; - DWORD msflags = WS_OVERLAPPED | WS_CLIPCHILDREN | WS_THICKFRAME | WS_VISIBLE ; + DWORD msflags = WS_OVERLAPPED | WS_CLIPCHILDREN | WS_VISIBLE ; if (style & wxMINIMIZE_BOX) msflags |= WS_MINIMIZEBOX; if (style & wxMAXIMIZE_BOX) @@ -727,26 +722,27 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent, wxAssociateWinWithHandle((HWND) GetHWND(), this); - wxModelessWindows.Append(this); - return true; } wxMDIChildFrame::~wxMDIChildFrame() { - DestroyChildren(); - - // already deleted by DestroyChildren() + // will be destroyed by DestroyChildren() but reset them before calling it + // to avoid using dangling pointers if a callback comes in the meanwhile +#if wxUSE_TOOLBAR m_frameToolBar = NULL; +#endif m_frameStatusBar = NULL; + DestroyChildren(); + RemoveWindowMenu(NULL, m_hMenu); MSWDestroyWindow(); } // Set the client size (i.e. leave the calculation of borders etc. -// to wxWindows) +// to wxWidgets) void wxMDIChildFrame::DoSetClientSize(int width, int height) { HWND hWnd = GetHwnd(); @@ -815,8 +811,8 @@ void wxMDIChildFrame::InternalSetMenuBar() WXHICON wxMDIChildFrame::GetDefaultIcon() const { - return (WXHICON)(wxSTD_MDICHILDFRAME_ICON ? wxSTD_MDICHILDFRAME_ICON - : wxDEFAULT_MDICHILDFRAME_ICON); + // we don't have any standard icons (any more) + return (WXHICON)0; } // --------------------------------------------------------------------------- @@ -858,11 +854,11 @@ void wxMDIChildFrame::Activate() // MDI window proc and message handlers // --------------------------------------------------------------------------- -long wxMDIChildFrame::MSWWindowProc(WXUINT message, +WXLRESULT wxMDIChildFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) { - long rc = 0; + WXLRESULT rc = 0; bool processed = false; switch ( message ) @@ -1030,11 +1026,13 @@ bool wxMDIChildFrame::HandleWindowPosChanging(void *pos) lpPos->cx = rectClient.right - rectClient.left; lpPos->cy = rectClient.bottom - rectClient.top; } +#if wxUSE_TOOLBAR wxMDIParentFrame* pFrameWnd = (wxMDIParentFrame *)GetParent(); if (pFrameWnd && pFrameWnd->GetToolBar() && pFrameWnd->GetToolBar()->IsShown()) { pFrameWnd->GetToolBar()->Refresh(); } +#endif } #endif // Win95 @@ -1068,14 +1066,14 @@ bool wxMDIChildFrame::HandleGetMinMaxInfo(void *mmInfo) processed = true; } - return true; + return processed; } // --------------------------------------------------------------------------- // MDI specific message translation/preprocessing // --------------------------------------------------------------------------- -long wxMDIChildFrame::MSWDefWindowProc(WXUINT message, WXUINT wParam, WXLPARAM lParam) +WXLRESULT wxMDIChildFrame::MSWDefWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) { return DefMDIChildProc(GetHwnd(), (UINT)message, (WPARAM)wParam, (LPARAM)lParam); @@ -1250,7 +1248,7 @@ void wxMDIClientWindow::DoSetSize(int x, int y, int width, int height, int sizeF { if (GetParent()) { - wxWindowList::Node *node = GetParent()->GetChildren().GetFirst(); + wxWindowList::compatibility_iterator node = GetParent()->GetChildren().GetFirst(); while (node) { wxWindow *child = node->GetData(); @@ -1303,9 +1301,7 @@ static void MDISetMenu(wxWindow *win, HMENU hmenuFrame, HMENU hmenuWindow) wxWindow *parent = win->GetParent(); wxCHECK_RET( parent, wxT("MDI client without parent frame? weird...") ); -#ifndef __WIN16__ ::SendMessage(GetWinHwnd(win), WM_MDIREFRESHMENU, 0, 0L); -#endif ::DrawMenuBar(GetWinHwnd(parent)); } @@ -1393,17 +1389,10 @@ static void RemoveWindowMenu(wxWindow *win, WXHMENU menu) static void UnpackMDIActivate(WXWPARAM wParam, WXLPARAM lParam, WXWORD *activate, WXHWND *hwndAct, WXHWND *hwndDeact) { -#ifdef __WIN32__ *activate = true; *hwndAct = (WXHWND)lParam; *hwndDeact = (WXHWND)wParam; -#else // Win16 - *activate = (WXWORD)wParam; - *hwndAct = (WXHWND)LOWORD(lParam); - *hwndDeact = (WXHWND)HIWORD(lParam); -#endif // Win32/Win16 } -#endif -// wxUSE_MDI_ARCHITECTURE && !defined(__WXUNIVERSAL__) +#endif // wxUSE_MDI && !defined(__WXUNIVERSAL__)