extern wxWindowList wxModelessWindows; // from dialog.cpp
extern wxMenu *wxCurrentPopupMenu;
-extern wxChar wxMDIFrameClassName[];
-extern wxChar wxMDIChildFrameClassName[];
+extern const wxChar *wxMDIFrameClassName;
+extern const wxChar *wxMDIChildFrameClassName;
extern wxWindow *wxWndHook; // from window.cpp
extern void wxAssociateWinWithHandle(HWND hWnd, wxWindow *win);
// the very end if not found
static void InsertWindowMenu(wxWindow *win, WXHMENU menu, HMENU subMenu);
+// Remove the window menu
+static void RemoveWindowMenu(wxWindow *win, WXHMENU menu);
+
// is this an id of an MDI child?
inline bool IsMdiCommandId(int id)
{
// wxWin macros
// ---------------------------------------------------------------------------
-#if !USE_SHARED_LIBRARY
- IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame)
- IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame)
- IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow)
-#endif // USE_SHARED_LIBRARY
+IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame)
+IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame)
+IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow)
BEGIN_EVENT_TABLE(wxMDIParentFrame, wxFrame)
EVT_SIZE(wxMDIParentFrame::OnSize)
{
m_clientWindow = NULL;
m_currentChild = NULL;
- m_windowMenu = 0;
+ m_windowMenu = (wxMenu*) NULL;
m_parentFrameActive = TRUE;
}
m_clientWindow = NULL;
m_currentChild = NULL;
- m_windowMenu = 0;
+
+ if (style & wxFRAME_NO_WINDOW_MENU)
+ m_windowMenu = (wxMenu*) NULL;
+ else
+ {
+ // m_windowMenu = (WXHMENU) ::LoadMenu(wxGetInstance(), wxT("wxWindowMenu"));
+ m_windowMenu = new wxMenu;
+
+
+ m_windowMenu->Append(4002, wxT("&Cascade"));
+ m_windowMenu->Append(4001, wxT("Tile &Horizontally"));
+ m_windowMenu->Append(4005, wxT("Tile &Vertically"));
+ m_windowMenu->AppendSeparator();
+ m_windowMenu->Append(4003, wxT("&Arrange Icons"));
+ m_windowMenu->Append(4004, wxT("&Next"));
+ }
+
m_parentFrameActive = TRUE;
if (!parent)
int width = size.x;
int height = size.y;
- m_windowMenu = (WXHMENU) ::LoadMenu(wxGetInstance(), wxT("wxWindowMenu"));
-
DWORD msflags = WS_OVERLAPPED;
if (style & wxMINIMIZE_BOX)
msflags |= WS_MINIMIZEBOX;
wxMDIParentFrame::~wxMDIParentFrame()
{
DestroyChildren();
+ // already delete by DestroyChildren()
+ m_frameToolBar = NULL;
- ::DestroyMenu((HMENU)m_windowMenu);
- m_windowMenu = 0;
+ // ::DestroyMenu((HMENU)m_windowMenu);
+ if (m_windowMenu)
+ {
+ delete m_windowMenu;
+ m_windowMenu = (wxMenu*) NULL;
+ }
if ( m_clientWindow )
{
void wxMDIParentFrame::InternalSetMenuBar()
{
- HMENU subMenu = GetSubMenu((HMENU) m_windowMenu, 0);
+// HMENU subMenu = GetSubMenu((HMENU) m_windowMenu, 0);
m_parentFrameActive = TRUE;
+ HMENU subMenu = (HMENU) 0;
+ if (GetWindowMenu())
+ subMenu = (HMENU) GetWindowMenu()->GetHMenu();
+
InsertWindowMenu(GetClientWindow(), m_hMenu, subMenu);
}
+void wxMDIParentFrame::SetWindowMenu(wxMenu* menu)
+{
+ if (m_windowMenu)
+ {
+ if (GetMenuBar())
+ {
+ // Remove old window menu
+ RemoveWindowMenu(GetClientWindow(), m_hMenu);
+ }
+
+ delete m_windowMenu;
+ m_windowMenu = (wxMenu*) NULL;
+ }
+ if (menu)
+ {
+ m_windowMenu = menu;
+ if (GetMenuBar())
+ InsertWindowMenu(GetClientWindow(), m_hMenu, (HMENU) m_windowMenu->GetHMenu());
+ }
+}
+
void wxMDIParentFrame::OnSize(wxSizeEvent& event)
{
if ( GetClientWindow() )
int actual_width = rect2.right - rect2.left - rect.right + width;
int actual_height = rect2.bottom - rect2.top - rect.bottom + height;
- if (GetStatusBar())
+ if (GetStatusBar() && GetStatusBar()->IsShown())
{
int sx, sy;
GetStatusBar()->GetSize(&sx, &sy);
{
wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
- HMENU subMenu = GetSubMenu((HMENU)parent->GetWindowMenu(), 0);
+ // HMENU subMenu = GetSubMenu((HMENU)parent->GetWindowMenu(), 0);
+ HMENU subMenu = (HMENU) 0;
+ if (parent->GetWindowMenu())
+ subMenu = (HMENU) parent->GetWindowMenu()->GetHMenu();
InsertWindowMenu(parent->GetClientWindow(), m_hMenu, subMenu);
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.
}
else
{
- // we have nothing to with it
+ // we have nothing to do with it
return FALSE;
}
if ( menuToSet )
{
- HMENU subMenu = GetSubMenu((HMENU) parent->GetWindowMenu(), 0);
+ HMENU subMenu = (HMENU) 0;
+ if (parent->GetWindowMenu())
+ subMenu = (HMENU) parent->GetWindowMenu()->GetHMenu();
MDISetMenu(parent->GetClientWindow(), menuToSet, subMenu);
}
lpPos->cy = rectClient.bottom - rectClient.top;
}
wxMDIParentFrame* pFrameWnd = (wxMDIParentFrame *)GetParent();
- if (pFrameWnd && pFrameWnd->GetToolBar())
+ if (pFrameWnd && pFrameWnd->GetToolBar() && pFrameWnd->GetToolBar()->IsShown())
{
pFrameWnd->GetToolBar()->Refresh();
}
HWND oldHandle = (HWND)GetHWND();
SendMessage(GetWinHwnd(parent->GetClientWindow()), WM_MDIDESTROY,
(WPARAM)oldHandle, 0);
+
+ if (parent->GetActiveChild() == (wxMDIChildFrame*) NULL)
+ ResetWindowStyle((void*) NULL);
+
invalidHandle = 0;
if (m_hMenu)
m_windowStyle = style;
m_parent = parent;
- ccs.hWindowMenu = (HMENU)parent->GetWindowMenu();
+ ccs.hWindowMenu = (HMENU) 0;
+ if (parent->GetWindowMenu())
+ ccs.hWindowMenu = (HMENU) parent->GetWindowMenu()->GetHMenu();
ccs.idFirstChild = wxFIRST_MDI_CHILD;
DWORD msStyle = WS_VISIBLE | WS_CHILD | WS_CLIPCHILDREN;
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();
+ }
+ }
+ }
+}
+
// ---------------------------------------------------------------------------
// non member functions
// ---------------------------------------------------------------------------
{
// Try to insert Window menu in front of Help, otherwise append it.
HMENU hmenu = (HMENU)menu;
+
+ if (subMenu)
+ {
int N = GetMenuItemCount(hmenu);
bool success = FALSE;
for ( int i = 0; i < N; i++ )
{
::AppendMenu(hmenu, MF_POPUP, (UINT)subMenu, wxT("&Window"));
}
+ }
MDISetMenu(win, hmenu, subMenu);
}
+static void RemoveWindowMenu(wxWindow *win, WXHMENU menu)
+{
+ // Try to insert Window menu in front of Help, otherwise append it.
+ HMENU hmenu = (HMENU)menu;
+ int N = GetMenuItemCount(hmenu);
+ bool success = FALSE;
+ for ( int i = 0; i < N; i++ )
+ {
+ wxChar buf[256];
+ int chars = GetMenuString(hmenu, i, buf, WXSIZEOF(buf), MF_BYPOSITION);
+ if ( chars == 0 )
+ {
+ wxLogLastError(wxT("GetMenuString"));
+
+ continue;
+ }
+
+ if ( wxStripMenuCodes(wxString(buf)).IsSameAs(wxT("Window")) )
+ {
+ success = TRUE;
+ ::RemoveMenu(hmenu, i, MF_BYPOSITION);
+ break;
+ }
+ }
+
+ // Does passing 0 for the window menu really work with WM_MDISETMENU?
+ MDISetMenu(win, hmenu, 0);
+}
+
static void UnpackMDIActivate(WXWPARAM wParam, WXLPARAM lParam,
WXWORD *activate, WXHWND *hwndAct, WXHWND *hwndDeact)
{
projects / wxWidgets.git / blobdiff