#include "wx/settings.h"
#include "wx/dcclient.h"
#include "wx/mdi.h"
+ #include "wx/panel.h"
#endif // WX_PRECOMP
#include "wx/msw/private.h"
void wxFrame::Init()
{
- m_iconized = FALSE;
+ m_iconized =
+ m_maximizeOnShow = FALSE;
#if wxUSE_TOOLTIPS
m_hwndToolTip = 0;
m_fsStatusBarFields = 0;
m_fsStatusBarHeight = 0;
m_fsToolBarHeight = 0;
-// m_fsMenu = 0;
+// m_fsMenu = 0;
m_fsIsMaximized = FALSE;
m_fsIsShowing = FALSE;
+
+ m_winLastFocused = (wxWindow *)NULL;
+
+ // unlike (almost?) all other windows, frames are created hidden
+ m_isShown = FALSE;
}
bool wxFrame::Create(wxWindow *parent,
m_iconized = FALSE;
- // we pass NULL as parent to MSWCreate because frames with parents behave
- // very strangely under Win95 shell
- // Alteration by JACS: keep normal Windows behaviour (float on top of parent)
- // with this style.
- if ((m_windowStyle & wxFRAME_FLOAT_ON_PARENT) == 0)
- parent = NULL;
-
- if (!parent)
- wxTopLevelWindows.Append(this);
+ wxTopLevelWindows.Append(this);
MSWCreate(m_windowId, parent, wxFrameClassName, this, title,
x, y, width, height, style);
wxModelessWindows.Append(this);
+
return TRUE;
}
m_isBeingDeleted = TRUE;
wxTopLevelWindows.DeleteObject(this);
+ // the ~wxToolBar() code relies on the previous line to be executed before
+ // this one, i.e. the frame should remove itself from wxTopLevelWindows
+ // before destorying its toolbar
DeleteAllBars();
if (wxTheApp && (wxTopLevelWindows.Number() == 0))
// to wxWindows)
void wxFrame::DoSetClientSize(int width, int height)
{
- HWND hWnd = GetHwnd();
+ HWND hWnd = GetHwnd();
- RECT rect;
- ::GetClientRect(hWnd, &rect);
+ RECT rectClient;
+ ::GetClientRect(hWnd, &rectClient);
- RECT rect2;
- GetWindowRect(hWnd, &rect2);
+ RECT rectTotal;
+ ::GetWindowRect(hWnd, &rectTotal);
- // Find the difference between the entire window (title bar and all)
- // and the client area; add this to the new client size to move the
- // window
- int actual_width = rect2.right - rect2.left - rect.right + width;
- int actual_height = rect2.bottom - rect2.top - rect.bottom + height;
+ // Find the difference between the entire window (title bar and all)
+ // and the client area; add this to the new client size to move the
+ // window
+ width += rectTotal.right - rectTotal.left - rectClient.right;
+ height += rectTotal.bottom - rectTotal.top - rectClient.bottom;
#if wxUSE_STATUSBAR
- if ( GetStatusBar() && GetStatusBar()->IsShown())
- {
- int statusX, statusY;
- GetStatusBar()->GetClientSize(&statusX, &statusY);
- actual_height += statusY;
- }
+ wxStatusBar *statbar = GetStatusBar();
+ if ( statbar && statbar->IsShown() )
+ {
+ // leave enough space for the status bar
+ height += statbar->GetSize().y;
+ }
#endif // wxUSE_STATUSBAR
- wxPoint pt(GetClientAreaOrigin());
- actual_width += pt.y;
- actual_height += pt.x;
-
- POINT point;
- point.x = rect2.left;
- point.y = rect2.top;
+ // note that this takes the toolbar into account
+ wxPoint pt = GetClientAreaOrigin();
+ width += pt.x;
+ height += pt.y;
- MoveWindow(hWnd, point.x, point.y, actual_width, actual_height, (BOOL)TRUE);
+ if ( !::MoveWindow(hWnd, rectTotal.left, rectTotal.top,
+ width, height, TRUE /* redraw */) )
+ {
+ wxLogLastError(_T("MoveWindow"));
+ }
- wxSizeEvent event(wxSize(width, height), m_windowId);
- event.SetEventObject( this );
- GetEventHandler()->ProcessEvent(event);
+ wxSizeEvent event(wxSize(width, height), m_windowId);
+ event.SetEventObject(this);
+ GetEventHandler()->ProcessEvent(event);
}
void wxFrame::DoGetSize(int *width, int *height) const
{
- RECT rect;
- GetWindowRect(GetHwnd(), &rect);
- *width = rect.right - rect.left;
- *height = rect.bottom - rect.top;
+ RECT rect;
+ ::GetWindowRect(GetHwnd(), &rect);
+
+ *width = rect.right - rect.left;
+ *height = rect.bottom - rect.top;
}
void wxFrame::DoGetPosition(int *x, int *y) const
{
- RECT rect;
- GetWindowRect(GetHwnd(), &rect);
- POINT point;
- point.x = rect.left;
- point.y = rect.top;
+ RECT rect;
+ ::GetWindowRect(GetHwnd(), &rect);
- *x = point.x;
- *y = point.y;
+ *x = rect.left;
+ *y = rect.top;
}
// ----------------------------------------------------------------------------
bool wxFrame::Show(bool show)
{
- DoShowWindow(show ? SW_SHOW : SW_HIDE);
+ // don't use wxWindow version as we want to call DoShowWindow()
+ if ( !wxWindowBase::Show(show) )
+ return FALSE;
+
+ int nShowCmd;
+ if ( show )
+ {
+ if ( m_maximizeOnShow )
+ {
+ // show and maximize
+ nShowCmd = SW_MAXIMIZE;
+
+ m_maximizeOnShow = FALSE;
+ }
+ else // just show
+ {
+ nShowCmd = SW_SHOW;
+ }
+ }
+ else // hide
+ {
+ nShowCmd = SW_HIDE;
+ }
+
+ DoShowWindow(nShowCmd);
if ( show )
{
event.SetEventObject( this );
GetEventHandler()->ProcessEvent(event);
}
- else
+ else // hide
{
// Try to highlight the correct window (the parent)
if ( GetParent() )
void wxFrame::Maximize(bool maximize)
{
- DoShowWindow(maximize ? SW_MAXIMIZE : SW_RESTORE);
+ if ( IsShown() )
+ {
+ // just maximize it directly
+ DoShowWindow(maximize ? SW_MAXIMIZE : SW_RESTORE);
+ }
+ else // hidden
+ {
+ // we can't maximize the hidden frame because it shows it as well, so
+ // just remember that we should do it later in this case
+ m_maximizeOnShow = TRUE;
+ }
}
void wxFrame::Restore()
#endif // __WIN95__
}
+// generate an artificial resize event
+void wxFrame::SendSizeEvent()
+{
+ RECT r;
+#ifdef __WIN16__
+ ::GetWindowRect(GetHwnd(), &r);
+#else
+ if ( !::GetWindowRect(GetHwnd(), &r) )
+ {
+ wxLogLastError(_T("GetWindowRect"));
+ }
+#endif
+
+ if ( !m_iconized )
+ {
+ (void)::PostMessage(GetHwnd(), WM_SIZE,
+ IsMaximized() ? SIZE_MAXIMIZED : SIZE_RESTORED,
+ MAKELPARAM(r.right - r.left, r.bottom - r.top));
+ }
+}
+
#if wxUSE_STATUSBAR
wxStatusBar *wxFrame::OnCreateStatusBar(int number,
long style,
void wxFrame::DetachMenuBar()
{
- if (m_frameMenuBar)
+ if ( m_frameMenuBar )
{
m_frameMenuBar->Detach();
m_frameMenuBar = NULL;
}
}
-void wxFrame::SetMenuBar(wxMenuBar *menu_bar)
+void wxFrame::SetMenuBar(wxMenuBar *menubar)
{
- if (!menu_bar)
+ if ( !menubar )
{
DetachMenuBar();
- return;
- }
- m_frameMenuBar = NULL;
-
- // Can set a menubar several times.
- // TODO: how to prevent a memory leak if you have a currently-unattached
- // menubar? wxWindows assumes that the frame will delete the menu (otherwise
- // there are problems for MDI).
- if (menu_bar->GetHMenu())
- {
- m_hMenu = menu_bar->GetHMenu();
+ // actually remove the menu from the frame
+ m_hMenu = (WXHMENU)0;
+ InternalSetMenuBar();
}
- else
+ else // set new non NULL menu bar
{
- menu_bar->Detach();
+ m_frameMenuBar = NULL;
- m_hMenu = menu_bar->Create();
+ // Can set a menubar several times.
+ // TODO: how to prevent a memory leak if you have a currently-unattached
+ // menubar? wxWindows assumes that the frame will delete the menu (otherwise
+ // there are problems for MDI).
+ if ( menubar->GetHMenu() )
+ {
+ m_hMenu = menubar->GetHMenu();
+ }
+ else
+ {
+ menubar->Detach();
- if ( !m_hMenu )
- return;
- }
+ m_hMenu = menubar->Create();
- InternalSetMenuBar();
+ if ( !m_hMenu )
+ return;
+ }
- m_frameMenuBar = menu_bar;
- menu_bar->Attach(this);
+ InternalSetMenuBar();
-#if 0 // Old code that assumes only one call of SetMenuBar per frame.
- if (!menu_bar)
- {
- DetachMenuBar();
- return;
+ m_frameMenuBar = menubar;
+ menubar->Attach(this);
}
-
- wxCHECK_RET( !menu_bar->GetFrame(), wxT("this menubar is already attached") );
-
- if (m_frameMenuBar)
- delete m_frameMenuBar;
-
- m_hMenu = menu_bar->Create();
-
- if ( !m_hMenu )
- return;
-
- InternalSetMenuBar();
-
- m_frameMenuBar = menu_bar;
- menu_bar->Attach(this);
-#endif
}
void wxFrame::InternalSetMenuBar()
{
if ( !::SetMenu(GetHwnd(), (HMENU)m_hMenu) )
{
- wxLogLastError("SetMenu");
+ wxLogLastError(wxT("SetMenu"));
}
}
m_fsIsShowing = TRUE;
m_fsStyle = style;
- wxToolBar *theToolBar = GetToolBar();
- wxStatusBar *theStatusBar = GetStatusBar();
+ wxToolBar *theToolBar = GetToolBar();
+ wxStatusBar *theStatusBar = GetStatusBar();
int dummyWidth;
// Save the number of fields in the statusbar
if ((style & wxFULLSCREEN_NOSTATUSBAR) && theStatusBar)
{
- m_fsStatusBarFields = theStatusBar->GetFieldsCount();
- SetStatusBar((wxStatusBar*) NULL);
- delete theStatusBar;
+ //m_fsStatusBarFields = theStatusBar->GetFieldsCount();
+ //SetStatusBar((wxStatusBar*) NULL);
+ //delete theStatusBar;
+ theStatusBar->Show(FALSE);
}
else
m_fsStatusBarFields = 0;
// save the 'normal' window style
m_fsOldWindowStyle = GetWindowLong((HWND)GetHWND(), GWL_STYLE);
- // save the old position, width & height, maximize state
+ // save the old position, width & height, maximize state
m_fsOldSize = GetRect();
- m_fsIsMaximized = IsMaximized();
+ m_fsIsMaximized = IsMaximized();
- // decide which window style flags to turn off
+ // decide which window style flags to turn off
LONG newStyle = m_fsOldWindowStyle;
LONG offFlags = 0;
theToolBar->Show(TRUE);
}
- if ((m_fsStyle & wxFULLSCREEN_NOSTATUSBAR) && (m_fsStatusBarFields > 0))
+ if ((m_fsStyle & wxFULLSCREEN_NOSTATUSBAR)) // && (m_fsStatusBarFields > 0))
{
- CreateStatusBar(m_fsStatusBarFields);
- PositionStatusBar();
+ //CreateStatusBar(m_fsStatusBarFields);
+ if (GetStatusBar())
+ {
+ GetStatusBar()->Show(TRUE);
+ PositionStatusBar();
+ }
}
if ((m_fsStyle & wxFULLSCREEN_NOMENUBAR) && (m_hMenu != 0))
// could be the culprit. But without it, you can get a lot of flicker.
DWORD msflags = 0;
- if ((style & wxCAPTION) == wxCAPTION)
- msflags = WS_OVERLAPPED;
+ if ( style & wxCAPTION )
+ {
+ if ( style & wxFRAME_TOOL_WINDOW )
+ msflags |= WS_POPUPWINDOW;
+ else
+ msflags |= WS_OVERLAPPED;
+ }
else
- msflags = WS_POPUP;
+ {
+ msflags |= WS_POPUP;
+ }
if (style & wxMINIMIZE_BOX)
msflags |= WS_MINIMIZEBOX;
msflags |= WS_THICKFRAME;
if (style & wxSYSTEM_MENU)
msflags |= WS_SYSMENU;
- if ((style & wxMINIMIZE) || (style & wxICONIZE))
+ if ( style & wxMINIMIZE )
msflags |= WS_MINIMIZE;
if (style & wxMAXIMIZE)
msflags |= WS_MAXIMIZE;
WXDWORD extendedStyle = MakeExtendedStyle(style);
+ // make all frames appear in the win9x shell taskbar unless
+ // wxFRAME_TOOL_WINDOW or wxFRAME_NO_TASKBAR is given - without giving them
+ // WS_EX_APPWINDOW style, the child (i.e. owned) frames wouldn't appear in it
#if !defined(__WIN16__) && !defined(__SC__)
- if (style & wxFRAME_TOOL_WINDOW)
- extendedStyle |= WS_EX_TOOLWINDOW;
+ if ( (style & wxFRAME_TOOL_WINDOW) ||
+ (style & wxFRAME_NO_TASKBAR) )
+ extendedStyle |= WS_EX_TOOLWINDOW;
+ else if ( !(style & wxFRAME_NO_TASKBAR) )
+ extendedStyle |= WS_EX_APPWINDOW;
#endif
if (style & wxSTAY_ON_TOP)
extendedStyle |= WS_EX_TOPMOST;
+#ifndef __WIN16__
+ if (m_exStyle & wxFRAME_EX_CONTEXTHELP)
+ extendedStyle |= WS_EX_CONTEXTHELP;
+#endif
+
m_iconized = FALSE;
if ( !wxWindow::MSWCreate(id, parent, wclass, wx_win, title, x, y, width, height,
msflags, NULL, extendedStyle) )
// subwindow found.
void wxFrame::OnActivate(wxActivateEvent& event)
{
- if ( !event.GetActive() )
+ if ( event.GetActive() )
{
- event.Skip();
-
- return;
- }
+ // restore focus to the child which was last focused
+ wxLogTrace(_T("focus"), _T("wxFrame %08x activated."), m_hWnd);
- wxLogTrace(_T("focus"), _T("wxFrame %08x activated."), m_hWnd);
+ wxWindow *parent = m_winLastFocused ? m_winLastFocused->GetParent()
+ : NULL;
+ if ( !parent )
+ {
+ parent = this;
+ }
- for ( wxWindowList::Node *node = GetChildren().GetFirst();
- node;
- node = node->GetNext() )
+ wxSetFocusToChild(parent, &m_winLastFocused);
+ }
+ else // deactivating
{
- // FIXME all this is totally bogus - we need to do the same as wxPanel,
- // but how to do it without duplicating the code?
-
- // restore focus
- wxWindow *child = node->GetData();
+ // remember the last focused child if it is our child
+ m_winLastFocused = FindFocus();
- if ( !child->IsTopLevel()
-#if wxUSE_TOOLBAR
- && !wxDynamicCast(child, wxToolBar)
-#endif // wxUSE_TOOLBAR
-#if wxUSE_STATUSBAR
- && !wxDynamicCast(child, wxStatusBar)
-#endif // wxUSE_STATUSBAR
- )
+ // so we NULL it out if it's a child from some other frame
+ wxWindow *win = m_winLastFocused;
+ while ( win )
{
- child->SetFocus();
- break;
+ if ( win->IsTopLevel() )
+ {
+ if ( win != this )
+ {
+ m_winLastFocused = NULL;
+ }
+
+ break;
+ }
+
+ win = win->GetParent();
}
+
+ wxLogTrace(_T("focus"),
+ _T("wxFrame %08x deactivated, last focused: %08x."),
+ m_hWnd,
+ m_winLastFocused ? GetHwndOf(m_winLastFocused)
+ : NULL);
+
+ event.Skip();
}
}
{
wxWindow *win = node->GetData();
+ // iconizing the frames with this style under Win95 shell puts them at
+ // the bottom of the screen (as the MDI children) instead of making
+ // them appear in the taskbar because they are, by virtue of this
+ // style, not managed by the taskbar - instead leave Windows take care
+ // of them
+#ifdef __WIN95__
+ if ( win->GetWindowStyle() & wxFRAME_TOOL_WINDOW )
+ continue;
+#endif // Win95
+
// the child MDI frames are a special case and should not be touched by
// the parent frame - instead, they are managed by the user
wxFrame *frame = wxDynamicCast(win, wxFrame);
- if ( frame && !wxDynamicCast(frame, wxMDIChildFrame) )
+ if ( frame && !frame->IsMDIChild() )
{
frame->Iconize(bIconize);
}
// restore all child frames too
IconizeChildFrames(FALSE);
+ (void)SendIconizeEvent(FALSE);
+
// fall through
case SIZEFULLSCREEN:
// iconize all child frames too
IconizeChildFrames(TRUE);
+ (void)SendIconizeEvent();
+
m_iconized = TRUE;
break;
}
else
{
// don't give hints for separators (doesn't make sense) nor for the
- // items opening popup menus (they don't have them anyhow)
+ // items opening popup menus (they don't have them anyhow) but do clear
+ // the status line - otherwise, we would be left with the help message
+ // for the previous item which doesn't apply any more
+ wxStatusBar *statbar = GetStatusBar();
+ if ( statbar )
+ {
+ statbar->SetStatusText(wxEmptyString);
+ }
+
return FALSE;
}
projects / wxWidgets.git / blobdiff