#include "wx/containr.h" // wxSetFocusToChild()
#endif //WX_PRECOMP
+#include "wx/module.h"
+
#include "wx/msw/private.h"
#include "wx/popupwin.h"
#endif // __WXMICROWIN__
-// this is defined in dialog.cpp
+// 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);
// the name of the default wxWindows class
extern const wxChar *wxCanvasClassName;
-// the hidden parent for wxFRAME_NO_TASKBAR unowned frames
-wxWindow *wxTopLevelWindowMSW::ms_hiddenParent = NULL;
+// ----------------------------------------------------------------------------
+// wxTLWHiddenParentModule: used to manage the hidden parent window (we need a
+// module to ensure that the window is always deleted)
+// ----------------------------------------------------------------------------
+
+class wxTLWHiddenParentModule : public wxModule
+{
+public:
+ // module init/finalize
+ virtual bool OnInit();
+ virtual void OnExit();
+
+ // get the hidden window (creates on demand)
+ static HWND GetHWND();
+
+private:
+ // the HWND of the hidden parent
+ static HWND ms_hwnd;
+
+ // the class used to create it
+ static const wxChar *ms_className;
+
+ DECLARE_DYNAMIC_CLASS(wxTLWHiddenParentModule)
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxTLWHiddenParentModule, wxModule)
// ============================================================================
// wxTopLevelWindowMSW implementation
// parent HWND or it would be always on top of its parent which is not what
// we usually want (in fact, we only want it for frames with the
// wxFRAME_FLOAT_ON_PARENT flag)
- wxWindow *parent;
+ HWND hwndParent = NULL;
if ( HasFlag(wxFRAME_FLOAT_ON_PARENT) )
{
- parent = GetParent();
+ const wxWindow *parent = GetParent();
- // this flag doesn't make sense then and will be ignored
- wxASSERT_MSG( parent,
- _T("wxFRAME_FLOAT_ON_PARENT but no parent?") );
- }
- else // don't float on parent, must not be owned
- {
- parent = NULL;
+ if ( !parent )
+ {
+ // this flag doesn't make sense then and will be ignored
+ wxFAIL_MSG( _T("wxFRAME_FLOAT_ON_PARENT but no parent?") );
+ }
+ else
+ {
+ hwndParent = GetHwndOf(parent);
+ }
}
+ //else: don't float on parent, must not be owned
// now deal with the 2nd taskbar-related problem (see comments above in
// MSWGetStyle())
- if ( HasFlag(wxFRAME_NO_TASKBAR) && !parent )
+ if ( HasFlag(wxFRAME_NO_TASKBAR) && !hwndParent )
{
- if ( !ms_hiddenParent )
- {
- ms_hiddenParent = new wxTopLevelWindowMSW(NULL, -1, _T(""));
-
- // we shouldn't leave it in wxTopLevelWindows or we wouldn't
- // terminate the app when the last user-created frame is deleted --
- // see ~wxTopLevelWindowMSW
- wxTopLevelWindows.DeleteObject(ms_hiddenParent);
- }
-
- parent = ms_hiddenParent;
+ // use hidden parent
+ hwndParent = wxTLWHiddenParentModule::GetHWND();
}
- return parent ? parent->GetHWND() : NULL;
+ return (WXHWND)hwndParent;
}
bool wxTopLevelWindowMSW::CreateDialog(const void *dlgTemplate,
if ( !m_hWnd )
{
- wxFAIL_MSG(_("Failed to create dialog. Incorrect DLGTEMPLATE?"));
+ wxFAIL_MSG(wxT("Failed to create dialog. Incorrect DLGTEMPLATE?"));
- wxLogSysError(_("Can't create dialog using memory template"));
+ wxLogSysError(wxT("Can't create dialog using memory template"));
return FALSE;
}
wxTopLevelWindowMSW::~wxTopLevelWindowMSW()
{
- if ( this == ms_hiddenParent )
- {
- // stop [infinite] recursion which would otherwise happen when we do
- // "delete ms_hiddenParent" below
- return;
- }
-
- wxTopLevelWindows.DeleteObject(this);
-
if ( wxModelessWindows.Find(this) )
wxModelessWindows.DeleteObject(this);
::BringWindowToTop(GetHwndOf(parent));
}
}
-
- // If this is the last top-level window, exit.
- if ( wxTheApp && (wxTopLevelWindows.Number() == 0) )
- {
- if ( ms_hiddenParent )
- {
- delete ms_hiddenParent;
- ms_hiddenParent = NULL;
- }
-
- wxTheApp->SetTopWindow(NULL);
-
- if ( wxTheApp->GetExitOnFrameDelete() )
- {
- ::PostQuitMessage(0);
- }
- }
}
// ----------------------------------------------------------------------------
}
else // just show
{
- nShowCmd = SW_SHOW;
+ if ( GetWindowStyle() & wxFRAME_TOOL_WINDOW )
+ nShowCmd = SW_SHOWNA;
+ else
+ nShowCmd = SW_SHOW;
}
}
else // hide
{
// 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;
+ m_maximizeOnShow = maximize;
}
}
if ( event.GetActive() )
{
// restore focus to the child which was last focused
- wxLogTrace(_T("focus"), _T("wxTLW %08x activated."), m_hWnd);
+ wxLogTrace(_T("focus"), _T("wxTLW %08x activated."), (int) m_hWnd);
wxWindow *parent = m_winLastFocused ? m_winLastFocused->GetParent()
: NULL;
// remember the last focused child if it is our child
m_winLastFocused = FindFocus();
+ if ( m_winLastFocused )
+ {
+ // let it know that it doesn't have focus any more
+ m_winLastFocused->HandleKillFocus((WXHWND)NULL);
+ }
+
// so we NULL it out if it's a child from some other frame
wxWindow *win = m_winLastFocused;
while ( win )
wxLogTrace(_T("focus"),
_T("wxTLW %08x deactivated, last focused: %08x."),
- m_hWnd,
- m_winLastFocused ? GetHwndOf(m_winLastFocused)
- : NULL);
+ (int) m_hWnd,
+ (int) (m_winLastFocused ? GetHwndOf(m_winLastFocused)
+ : NULL));
event.Skip();
}
}
+// the DialogProc for all wxWindows dialogs
+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;
+ }
+}
+
+// ============================================================================
+// wxTLWHiddenParentModule implementation
+// ============================================================================
+
+HWND wxTLWHiddenParentModule::ms_hwnd = NULL;
+
+const wxChar *wxTLWHiddenParentModule::ms_className = NULL;
+
+bool wxTLWHiddenParentModule::OnInit()
+{
+ ms_hwnd = NULL;
+ ms_className = NULL;
+
+ return TRUE;
+}
+
+void wxTLWHiddenParentModule::OnExit()
+{
+ if ( ms_hwnd )
+ {
+ if ( !::DestroyWindow(ms_hwnd) )
+ {
+ wxLogLastError(_T("DestroyWindow(hidden TLW parent)"));
+ }
+
+ ms_hwnd = NULL;
+ }
+
+ if ( ms_className )
+ {
+ if ( !::UnregisterClass(ms_className, wxGetInstance()) )
+ {
+ wxLogLastError(_T("UnregisterClass(\"wxTLWHiddenParent\")"));
+ }
+
+ ms_className = NULL;
+ }
+}
+
+/* static */
+HWND wxTLWHiddenParentModule::GetHWND()
+{
+ if ( !ms_hwnd )
+ {
+ if ( !ms_className )
+ {
+ static const wxChar *HIDDEN_PARENT_CLASS = _T("wxTLWHiddenParent");
+
+ WNDCLASS wndclass;
+ wxZeroMemory(wndclass);
+
+ wndclass.lpfnWndProc = DefWindowProc;
+ wndclass.hInstance = wxGetInstance();
+ wndclass.lpszClassName = HIDDEN_PARENT_CLASS;
+
+ if ( !::RegisterClass(&wndclass) )
+ {
+ wxLogLastError(_T("RegisterClass(\"wxTLWHiddenParent\")"));
+ }
+ else
+ {
+ ms_className = HIDDEN_PARENT_CLASS;
+ }
+ }
+
+ ms_hwnd = ::CreateWindow(ms_className, _T(""), 0, 0, 0, 0, 0, NULL,
+ (HMENU)NULL, wxGetInstance(), NULL);
+ if ( !ms_hwnd )
+ {
+ wxLogLastError(_T("CreateWindow(hidden TLW parent)"));
+ }
+ }
+
+ return ms_hwnd;
+}
+
projects / wxWidgets.git / blobdiff