X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/879da8c81bd22487b7565f26da87502d7f25278f..69379916942701f59b6fff72dd09eaa0a9aba89c:/contrib/src/fl/barhintspl.cpp?ds=sidebyside diff --git a/contrib/src/fl/barhintspl.cpp b/contrib/src/fl/barhintspl.cpp index 241a98dea4..8cc2b570c5 100644 --- a/contrib/src/fl/barhintspl.cpp +++ b/contrib/src/fl/barhintspl.cpp @@ -121,16 +121,16 @@ void cbBarHintsPlugin::CreateBoxes() } -void cbBarHintsPlugin::Draw3DBox( wxDC& dc, const wxPoint& pos, bool pressed ) +void cbBarHintsPlugin::Draw3DBox( wxDC& WXUNUSED(dc), const wxPoint& WXUNUSED(pos), bool WXUNUSED(pressed) ) { } -void cbBarHintsPlugin::DrawCloseBox( wxDC& dc, const wxPoint& pos, bool pressed ) +void cbBarHintsPlugin::DrawCloseBox( wxDC& WXUNUSED(dc), const wxPoint& WXUNUSED(pos), bool WXUNUSED(pressed) ) { } -void cbBarHintsPlugin::DrawCollapseBox( wxDC& dc, const wxPoint& pos, - bool atLeft, bool disabled, bool pressed ) +void cbBarHintsPlugin::DrawCollapseBox( wxDC& WXUNUSED(dc), const wxPoint& WXUNUSED(pos), + bool WXUNUSED(atLeft), bool WXUNUSED(disabled), bool WXUNUSED(pressed) ) { } @@ -200,7 +200,7 @@ void cbBarHintsPlugin::ExcludeHints( wxRect& rect, cbBarInfo& info ) } void cbBarHintsPlugin::DoDrawHint( wxDC& dc, wxRect& rect, - int pos, int boxOfs, int grooveOfs, + int pos, int WXUNUSED(boxOfs), int grooveOfs, bool isFixed ) { if ( !isFixed ) @@ -500,7 +500,7 @@ void cbBarHintsPlugin::OnLeftUp( cbLeftUpEvent& event ) GetHintsLayout( mpClickedBar->mBoundsInParent, *mpClickedBar, boxOfs, grooveOfs, pos ); - int result = HitTestHints( *mpClickedBar, event.mPos ); + HitTestHints( *mpClickedBar, event.mPos ); int i; for ( i = 0; i != BOXES_IN_HINT; ++i ) @@ -512,6 +512,9 @@ void cbBarHintsPlugin::OnLeftUp( cbLeftUpEvent& event ) if ( i == 0 ) { mpLayout->SetBarState( mpClickedBar, wxCBAR_HIDDEN, TRUE ); + // Notify bar child window of close event: + if(mpClickedBar->mpBarWnd!=NULL) + mpClickedBar->mpBarWnd->Close(); } else {