X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/196be0f13767693bb514cdff5b3020fee9ca1676..e6b1317b7903e4802f4bab2b7540600340361061:/contrib/src/fl/barhintspl.cpp diff --git a/contrib/src/fl/barhintspl.cpp b/contrib/src/fl/barhintspl.cpp index 8cc2b570c5..411a3e4fa3 100644 --- a/contrib/src/fl/barhintspl.cpp +++ b/contrib/src/fl/barhintspl.cpp @@ -9,10 +9,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ - #pragma implementation "barhintspl.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -61,9 +57,9 @@ END_EVENT_TABLE() cbBarHintsPlugin::cbBarHintsPlugin(void) : mpPane( 0 ), - mBtnPressed ( FALSE ), - mCloseBoxOn ( TRUE ), - mCollapseBoxOn( TRUE ), + mBtnPressed ( false ), + mCloseBoxOn ( true ), + mCollapseBoxOn( true ), mGrooveCount ( 2 ), mHintGap ( 4 ), mXWeight ( 2 ) @@ -76,9 +72,9 @@ cbBarHintsPlugin::cbBarHintsPlugin( wxFrameLayout* pLayout, int paneMask ) : cbPluginBase( pLayout, paneMask ), mpPane( 0 ), - mBtnPressed ( FALSE ), - mCloseBoxOn ( TRUE ), - mCollapseBoxOn( TRUE ), + mBtnPressed ( false ), + mCloseBoxOn ( true ), + mCollapseBoxOn( true ), mGrooveCount ( 2 ), mHintGap ( 5 ), mXWeight ( 2 ) @@ -280,7 +276,7 @@ void cbBarHintsPlugin::GetHintsLayout( wxRect& rect, cbBarInfo& info, if ( info.IsExpanded() ) { - isAtLeft = FALSE; + isAtLeft = false; cbBarInfo* pCur = info.mpPrev; @@ -288,7 +284,7 @@ void cbBarHintsPlugin::GetHintsLayout( wxRect& rect, cbBarInfo& info, { if ( !pCur->IsFixed() ) { - isAtLeft = TRUE; break; + isAtLeft = true; break; } pCur = pCur->mpPrev; @@ -363,7 +359,7 @@ int cbBarHintsPlugin::HitTestHints( cbBarInfo& info, const wxPoint& pos ) wxRect& rect = info.mBoundsInParent; - if ( info.IsFixed() ) return FALSE; + if ( info.IsFixed() ) return false; int boxOfs, grooveOfs, coord; @@ -413,7 +409,7 @@ int cbBarHintsPlugin::HitTestHints( cbBarInfo& info, const wxPoint& pos ) } } - return FALSE; + return false; } // handlers for plugin-events @@ -468,8 +464,8 @@ void cbBarHintsPlugin::OnLeftDown( cbLeftDownEvent& event ) int i; for ( i = 0; i != BOXES_IN_HINT; ++i ) { - mBoxes[i]->mPressed = FALSE; - mBoxes[i]->mWasClicked = FALSE; + mBoxes[i]->mPressed = false; + mBoxes[i]->mWasClicked = false; } for ( i = 0; i != BOXES_IN_HINT; ++i ) { @@ -477,7 +473,7 @@ void cbBarHintsPlugin::OnLeftDown( cbLeftDownEvent& event ) if ( mBoxes[i]->mPressed ) { - mBtnPressed = TRUE; + mBtnPressed = true; mpClickedBar = &bar; return; // event handled @@ -511,7 +507,7 @@ void cbBarHintsPlugin::OnLeftUp( cbLeftUpEvent& event ) { if ( i == 0 ) { - mpLayout->SetBarState( mpClickedBar, wxCBAR_HIDDEN, TRUE ); + mpLayout->SetBarState( mpClickedBar, wxCBAR_HIDDEN, true ); // Notify bar child window of close event: if(mpClickedBar->mpBarWnd!=NULL) mpClickedBar->mpBarWnd->Close(); @@ -526,7 +522,7 @@ void cbBarHintsPlugin::OnLeftUp( cbLeftUpEvent& event ) } } - mBtnPressed = FALSE; + mBtnPressed = false; return; } else