From 18342f19935a6bc6085b8ae7b58468fba2f99fbe Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 19 Nov 2004 19:55:34 +0000 Subject: [PATCH] don't set background colour explicitely; no need to handle WM_ERASEBKGND ourselves now that it is done correctly at wxControl level git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/statbox.h | 8 -------- src/msw/statbox.cpp | 37 ------------------------------------- 2 files changed, 45 deletions(-) diff --git a/include/wx/msw/statbox.h b/include/wx/msw/statbox.h index 169f95e25d..06956d91b5 100644 --- a/include/wx/msw/statbox.h +++ b/include/wx/msw/statbox.h @@ -39,14 +39,6 @@ public: long style = 0, const wxString& name = wxStaticBoxNameStr); - // implementation from now on - // -------------------------- - - virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); - - // overriden base class virtuals - virtual bool AcceptsFocus() const { return false; } - protected: virtual wxSize DoGetBestSize() const; diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp index aff9a05e68..969ce69949 100644 --- a/src/msw/statbox.cpp +++ b/src/msw/statbox.cpp @@ -134,9 +134,6 @@ bool wxStaticBox::Create(wxWindow *parent, ) ) return false; - // to be transparent we should have the same colour as the parent as well - SetBackgroundColour(GetParent()->GetBackgroundColour()); - return true; } @@ -154,38 +151,4 @@ wxSize wxStaticBox::DoGetBestSize() const return wxSize(wBox, hBox); } -WXLRESULT wxStaticBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) -{ - switch ( nMsg ) - { -#ifndef __WXWINCE__ - case WM_NCHITTEST: - // FIXME: this hack is specific to dialog ed, shouldn't it be - // somehow disabled during normal operation? - { - int xPos = LOWORD(lParam); // horizontal position of cursor - int yPos = HIWORD(lParam); // vertical position of cursor - - ScreenToClient(&xPos, &yPos); - - // Make sure you can drag by the top of the groupbox, but let - // other (enclosed) controls get mouse events also - if ( yPos < 10 ) - return (long)HTCLIENT; - } - break; -#endif - case WM_ERASEBKGND: - // prevent wxControl from processing this message because it will - // erase the background incorrectly and there is no way for us to - // override this at wxWin event level (if we do process the event, - // we don't know how to do it properly - paint the background - // without painting over other controls - and if we don't, - // wxControl still gets it) - return MSWDefWindowProc(nMsg, wParam, lParam); - } - - return wxControl::MSWWindowProc(nMsg, wParam, lParam); -} - #endif // wxUSE_STATBOX -- 2.45.2