extern wxWindowList wxModelessWindows; // from dialog.cpp
extern wxMenu *wxCurrentPopupMenu;
-extern const wxChar *wxMDIFrameClassName;
+extern const wxChar *wxMDIFrameClassName; // from app.cpp
extern const wxChar *wxMDIChildFrameClassName;
+extern const wxChar *wxMDIChildFrameClassNameNoRedraw;
+
extern wxWindow *wxWndHook; // from window.cpp
extern void wxAssociateWinWithHandle(HWND hWnd, wxWindow *win);
+extern void wxRemoveHandleAssociation(wxWindow *win);
static HWND invalidHandle = 0;
// wxWin macros
// ---------------------------------------------------------------------------
- IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame)
- IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame)
- IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow)
+IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame)
+IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame)
+IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow)
BEGIN_EVENT_TABLE(wxMDIParentFrame, wxFrame)
EVT_SIZE(wxMDIParentFrame::OnSize)
EVT_SYS_COLOUR_CHANGED(wxMDIParentFrame::OnSysColourChanged)
END_EVENT_TABLE()
+BEGIN_EVENT_TABLE(wxMDIChildFrame, wxFrame)
+ EVT_IDLE(wxMDIChildFrame::OnIdle)
+END_EVENT_TABLE()
+
BEGIN_EVENT_TABLE(wxMDIClientWindow, wxWindow)
EVT_SCROLL(wxMDIClientWindow::OnScroll)
END_EVENT_TABLE()
if (style & wxCLIP_CHILDREN)
msflags |= WS_CLIPCHILDREN;
- wxWindow::MSWCreate(m_windowId, parent, wxMDIFrameClassName, this, title, x, y, width, height,
- msflags);
+ if ( !wxWindow::MSWCreate(m_windowId,
+ parent,
+ wxMDIFrameClassName,
+ this,
+ title,
+ x, y, width, height,
+ msflags) )
+ {
+ return FALSE;
+ }
wxModelessWindows.Append(this);
+ // unlike (almost?) all other windows, frames are created hidden
+ m_isShown = FALSE;
+
return TRUE;
}
DestroyChildren();
// already delete by DestroyChildren()
m_frameToolBar = NULL;
+ m_frameStatusBar = NULL;
// ::DestroyMenu((HMENU)m_windowMenu);
if (m_windowMenu)
{
// this shouldn't happen because it means that our messages are being
// lost (they're not sent to the parent frame nor to the children)
- wxFAIL_MSG(wxT("MDI parent frame is not active, "
- "yet there is no active MDI child?"));
+ wxFAIL_MSG(wxT("MDI parent frame is not active, yet there is no active MDI child?"));
}
return FALSE;
{
MSG *pMsg = (MSG *)msg;
+ // first let the current child get it
if ( m_currentChild && m_currentChild->GetHWND() &&
m_currentChild->MSWTranslateMessage(msg) )
{
return TRUE;
}
- if ( m_acceleratorTable.Translate(this, msg) )
+ // then try out accel table (will also check the menu accels)
+ if ( wxFrame::MSWTranslateMessage(msg) )
{
return TRUE;
}
+ // finally, check for MDI specific built in accel keys
if ( pMsg->message == WM_KEYDOWN || pMsg->message == WM_SYSKEYDOWN )
{
if ( ::TranslateMDISysAccel(GetWinHwnd(GetClientWindow()), pMsg))
// wxMDIChildFrame
// ===========================================================================
-wxMDIChildFrame::wxMDIChildFrame()
+void wxMDIChildFrame::Init()
{
+ m_needsResize = TRUE;
}
bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
MDICREATESTRUCT mcs;
- mcs.szClass = wxMDIChildFrameClassName;
+ mcs.szClass = style & wxNO_FULL_REPAINT_ON_RESIZE
+ ? wxMDIChildFrameClassNameNoRedraw
+ : wxMDIChildFrameClassName;
mcs.szTitle = title;
mcs.hOwner = wxGetInstance();
if (x > -1)
mcs.lParam = 0;
- DWORD Return = SendMessage(GetWinHwnd(parent->GetClientWindow()),
- WM_MDICREATE, 0, (LONG)(LPSTR)&mcs);
-
- //handle = (HWND)LOWORD(Return);
- // Must be the DWORRD for WIN32. And in 16 bits, HIWORD=0 (says Microsoft)
- m_hWnd = (WXHWND)Return;
+ m_hWnd = (WXHWND)::SendMessage(GetWinHwnd(parent->GetClientWindow()),
+ WM_MDICREATE, 0, (LONG)(LPSTR)&mcs);
wxWndHook = NULL;
wxAssociateWinWithHandle((HWND) GetHWND(), this);
wxMDIChildFrame::~wxMDIChildFrame()
{
+ DestroyChildren();
+
+ // already delete by DestroyChildren()
+ m_frameToolBar = NULL;
+ m_frameStatusBar = NULL;
+
MSWDestroyWindow();
}
return rc;
}
-bool wxMDIChildFrame::HandleSize(int x, int y, WXUINT id)
-{
- HWND hwnd = GetHwnd();
-
- if ( !hwnd || hwnd == invalidHandle )
- {
- return FALSE;
- }
-
- switch (id)
- {
- case SIZEFULLSCREEN:
- case SIZENORMAL:
- m_iconized = FALSE;
- break;
-
- case SIZEICONIC:
- m_iconized = TRUE;
- break;
- }
-
- if ( !m_iconized )
- {
- // forward WM_SIZE to status bar control
-#if wxUSE_NATIVE_STATUSBAR
- if (m_frameStatusBar && m_frameStatusBar->IsKindOf(CLASSINFO(wxStatusBar95)))
- {
- wxSizeEvent event(wxSize(x, y), m_frameStatusBar->GetId());
- event.SetEventObject( m_frameStatusBar );
-
- ((wxStatusBar95 *)m_frameStatusBar)->OnSize(event);
- }
-#endif // wxUSE_NATIVE_STATUSBAR
-
- PositionStatusBar();
- PositionToolBar();
-
- return wxWindow::HandleSize(x, y, id);
- }
- else
- {
- return FALSE;
- }
-}
-
bool wxMDIChildFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd)
{
// In case it's e.g. a toolbar.
return TRUE;
}
+ bool processed;
if (GetMenuBar() && GetMenuBar()->FindItem(id))
{
- ProcessCommand(id);
- return TRUE;
+ processed = ProcessCommand(id);
}
else
- return FALSE;
+ {
+ processed = FALSE;
+ }
- return TRUE;
+ return processed;
}
bool wxMDIChildFrame::HandleMDIActivate(long WXUNUSED(activate),
::DestroyMenu((HMENU) m_hMenu);
m_hMenu = 0;
}
+ wxRemoveHandleAssociation(this);
m_hWnd = 0;
}
(LPSTR)(LPCLIENTCREATESTRUCT)&ccs);
if ( !m_hWnd )
{
- wxLogLastError("CreateWindowEx(MDI client)");
+ wxLogLastError(wxT("CreateWindowEx(MDI client)"));
return FALSE;
}
event.Skip();
}
+void wxMDIClientWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
+{
+ // Try to fix a problem whereby if you show an MDI child frame, then reposition the
+ // client area, you can end up with a non-refreshed portion in the client window
+ // (see OGL studio sample). So check if the position is changed and if so,
+ // redraw the MDI child frames.
+
+ wxPoint oldPos = GetPosition();
+
+ wxWindow::DoSetSize(x, y, width, height, sizeFlags);
+
+ wxPoint newPos = GetPosition();
+
+ if ((newPos.x != oldPos.x) || (newPos.y != oldPos.y))
+ {
+ if (GetParent())
+ {
+ wxNode* node = GetParent()->GetChildren().First();
+ while (node)
+ {
+ wxWindow* child = (wxWindow*) node->Data();
+ if (child->IsKindOf(CLASSINFO(wxMDIChildFrame)))
+ {
+ HWND hWnd = (HWND) child->GetHWND();
+ ::RedrawWindow(hWnd, NULL, NULL, RDW_FRAME|RDW_ALLCHILDREN|RDW_INVALIDATE );
+ }
+ node = node->Next();
+ }
+ }
+ }
+}
+
+void wxMDIChildFrame::OnIdle(wxIdleEvent& event)
+{
+ // MDI child frames get their WM_SIZE when they're constructed but at this
+ // moment they don't have any children yet so all child windows will be
+ // positioned incorrectly when they are added later - to fix this, we
+ // generate an artificial size event here
+ if ( m_needsResize )
+ {
+ m_needsResize = FALSE; // avoid any possibility of recursion
+
+ SendSizeEvent();
+ }
+
+ event.Skip();
+}
+
// ---------------------------------------------------------------------------
// non member functions
// ---------------------------------------------------------------------------
{
::SendMessage(GetWinHwnd(win), WM_MDISETMENU,
#ifdef __WIN32__
- (WPARAM)hmenuFrame, (LPARAM)hmenuWindow);
+ (WPARAM)hmenuFrame, (LPARAM)hmenuWindow
#else
- 0, MAKELPARAM(hmenuFrame, hmenuWindow));
+ 0, MAKELPARAM(hmenuFrame, hmenuWindow)
#endif
+ );
// update menu bar of the parent window
wxWindow *parent = win->GetParent();
continue;
}
- if ( wxStripMenuCodes(wxString(buf)).IsSameAs(wxT("Help")) )
+ if ( wxStripMenuCodes(wxString(buf)).IsSameAs(_("Help")) )
{
success = TRUE;
::InsertMenu(hmenu, i, MF_BYPOSITION | MF_POPUP | MF_STRING,
- (UINT)subMenu, wxT("&Window"));
+ (UINT)subMenu, _("&Window"));
break;
}
}
if ( !success )
{
- ::AppendMenu(hmenu, MF_POPUP, (UINT)subMenu, wxT("&Window"));
+ ::AppendMenu(hmenu, MF_POPUP, (UINT)subMenu, _("&Window"));
}
}
continue;
}
- if ( wxStripMenuCodes(wxString(buf)).IsSameAs(wxT("Window")) )
+ if ( wxStripMenuCodes(wxString(buf)).IsSameAs(_("Window")) )
{
success = TRUE;
::RemoveMenu(hmenu, i, MF_BYPOSITION);
projects / wxWidgets.git / blobdiff