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

fixed #if in Create(); don't use wxModelessWindows any more

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2004-04-21 17:43:48 +00:00
parent cda73c278d
commit 11756f61e9
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/msw/toplevel.cpp
View File

@ -85,9 +85,6 @@ wxDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
// globals // globals
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// list of all frames and modeless dialogs
wxWindowList wxModelessWindows;
// the name of the default wxWindows class // the name of the default wxWindows class
#ifdef __WXWINCE__ #ifdef __WXWINCE__
extern wxChar *wxCanvasClassName; extern wxChar *wxCanvasClassName;
@ -414,7 +411,9 @@ bool wxTopLevelWindowMSW::CreateFrame(const wxString& title,
WXDWORD exflags; WXDWORD exflags;
WXDWORD flags = MSWGetCreateWindowFlags(&exflags); WXDWORD flags = MSWGetCreateWindowFlags(&exflags);
#if _WIN32_WCE < 400 || defined(WIN32_PLATFORM_PSPC) || defined(WIN32_PLATFORM_WFSP) #if (defined(_WIN32_WCE) && _WIN32_WCE < 400) || \
defined(WIN32_PLATFORM_PSPC) || \
defined(WIN32_PLATFORM_WFSP)
// Always expand to fit the screen in PocketPC or SmartPhone // Always expand to fit the screen in PocketPC or SmartPhone
wxSize sz(wxDefaultSize); wxSize sz(wxDefaultSize);
#else // other (including normal desktop) Windows #else // other (including normal desktop) Windows
@ -519,9 +518,6 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent,
wxTopLevelWindowMSW::~wxTopLevelWindowMSW() wxTopLevelWindowMSW::~wxTopLevelWindowMSW()
{ {
if ( wxModelessWindows.Find(this) )
wxModelessWindows.DeleteObject(this);
// after destroying an owned window, Windows activates the next top level // 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 // 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 // this simply Alt-TAB to another application and back before closing the