Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. a couple of compilation warnings fixed (strconv/listctrl)

Browse Source 
2. now reenable windows disabled by wxWindowDisabler slightly earlier:
   this solves the problem with "wrong" window being brought to top and
   eliminates the need for BringWindowToTop() and SetActiveWindow() in
   our code
3. style wxFRAME_FLOAT_ON_PARENT is now obsolete and unused, all frames
   have WS_EX_APPWINDOW style and appear on the taskbar


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8487 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-10-07 20:19:10 +00:00
parent 98243feda0
commit b0a6bb75bc
8 changed files with 61 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/msw/frame.cpp
View File

@@ -147,13 +147,6 @@ 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;
wxTopLevelWindows.Append(this);
MSWCreate(m_windowId, parent, wxFrameClassName, this, title,
@@ -672,9 +665,14 @@ bool wxFrame::MSWCreate(int id, wxWindow *parent, const wxChar *wclass, wxWindow
WXDWORD extendedStyle = MakeExtendedStyle(style);
// make all frames appear in the win9x shell taskbar unless
// wxFRAME_TOOL_WINDOW is explicitly 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;
extendedStyle |= WS_EX_TOOLWINDOW;
else
extendedStyle |= WS_EX_APPWINDOW;
#endif
if (style & wxSTAY_ON_TOP)