#include "wx/log.h"
#include "wx/intl.h"
#include "wx/frame.h"
+ #include "wx/containr.h" // wxSetFocusToChild()
#endif //WX_PRECOMP
#include "wx/msw/private.h"
#endif // __WXMICROWIN__
+// NB: wxDlgProc must be defined here and not in dialog.cpp because the latter
+// is not included by wxUniv build which does need wxDlgProc
+LONG APIENTRY _EXPORT
+wxDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
+
// ----------------------------------------------------------------------------
// globals
// ----------------------------------------------------------------------------
// wxTopLevelWindowMSW implementation
// ============================================================================
-// ----------------------------------------------------------------------------
-// wxDialog helpers
-// ----------------------------------------------------------------------------
-
-// Dialog window proc
-LONG APIENTRY _EXPORT
-wxDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
-{
- switch ( message )
- {
- case WM_INITDIALOG:
- // for this message, returning TRUE tells system to set focus to
- // the first control in the dialog box, but as we set the focus
- // ourselves, we return FALSE from here as well, so fall through
-
- default:
- // for all the other ones, FALSE means that we didn't process the
- // message
- return FALSE;
- }
-}
+BEGIN_EVENT_TABLE(wxTopLevelWindowMSW, wxTopLevelWindowBase)
+ EVT_ACTIVATE(wxTopLevelWindowMSW::OnActivate)
+END_EVENT_TABLE()
// ----------------------------------------------------------------------------
// wxTopLevelWindowMSW creation
m_fsOldWindowStyle = 0;
m_fsIsMaximized = FALSE;
m_fsIsShowing = FALSE;
+
+ m_winLastFocused = (wxWindow *)NULL;
}
WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
parent = ms_hiddenParent;
}
- return parent ? parent->GetHWND() : NULL;
+ return parent ? parent->GetHWND() : WXHWND(NULL);
}
bool wxTopLevelWindowMSW::CreateDialog(const void *dlgTemplate,
if ( this == ms_hiddenParent )
{
// stop [infinite] recursion which would otherwise happen when we do
- // "delete ms_hiddenParent" below
+ // "delete ms_hiddenParent" below -- and we're not interested in doing
+ // anything of the rest below for that window because the rest of
+ // wxWindows doesn't even know about it
return;
}
- wxTopLevelWindows.DeleteObject(this);
-
if ( wxModelessWindows.Find(this) )
wxModelessWindows.DeleteObject(this);
- // If this is the last top-level window, exit.
- if ( wxTheApp && (wxTopLevelWindows.Number() == 0) )
+ // after destroying an owned window, Windows activates the next top level
+ // window in Z order but it may be different from our owner (to reproduce
+ // this simply Alt-TAB to another application and back before closing the
+ // owned frame) whereas we always want to yield activation to our parent
+ if ( HasFlag(wxFRAME_FLOAT_ON_PARENT) )
{
- if ( ms_hiddenParent )
+ wxWindow *parent = GetParent();
+ if ( parent )
{
- delete ms_hiddenParent;
- ms_hiddenParent = NULL;
+ ::BringWindowToTop(GetHwndOf(parent));
}
+ }
- wxTheApp->SetTopWindow(NULL);
-
- if ( wxTheApp->GetExitOnFrameDelete() )
+ // if this is the last top-level window, we're going to exit and we should
+ // delete ms_hiddenParent now to avoid leaking it
+ if ( IsLastBeforeExit() )
+ {
+ if ( ms_hiddenParent )
{
- ::PostQuitMessage(0);
+ delete ms_hiddenParent;
+ ms_hiddenParent = NULL;
}
}
}
}
// ----------------------------------------------------------------------------
-// wxTopLevelWindowMSW message processing
+// wxTopLevelWindow event handling
// ----------------------------------------------------------------------------
-long wxTopLevelWindowMSW::HandleNcActivate(bool activate)
+// Default activation behaviour - set the focus for the first child
+// subwindow found.
+void wxTopLevelWindowMSW::OnActivate(wxActivateEvent& event)
{
-#if wxUSE_POPUPWIN
- /*
- Normally, when another top level (whether it is overlapped or popup)
- window is shown, it is activated and the parent window (i.e. we) loses
- the activation. This, however, looks very ugly when the child window is
- a [custom] combobox which we implement using a popup window as surely
- opening a combobox shouldn't result in deactivating the parent window.
-
- So we don't redraw the title bar in this case, even if we still return
- TRUE to let the change of activation to take place as otherwise the
- controls inside the popup window wouldn't work properly.
- */
- if ( !activate && wxPopupWindow::FindPopupFor(this) )
+ if ( event.GetActive() )
{
- return TRUE;
+ // restore focus to the child which was last focused
+ wxLogTrace(_T("focus"), _T("wxTLW %08x activated."), m_hWnd);
+
+ wxWindow *parent = m_winLastFocused ? m_winLastFocused->GetParent()
+ : NULL;
+ if ( !parent )
+ {
+ parent = this;
+ }
+
+ wxSetFocusToChild(parent, &m_winLastFocused);
}
-#endif // wxUSE_POPUPWIN
+ else // deactivating
+ {
+ // remember the last focused child if it is our child
+ m_winLastFocused = FindFocus();
+
+ // so we NULL it out if it's a child from some other frame
+ wxWindow *win = m_winLastFocused;
+ while ( win )
+ {
+ if ( win->IsTopLevel() )
+ {
+ if ( win != this )
+ {
+ m_winLastFocused = NULL;
+ }
+
+ break;
+ }
+
+ win = win->GetParent();
+ }
+
+ wxLogTrace(_T("focus"),
+ _T("wxTLW %08x deactivated, last focused: %08x."),
+ m_hWnd,
+ m_winLastFocused ? GetHwndOf(m_winLastFocused)
+ : NULL);
- return FALSE;
+ event.Skip();
+ }
}
-long
-wxTopLevelWindowMSW::MSWWindowProc(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam)
+// the DialogProc for all wxWindows dialogs
+LONG APIENTRY _EXPORT
+wxDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
{
- if ( msg == WM_NCACTIVATE && HandleNcActivate(wParam != 0) )
+ switch ( message )
{
- // we processed WM_NCACTIVATE ourselves
- return TRUE;
- }
+ case WM_INITDIALOG:
+ // for this message, returning TRUE tells system to set focus to
+ // the first control in the dialog box, but as we set the focus
+ // ourselves, we return FALSE from here as well, so fall through
- return wxTopLevelWindowBase::MSWWindowProc(msg, wParam, lParam);
+ default:
+ // for all the other ones, FALSE means that we didn't process the
+ // message
+ return FALSE;
+ }
}
+
projects / wxWidgets.git / blobdiff