don't return HTCLIENT for static bitmaps, this breaks mouse (leave) event generation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31479 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -73,9 +73,6 @@ public:
|
|||||||
// implementation only from now on
|
// implementation only from now on
|
||||||
// -------------------------------
|
// -------------------------------
|
||||||
|
|
||||||
// implement base class virtuals
|
|
||||||
virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
|
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual wxBorder GetDefaultBorder() const;
|
virtual wxBorder GetDefaultBorder() const;
|
||||||
virtual wxSize DoGetBestSize() const;
|
virtual wxSize DoGetBestSize() const;
|
||||||
|
@@ -262,19 +262,4 @@ void wxStaticBitmap::SetImageNoCopy( wxGDIImage* image)
|
|||||||
::InvalidateRect(GetHwndOf(GetParent()), &rect, TRUE);
|
::InvalidateRect(GetHwndOf(GetParent()), &rect, TRUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
// We need this or the control can never be moved e.g. in Dialog Editor.
|
|
||||||
WXLRESULT wxStaticBitmap::MSWWindowProc(WXUINT nMsg,
|
|
||||||
WXWPARAM wParam,
|
|
||||||
WXLPARAM lParam)
|
|
||||||
{
|
|
||||||
#ifndef __WXWINCE__
|
|
||||||
// Ensure that static items get messages. Some controls don't like this
|
|
||||||
// message to be intercepted (e.g. RichEdit), hence the tests.
|
|
||||||
if ( nMsg == WM_NCHITTEST )
|
|
||||||
return (long)HTCLIENT;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
return wxWindow::MSWWindowProc(nMsg, wParam, lParam);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif // wxUSE_STATBMP
|
#endif // wxUSE_STATBMP
|
||||||
|
Reference in New Issue
Block a user