X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/196be0f13767693bb514cdff5b3020fee9ca1676..5cf1cb1006d6b5762d96c07ee3892883607460c7:/contrib/src/fl/newbmpbtn.cpp diff --git a/contrib/src/fl/newbmpbtn.cpp b/contrib/src/fl/newbmpbtn.cpp index 73cd1c2740..eb83eb9c62 100644 --- a/contrib/src/fl/newbmpbtn.cpp +++ b/contrib/src/fl/newbmpbtn.cpp @@ -9,10 +9,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ - #pragma implementation "newbmpbtn.h" -#endif - // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" @@ -51,14 +47,14 @@ static int* create_array( int width, int height, int fill = 0 ) #define IS_IN_ARRAY(x,y) ( (x) < width && (y) < height && (x) >= 0 && (y) >= 0 ) -#define GET_RED(col) col & 0xFF -#define GET_GREEN(col) (col >> 8) & 0xFF -#define GET_BLUE(col) (col >> 16) & 0xFF +#define GET_RED(col) col & 0xFF +#define GET_GREEN(col) (col >> 8) & 0xFF +#define GET_BLUE(col) (col >> 16) & 0xFF #define MAKE_INT_COLOR(red,green,blue) ( (red) | \ ( ( (green) << 8 ) & 0xFF00 ) | \ ( ( (blue) << 16) & 0xFF0000) \ - ) + ) #define IS_GREATER(col1,col2) ( ( (GET_RED(col1) ) > (GET_RED(col2) ) + MIN_COLOR_DIFF ) && \ ( (GET_GREEN(col1)) > (GET_GREEN(col2)) + MIN_COLOR_DIFF ) && \ @@ -101,7 +97,7 @@ static void gray_out_pixmap( int* src, int* dest, int width, int height ) else { if ( GET_ELEM(dest,x-1,y-1) == MASK_LIGHT ) - + GET_ELEM(dest,x,y) = MASK_BG; if ( GET_ELEM(dest,x-1,y-1 ) == MASK_DARK ) @@ -114,14 +110,14 @@ static void gray_out_pixmap( int* src, int* dest, int width, int height ) // go zig-zag - if ( IS_IN_ARRAY(x+1,y-1) ) + if ( IS_IN_ARRAY(x+1,y-1) ) { ++x; --y; } else { - while ( IS_IN_ARRAY(x-1,y+1) ) + while ( IS_IN_ARRAY(x-1,y+1) ) { --x; ++y; @@ -183,13 +179,13 @@ void gray_out_image_on_dc( wxDC& dc, int width, int height ) switch (mask) { - case MASK_BG : { dc.SetPen( bgPen ); + case MASK_BG : { dc.SetPen( bgPen ); dc.DrawPoint( x,y ); break; } - case MASK_DARK : { dc.SetPen( darkPen ); + case MASK_DARK : { dc.SetPen( darkPen ); dc.DrawPoint( x,y ); break; } - case MASK_LIGHT : { dc.SetPen( lightPen ); + case MASK_LIGHT : { dc.SetPen( lightPen ); dc.DrawPoint( x,y ); break; } default : break; @@ -222,13 +218,15 @@ BEGIN_EVENT_TABLE( wxNewBitmapButton, wxPanel ) EVT_ERASE_BACKGROUND( wxNewBitmapButton::OnEraseBackground ) + EVT_IDLE(wxNewBitmapButton::OnIdle) + END_EVENT_TABLE() -wxNewBitmapButton::wxNewBitmapButton( const wxBitmap& labelBitmap, +wxNewBitmapButton::wxNewBitmapButton( const wxBitmap& labelBitmap, const wxString& labelText, int alignText, bool isFlat, - int firedEventType, + int firedEventType, int marginX, int marginY, int textToLabelGap, @@ -249,10 +247,11 @@ wxNewBitmapButton::wxNewBitmapButton( const wxBitmap& labelBitmap, mpFocusedImg ( NULL ), - mDragStarted ( FALSE ), - mIsPressed ( FALSE ), - mIsInFocus( FALSE ), - mHasFocusedBmp( FALSE ), + mDragStarted ( false ), + mIsPressed ( false ), + mIsInFocus ( false ), + mIsToggled ( false ), + mHasFocusedBmp( false ), mFiredEventType( firedEventType ), mBlackPen( wxColour( 0, 0, 0), 1, wxSOLID ), @@ -260,8 +259,8 @@ wxNewBitmapButton::wxNewBitmapButton( const wxBitmap& labelBitmap, mGrayPen ( wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE), 1, wxSOLID ), mLightPen( wxSystemSettings::GetColour(wxSYS_COLOUR_3DHIGHLIGHT), 1, wxSOLID ), - mIsCreated( FALSE ), - mSizeIsSet( FALSE ) + mIsCreated( false ), + mSizeIsSet( false ) { } @@ -271,7 +270,7 @@ wxNewBitmapButton::wxNewBitmapButton( const wxString& bitmapFileName, const wxString& labelText, int alignText, bool isFlat, - int WXUNUSED(firedEventType), + int WXUNUSED(firedEventType), int WXUNUSED(marginX), int WXUNUSED(marginY), int WXUNUSED(textToLabelGap), @@ -281,7 +280,7 @@ wxNewBitmapButton::wxNewBitmapButton( const wxString& bitmapFileName, mMarginX( 2 ), mMarginY( 2 ), mTextAlignment( alignText ), - mIsSticky( FALSE ), + mIsSticky( false ), mIsFlat( isFlat ), mLabelText( labelText ), mImageFileName( bitmapFileName ), @@ -292,10 +291,11 @@ wxNewBitmapButton::wxNewBitmapButton( const wxString& bitmapFileName, mpDisabledImg ( NULL ), mpFocusedImg ( NULL ), - mDragStarted ( FALSE ), - mIsPressed ( FALSE ), - mIsInFocus ( FALSE ), - mHasFocusedBmp( FALSE ), + mDragStarted ( false ), + mIsPressed ( false ), + mIsInFocus ( false ), + mIsToggled ( false ), + mHasFocusedBmp( false ), mFiredEventType( wxEVT_COMMAND_MENU_SELECTED ), mBlackPen( wxColour( 0, 0, 0), 1, wxSOLID ), @@ -303,13 +303,13 @@ wxNewBitmapButton::wxNewBitmapButton( const wxString& bitmapFileName, mGrayPen ( wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE), 1, wxSOLID ), mLightPen( wxSystemSettings::GetColour(wxSYS_COLOUR_3DHIGHLIGHT), 1, wxSOLID ), - mIsCreated( FALSE ), - mSizeIsSet( FALSE ) + mIsCreated( false ), + mSizeIsSet( false ) { } -wxNewBitmapButton::~wxNewBitmapButton(void) +wxNewBitmapButton::~wxNewBitmapButton(void) { DestroyLabels(); } @@ -320,20 +320,21 @@ void wxNewBitmapButton::DrawShade( int outerLevel, wxPen& lowerRightSidePen ) { wxBitmap* pBmp = GetStateLabel(); - - int x = mMarginX - (outerLevel + 1); - int y = mMarginY - (outerLevel + 1); - - int height = pBmp->GetHeight() + (outerLevel + 1)*2 - 1; - int width = pBmp->GetWidth() + (outerLevel + 1)*2 - 1; - + int x = mMarginX - (outerLevel + 2); + int y = mMarginY - (outerLevel + 2); + int height = pBmp->GetHeight() + (outerLevel + 2)*2 - 1; + int width = pBmp->GetWidth() + (outerLevel + 2)*2 - 1; dc.SetPen( upperLeftSidePen ); dc.DrawLine( x,y, x + width, y ); dc.DrawLine( x,y, x, y + height ); + dc.DrawLine( x,y+1, x + width , y +1 ); // top + dc.DrawLine( x+1,y, x+1, y + height ); // left dc.SetPen( lowerRightSidePen ); dc.DrawLine( x + width, y, x + width, y + height + 1 ); dc.DrawLine( x, y + height, x + width, y + height ); + dc.DrawLine( x + width-1, y+1, x + width-1, y + height +1 ); // right + dc.DrawLine( x +1, y + height-1, x + width, y + height-1 ); // bottom } void wxNewBitmapButton::DestroyLabels() @@ -375,11 +376,16 @@ wxBitmap* wxNewBitmapButton::GetStateLabel() return mpDisabledImg; } +#ifndef __WXMSW__ + static const unsigned char _gDisableImage[] = { 0x55,0xAA,0x55,0xAA, 0x55,0xAA,0x55,0xAA, 0x55,0xAA,0x55,0xAA, 0x55,0xAA,0x55,0xAA }; + +#endif + void wxNewBitmapButton::RenderLabelImage( wxBitmap*& destBmp, wxBitmap* srcBmp, bool isEnabled, bool isPressed ) { @@ -410,7 +416,7 @@ void wxNewBitmapButton::RenderLabelImage( wxBitmap*& destBmp, wxBitmap* srcBmp, { destDim.x = srcBmp->GetWidth() + 2*mTextToLabelGap + txtWidth; - destDim.y = + destDim.y = wxMax( srcBmp->GetHeight(), txtHeight ); txtPos.x = srcBmp->GetWidth() + mTextToLabelGap; @@ -421,7 +427,7 @@ void wxNewBitmapButton::RenderLabelImage( wxBitmap*& destBmp, wxBitmap* srcBmp, else if ( mTextAlignment == NB_ALIGN_TEXT_BOTTOM ) { - destDim.x = + destDim.x = wxMax( srcBmp->GetWidth(), txtWidth ); destDim.y = srcBmp->GetHeight() + mTextToLabelGap + txtHeight; @@ -431,7 +437,7 @@ void wxNewBitmapButton::RenderLabelImage( wxBitmap*& destBmp, wxBitmap* srcBmp, imgPos.x = (destDim.x - srcBmp->GetWidth())/2; imgPos.y = 0; } - else + else { wxFAIL_MSG(wxT("Unsupported FL alignment type detected in wxNewBitmapButton::RenderLabelImage()")); } @@ -450,11 +456,9 @@ void wxNewBitmapButton::RenderLabelImage( wxBitmap*& destBmp, wxBitmap* srcBmp, destDc.SelectObject( *destBmp ); wxBrush grayBrush( wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE), wxSOLID ); - wxPen nullPen( wxColour(0,0,0), 1, wxTRANSPARENT ); destDc.SetBrush( grayBrush ); - destDc.SetPen( nullPen ); - + destDc.SetPen( *wxTRANSPARENT_PEN ); destDc.DrawRectangle( 0,0, destDim.x+1, destDim.y+1 ); if ( isPressed ) @@ -466,10 +470,10 @@ void wxNewBitmapButton::RenderLabelImage( wxBitmap*& destBmp, wxBitmap* srcBmp, if ( hasImage ) { - destDc.Blit( imgPos.x, imgPos.y, - srcBmp->GetWidth()+1, - srcBmp->GetHeight()+1, - &srcDc, 0,0, wxCOPY,TRUE ); + destDc.Blit( imgPos.x, imgPos.y, + srcBmp->GetWidth(), + srcBmp->GetHeight(), + &srcDc, 0,0, wxCOPY,true ); } if ( hasText ) @@ -502,11 +506,12 @@ void wxNewBitmapButton::RenderLabelImage( wxBitmap*& destBmp, wxBitmap* srcBmp, } if ( !isEnabled ){ - + #ifdef __WXMSW__ // This is currently MSW specific gray_out_image_on_dc( destDc, destDim.x, destDim.y ); #else - wxBrush checkerBrush( wxBitmap( (const char*)_gDisableImage,8,8) ); + wxBitmap bmp( (const char*)_gDisableImage,8,8); + wxBrush checkerBrush(bmp); checkerBrush.SetColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) ); destDc.SetBrush( checkerBrush ); destDc.DrawRectangle( imgPos.x, imgPos.y, srcBmp->GetWidth()+1, srcBmp->GetHeight()+1); @@ -515,33 +520,33 @@ void wxNewBitmapButton::RenderLabelImage( wxBitmap*& destBmp, wxBitmap* srcBmp, // adjust button size to fit the new dimensions of the label if ( !mSizeIsSet && 0 ) { - mSizeIsSet = TRUE; - SetSize( -1,-1, + mSizeIsSet = true; + SetSize( wxDefaultCoord, wxDefaultCoord, destBmp->GetWidth() + mMarginX*2, - destBmp->GetHeight() + mMarginY*2, 0 + destBmp->GetHeight() + mMarginY*2, 0 ); } destDc.SelectObject( wxNullBitmap ); - + #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) // Map to system colours (void) wxToolBar::MapBitmap(destBmp->GetHBITMAP(), destBmp->GetWidth(), destBmp->GetHeight()); -#endif +#endif } void wxNewBitmapButton::RenderAllLabelImages() { if ( !mIsCreated ) return; - RenderLabelImage( mpDisabledImg, &mDepressedBmp, FALSE ); - RenderLabelImage( mpPressedImg, &mDepressedBmp, TRUE, TRUE ); - RenderLabelImage( mpDepressedImg, &mDepressedBmp, TRUE, FALSE ); + RenderLabelImage( mpDisabledImg, &mDepressedBmp, false ); + RenderLabelImage( mpPressedImg, &mDepressedBmp, true, true ); + RenderLabelImage( mpDepressedImg, &mDepressedBmp, true, false ); if ( mHasFocusedBmp ) { - RenderLabelImage( mpFocusedImg, &mFocusedBmp, TRUE, FALSE ); + RenderLabelImage( mpFocusedImg, &mFocusedBmp, true, false ); } } - + void wxNewBitmapButton::RenderLabelImages() { @@ -550,25 +555,38 @@ void wxNewBitmapButton::RenderLabelImages() if ( !IsEnabled() ) { - RenderLabelImage( mpDisabledImg, &mDepressedBmp, FALSE ); + RenderLabelImage( mpDisabledImg, &mDepressedBmp, false ); } else - if ( mIsPressed ) + if ( mIsPressed ) - RenderLabelImage( mpPressedImg, &mDepressedBmp, TRUE, TRUE ); + RenderLabelImage( mpPressedImg, &mDepressedBmp, true, true ); else { if ( mIsInFocus ) { if ( mHasFocusedBmp ) - RenderLabelImage( mpFocusedImg, &mFocusedBmp, TRUE, FALSE ); + RenderLabelImage( mpFocusedImg, &mFocusedBmp, true, false ); else - RenderLabelImage( mpDepressedImg, &mDepressedBmp, TRUE, FALSE ); + RenderLabelImage( mpDepressedImg, &mDepressedBmp, true, false ); } else - RenderLabelImage( mpDepressedImg, &mDepressedBmp, TRUE, FALSE ); + RenderLabelImage( mpDepressedImg, &mDepressedBmp, true, false ); + } +} + +bool wxNewBitmapButton::Toggle(bool enable) +{ + if ( mIsToggled == enable ) + { + return false; } + + mIsToggled = enable; + Refresh(); + + return true; } bool wxNewBitmapButton::Enable(bool enable) @@ -577,12 +595,12 @@ bool wxNewBitmapButton::Enable(bool enable) { if ( mIsInFocus ) { - mIsInFocus = FALSE; + mIsInFocus = false; } if ( mIsPressed ) { - mIsPressed = FALSE; + mIsPressed = false; } Refresh(); @@ -596,8 +614,11 @@ void wxNewBitmapButton::DrawDecorations( wxDC& dc ) if ( mIsFlat ) { DrawShade( 1, dc, mGrayPen, mGrayPen ); - - if ( mIsInFocus ) + if ( mIsToggled ) + { + DrawShade( 0, dc, mDarkPen, mLightPen ); + } + else if ( mIsInFocus ) { if ( mIsPressed ) DrawShade( 0, dc, mDarkPen, mLightPen ); @@ -609,7 +630,7 @@ void wxNewBitmapButton::DrawDecorations( wxDC& dc ) } else { - if ( mIsPressed ) + if ( mIsPressed || mIsToggled ) { DrawShade( 0, dc, mDarkPen, mGrayPen ); DrawShade( 1, dc, mBlackPen, mLightPen ); @@ -622,7 +643,7 @@ void wxNewBitmapButton::DrawDecorations( wxDC& dc ) } } -void wxNewBitmapButton::SetLabel(const wxBitmap& labelBitmap, +void wxNewBitmapButton::SetLabel(const wxBitmap& labelBitmap, const wxString& labelText ) { DestroyLabels(); @@ -654,8 +675,8 @@ void wxNewBitmapButton::SetAlignments( int alignText, void wxNewBitmapButton::OnLButtonDown( wxMouseEvent& WXUNUSED(event) ) { - mDragStarted = TRUE; - mIsPressed = TRUE; + mDragStarted = true; + mIsPressed = true; Refresh(); } @@ -664,11 +685,11 @@ void wxNewBitmapButton::OnLButtonUp( wxMouseEvent& event ) if ( !mDragStarted ) return; - mDragStarted = FALSE; - mIsPressed = FALSE; + mDragStarted = false; + mIsPressed = false; Refresh(); - if ( IsInWindow( event.m_x, event.m_y ) ) + if ( IsInWindow( event.m_x, event.m_y ) ) { // fire event, if mouse was released // within the bounds of button @@ -693,7 +714,7 @@ void wxNewBitmapButton::OnMouseEnter( wxMouseEvent& WXUNUSED(event) ) if ( !mIsInFocus ) { - mIsInFocus = TRUE; + mIsInFocus = true; } if ( prevIsInFocus != mIsInFocus ) { @@ -707,8 +728,8 @@ void wxNewBitmapButton::OnMouseLeave( wxMouseEvent& WXUNUSED(event) ) bool prevIsPressed = mIsPressed; if ( mIsInFocus ) { - mIsInFocus = FALSE; - mIsPressed = FALSE; + mIsInFocus = false; + mIsPressed = false; } if ( prevIsInFocus != mIsInFocus || prevIsPressed != mIsPressed ) { @@ -722,16 +743,16 @@ void wxNewBitmapButton::OnSize( wxSizeEvent& WXUNUSED(event) ) } void wxNewBitmapButton::Reshape( ) -{ +{ bool wasCreated = mIsCreated; - mIsCreated = TRUE; + mIsCreated = true; if ( !wasCreated ) { // in the case of loading button from stream, check if we - // have non-empty image-file name, load if possible + // have non-empty image-file name, load if possible - if ( mImageFileName != wxT("") ) + if (!mImageFileName.empty()) { mDepressedBmp.LoadFile( mImageFileName, mImageFileType ); @@ -766,10 +787,10 @@ void wxNewBitmapButton::DrawLabel( wxDC& dc ) wxMemoryDC mdc; mdc.SelectObject( *pCurBmp ); - dc.Blit( mMarginX, mMarginY, + dc.Blit( mMarginX, mMarginY, pCurBmp->GetWidth(), pCurBmp->GetHeight(), - &mdc, 0,0, wxCOPY + &mdc, 0,0, wxCOPY ); mdc.SelectObject( wxNullBitmap ); @@ -799,3 +820,32 @@ void wxNewBitmapButton::OnKillFocus( wxFocusEvent& WXUNUSED(event) ) wxMessageBox(wxT("kill-focus for button!")); } +// ---------------------------------------------------------------------------- +// UI updates +// ---------------------------------------------------------------------------- + +void wxNewBitmapButton::OnIdle(wxIdleEvent& event) +{ + DoButtonUpdate(); + + event.Skip(); +} + +// Do the toolbar button updates (check for EVT_UPDATE_UI handlers) +void wxNewBitmapButton::DoButtonUpdate() +{ + wxUpdateUIEvent event(GetId()); + event.SetEventObject(this); + + if ( GetParent()->ProcessEvent(event) ) + { + if ( event.GetSetEnabled() ) + { + bool enabled = event.GetEnabled(); + if ( enabled != IsEnabled() ) + Enable( enabled ); + } + if ( event.GetSetChecked() ) + Toggle( event.GetChecked() ); + } +}