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

Ignore wxTHICK_FRAME in wxWindow constructor: only relevant to frames and

Browse Source 
dialogs, interferes with other window styles otherwise.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7572 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-06-14 09:47:19 +00:00
parent 21be423168
commit b1f22e19ef
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/msw/accel.cpp
View File

@@ -162,7 +162,6 @@ WXHACCEL wxAcceleratorTable::GetHACCEL() const
bool wxAcceleratorTable::Translate(wxWindow *window, WXMSG *wxmsg) const bool wxAcceleratorTable::Translate(wxWindow *window, WXMSG *wxmsg) const
{ {
MSG *msg = (MSG *)wxmsg; MSG *msg = (MSG *)wxmsg;
return Ok() && ::TranslateAccelerator(GetHwndOf(window), GetHaccel(), msg); return Ok() && ::TranslateAccelerator(GetHwndOf(window), GetHaccel(), msg);
} }

4
src/msw/window.cpp
View File

@@ -304,9 +304,11 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
DWORD msflags = 0; DWORD msflags = 0;
if ( style & wxBORDER ) if ( style & wxBORDER )
msflags |= WS_BORDER; msflags |= WS_BORDER;
/* Not appropriate for non-frame/dialog windows, and
may clash with other window styles.
if ( style & wxTHICK_FRAME ) if ( style & wxTHICK_FRAME )
msflags |= WS_THICKFRAME; msflags |= WS_THICKFRAME;
*/
//msflags |= WS_CHILD /* | WS_CLIPSIBLINGS */ | WS_VISIBLE; //msflags |= WS_CHILD /* | WS_CLIPSIBLINGS */ | WS_VISIBLE;
msflags |= WS_CHILD | WS_VISIBLE; msflags |= WS_CHILD | WS_VISIBLE;
if ( style & wxCLIP_CHILDREN ) if ( style & wxCLIP_CHILDREN )