From b1f22e19efde28f318b208d14421ab97a707447c Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Wed, 14 Jun 2000 09:47:19 +0000 Subject: [PATCH] Ignore wxTHICK_FRAME in wxWindow constructor: only relevant to frames and 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 --- src/msw/accel.cpp | 1 - src/msw/window.cpp | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/msw/accel.cpp b/src/msw/accel.cpp index e433443dd3..3f2cb37684 100644 --- a/src/msw/accel.cpp +++ b/src/msw/accel.cpp @@ -162,7 +162,6 @@ WXHACCEL wxAcceleratorTable::GetHACCEL() const bool wxAcceleratorTable::Translate(wxWindow *window, WXMSG *wxmsg) const { MSG *msg = (MSG *)wxmsg; - return Ok() && ::TranslateAccelerator(GetHwndOf(window), GetHaccel(), msg); } diff --git a/src/msw/window.cpp b/src/msw/window.cpp index 8f73bf6e8c..c6aeabb79e 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -304,9 +304,11 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id, DWORD msflags = 0; if ( style & wxBORDER ) msflags |= WS_BORDER; +/* Not appropriate for non-frame/dialog windows, and + may clash with other window styles. if ( style & wxTHICK_FRAME ) msflags |= WS_THICKFRAME; - +*/ //msflags |= WS_CHILD /* | WS_CLIPSIBLINGS */ | WS_VISIBLE; msflags |= WS_CHILD | WS_VISIBLE; if ( style & wxCLIP_CHILDREN )