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

Applied [ 565397 ] FL wxNewBitmapButton patch

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-06-23 13:38:50 +00:00
parent a7501aebf8
commit 45d6fd80b3
2 changed files with 2 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/include/wx/fl/newbmpbtn.h
View File

@@ -176,9 +176,6 @@ public:
// Responds to a left mouse button up event. // Responds to a left mouse button up event.
void OnLButtonUp( wxMouseEvent& event ); void OnLButtonUp( wxMouseEvent& event );
// Responds to a left mouse button double click.
void OnLButtonDClick( wxMouseEvent& event );
// Responds to mouse enter to window. // Responds to mouse enter to window.
void OnMouseEnter( wxMouseEvent& event ); void OnMouseEnter( wxMouseEvent& event );

18
contrib/src/fl/newbmpbtn.cpp
View File

@@ -210,7 +210,8 @@ BEGIN_EVENT_TABLE( wxNewBitmapButton, wxPanel )
EVT_LEFT_DOWN ( wxNewBitmapButton::OnLButtonDown ) EVT_LEFT_DOWN ( wxNewBitmapButton::OnLButtonDown )
EVT_LEFT_UP ( wxNewBitmapButton::OnLButtonUp ) EVT_LEFT_UP ( wxNewBitmapButton::OnLButtonUp )
EVT_LEFT_DCLICK ( wxNewBitmapButton::OnLButtonDClick ) // EVT_LEFT_DCLICK ( wxNewBitmapButton::OnLButtonDClick )
EVT_LEFT_DCLICK ( wxNewBitmapButton::OnLButtonDown )
EVT_ENTER_WINDOW( wxNewBitmapButton::OnMouseEnter ) EVT_ENTER_WINDOW( wxNewBitmapButton::OnMouseEnter )
EVT_LEAVE_WINDOW( wxNewBitmapButton::OnMouseLeave ) EVT_LEAVE_WINDOW( wxNewBitmapButton::OnMouseLeave )
@@ -676,21 +677,6 @@ void wxNewBitmapButton::OnLButtonUp( wxMouseEvent& event )
} }
} }
void wxNewBitmapButton::OnLButtonDClick( wxMouseEvent& event )
{
if ( IsInWindow( event.m_x, event.m_y ) )
{
// fire event, if mouse was released
// within the bounds of button
wxCommandEvent cmd( mFiredEventType, GetId() );
GetParent()->ProcessEvent( cmd );
mDragStarted = FALSE;
mIsPressed = FALSE;
Refresh();
}
}
bool wxNewBitmapButton::IsInWindow( int x, int y ) bool wxNewBitmapButton::IsInWindow( int x, int y )
{ {
int width, height; int width, height;