#include "wx/app.h"
#include "wx/utils.h"
#include "wx/dialog.h"
- #include "wx/statusbr.h"
+ #if wxUSE_STATUSBAR
+ #include "wx/statusbr.h"
+ #endif
#include "wx/settings.h"
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/mdi.h"
#include "wx/msw/private.h"
-#if wxUSE_NATIVE_STATUSBAR
- #include <wx/msw/statbr95.h>
+#if wxUSE_STATUSBAR && wxUSE_NATIVE_STATUSBAR
+ #include "wx/msw/statbr95.h"
#endif
+#if wxUSE_TOOLBAR
+ #include "wx/toolbar.h"
+#endif // wxUSE_TOOLBAR
+
#include <string.h>
// ---------------------------------------------------------------------------
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 wxList *wxWinHandleList;
+extern void wxAssociateWinWithHandle(HWND hWnd, wxWindow *win);
static HWND invalidHandle = 0;
// 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(), _T("wxWindowMenu"));
-
DWORD msflags = WS_OVERLAPPED;
if (style & wxMINIMIZE_BOX)
msflags |= WS_MINIMIZEBOX;
if (style & wxCAPTION)
msflags |= WS_CAPTION;
- // Adding WS_CLIPCHILDREN causes children not to be properly
- // drawn when first displaying them.
-// if (style & wxCLIP_CHILDREN)
-// msflags |= WS_CLIPCHILDREN;
+ if (style & wxCLIP_CHILDREN)
+ msflags |= WS_CLIPCHILDREN;
wxWindow::MSWCreate(m_windowId, parent, wxMDIFrameClassName, this, title, x, y, width, height,
msflags);
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() )
break;
case WM_SIZE:
- // we will leave this message to the base class version, but we
- // must pass it to DefFrameProc() too
- MSWDefWindowProc(message, wParam, lParam);
+ // as we don't (usually) resize the MDI client to exactly fit the
+ // client area (we put it below the toolbar, above statusbar &c),
+ // we should not pass this one to DefFrameProc
break;
}
if ( child->GetHWND() )
{
long childId = wxGetWindowId(child->GetHWND());
- if (childId == id)
+ if (childId == (long)id)
{
::SendMessage( GetWinHwnd(GetClientWindow()),
WM_MDIACTIVATE,
{
// 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(_T("MDI parent frame is not active, "
+ wxFAIL_MSG(wxT("MDI parent frame is not active, "
"yet there is no active MDI child?"));
}
m_hWnd = (WXHWND)Return;
wxWndHook = NULL;
- wxWinHandleList->Append((long)GetHWND(), this);
+ wxAssociateWinWithHandle((HWND) GetHWND(), this);
// VZ: what's this? an act of piracy?
//SetWindowLong(GetHwnd(), 0, (long)this);
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);
// MDI operations
// ---------------------------------------------------------------------------
-void wxMDIChildFrame::Maximize()
+void wxMDIChildFrame::Maximize(bool maximize)
{
wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
if ( parent && parent->GetClientWindow() )
- ::SendMessage(GetWinHwnd(parent->GetClientWindow()), WM_MDIMAXIMIZE, (WPARAM) GetHwnd(), 0);
+ {
+ ::SendMessage(GetWinHwnd(parent->GetClientWindow()),
+ maximize ? WM_MDIMAXIMIZE : WM_MDIRESTORE,
+ (WPARAM)GetHwnd(), 0);
+ }
}
void wxMDIChildFrame::Restore()
{
wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
if ( parent && parent->GetClientWindow() )
- ::SendMessage(GetWinHwnd(parent->GetClientWindow()), WM_MDIRESTORE, (WPARAM) GetHwnd(), 0);
+ {
+ ::SendMessage(GetWinHwnd(parent->GetClientWindow()), WM_MDIRESTORE,
+ (WPARAM) GetHwnd(), 0);
+ }
}
void wxMDIChildFrame::Activate()
{
wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
if ( parent && parent->GetClientWindow() )
- ::SendMessage(GetWinHwnd(parent->GetClientWindow()), WM_MDIACTIVATE, (WPARAM) GetHwnd(), 0);
+ {
+ ::SendMessage(GetWinHwnd(parent->GetClientWindow()), WM_MDIACTIVATE,
+ (WPARAM) GetHwnd(), 0);
+ }
}
// ---------------------------------------------------------------------------
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;
}
- if (GetMenuBar() && GetMenuBar()->FindItemForId(id))
+ if (GetMenuBar() && GetMenuBar()->FindItem(id))
{
ProcessCommand(id);
return TRUE;
else if ( m_hWnd == hwndDeact )
{
wxASSERT_MSG( parent->m_currentChild == this,
- _T("can't deactivate MDI child which wasn't active!") );
+ wxT("can't deactivate MDI child which wasn't active!") );
activated = FALSE;
parent->m_currentChild = NULL;
}
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;
m_hWnd = (WXHWND)::CreateWindowEx
(
exStyle,
- _T("MDICLIENT"),
+ wxT("MDICLIENT"),
NULL,
msStyle,
0, 0, 0, 0,
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
// ---------------------------------------------------------------------------
// update menu bar of the parent window
wxWindow *parent = win->GetParent();
- wxCHECK_RET( parent, _T("MDI client without parent frame? weird...") );
+ wxCHECK_RET( parent, wxT("MDI client without parent frame? weird...") );
::DrawMenuBar(GetWinHwnd(parent));
}
{
// 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++ )
int chars = GetMenuString(hmenu, i, buf, WXSIZEOF(buf), MF_BYPOSITION);
if ( chars == 0 )
{
- wxLogLastError(_T("GetMenuString"));
+ wxLogLastError(wxT("GetMenuString"));
continue;
}
- if ( wxStripMenuCodes(wxString(buf)).IsSameAs(_T("Help")) )
+ if ( wxStripMenuCodes(wxString(buf)).IsSameAs(wxT("Help")) )
{
success = TRUE;
::InsertMenu(hmenu, i, MF_BYPOSITION | MF_POPUP | MF_STRING,
- (UINT)subMenu, _T("&Window"));
+ (UINT)subMenu, wxT("&Window"));
break;
}
}
if ( !success )
{
- ::AppendMenu(hmenu, MF_POPUP, (UINT)subMenu, _T("&Window"));
+ ::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