#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 ) && \
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 )
// 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;
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;
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,
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 ),
mGrayPen ( wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE), 1, wxSOLID ),
mLightPen( wxSystemSettings::GetColour(wxSYS_COLOUR_3DHIGHLIGHT), 1, wxSOLID ),
- mIsCreated( FALSE ),
- mSizeIsSet( FALSE )
+ mIsCreated( false ),
+ mSizeIsSet( false )
{
}
const wxString& labelText,
int alignText,
bool isFlat,
- int firedEventType,
- int marginX,
- int marginY,
- int textToLabelGap,
- bool isSticky)
+ int WXUNUSED(firedEventType),
+ int WXUNUSED(marginX),
+ int WXUNUSED(marginY),
+ int WXUNUSED(textToLabelGap),
+ bool WXUNUSED(isSticky))
: mTextToLabelGap ( 2 ),
mMarginX( 2 ),
mMarginY( 2 ),
mTextAlignment( alignText ),
- mIsSticky( FALSE ),
+ mIsSticky( false ),
mIsFlat( isFlat ),
mLabelText( labelText ),
mImageFileName( 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 ),
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();
}
{
wxBitmap* pBmp = GetStateLabel();
- int x = mMarginX - (outerLevel + 1);
- int y = mMarginY - (outerLevel + 1);
+ int x = mMarginX - (outerLevel + 2);
+ int y = mMarginY - (outerLevel + 2);
- int height = pBmp->GetHeight() + (outerLevel + 1)*2 - 1;
- int width = pBmp->GetWidth() + (outerLevel + 1)*2 - 1;
+ 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 );
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 )
{
{
destDim.x = srcBmp->GetWidth() + 2*mTextToLabelGap + txtWidth;
- destDim.y =
+ destDim.y =
wxMax( srcBmp->GetHeight(), txtHeight );
txtPos.x = srcBmp->GetWidth() + mTextToLabelGap;
else
if ( mTextAlignment == NB_ALIGN_TEXT_BOTTOM )
{
- destDim.x =
+ destDim.x =
wxMax( srcBmp->GetWidth(), txtWidth );
destDim.y = srcBmp->GetHeight() + mTextToLabelGap + txtHeight;
imgPos.x = (destDim.x - srcBmp->GetWidth())/2;
imgPos.y = 0;
}
- else
+ else
{
- wxFAIL_MSG("Unsupported FL alignment type detected in wxNewBitmapButton::RenderLabelImage()");
+ wxFAIL_MSG(wxT("Unsupported FL alignment type detected in wxNewBitmapButton::RenderLabelImage()"));
}
}
else
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 )
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 )
}
if ( !isEnabled ){
-
+
#ifdef __WXMSW__ // This is currently MSW specific
gray_out_image_on_dc( destDc, destDim.x, destDim.y );
#else
// 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 );
-
-#ifdef __WXMSW__
+
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
// Map to system colours
- (void) MapBitmap(destBmp->GetHBITMAP(), destBmp->GetWidth(), destBmp->GetHeight());
-#endif
+ (void) wxToolBar::MapBitmap(destBmp->GetHBITMAP(), destBmp->GetWidth(), destBmp->GetHeight());
+#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()
{
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)
{
if ( mIsInFocus )
{
- mIsInFocus = FALSE;
+ mIsInFocus = false;
}
if ( mIsPressed )
{
- mIsPressed = FALSE;
+ mIsPressed = false;
}
Refresh();
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 );
}
else
{
- if ( mIsPressed )
+ if ( mIsPressed || mIsToggled )
{
DrawShade( 0, dc, mDarkPen, mGrayPen );
DrawShade( 1, dc, mBlackPen, mLightPen );
}
}
-void wxNewBitmapButton::SetLabel(const wxBitmap& labelBitmap,
+void wxNewBitmapButton::SetLabel(const wxBitmap& labelBitmap,
const wxString& labelText )
{
DestroyLabels();
// event handlers
-void wxNewBitmapButton::OnLButtonDown( wxMouseEvent& event )
+void wxNewBitmapButton::OnLButtonDown( wxMouseEvent& WXUNUSED(event) )
{
- mDragStarted = TRUE;
- mIsPressed = TRUE;
+ mDragStarted = true;
+ mIsPressed = true;
Refresh();
}
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
y < height );
}
-void wxNewBitmapButton::OnMouseEnter( wxMouseEvent& event )
+void wxNewBitmapButton::OnMouseEnter( wxMouseEvent& WXUNUSED(event) )
{
bool prevIsInFocus = mIsInFocus;
if ( !mIsInFocus )
{
- mIsInFocus = TRUE;
+ mIsInFocus = true;
}
if ( prevIsInFocus != mIsInFocus )
{
}
}
-void wxNewBitmapButton::OnMouseLeave( wxMouseEvent& event )
+void wxNewBitmapButton::OnMouseLeave( wxMouseEvent& WXUNUSED(event) )
{
bool prevIsInFocus = mIsInFocus;
bool prevIsPressed = mIsPressed;
if ( mIsInFocus )
{
- mIsInFocus = FALSE;
- mIsPressed = FALSE;
+ mIsInFocus = false;
+ mIsPressed = false;
}
if ( prevIsInFocus != mIsInFocus || prevIsPressed != mIsPressed )
{
}
}
-void wxNewBitmapButton::OnSize( wxSizeEvent& event )
+void wxNewBitmapButton::OnSize( wxSizeEvent& WXUNUSED(event) )
{
//Reshape();
}
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 != "" )
+ if (!mImageFileName.empty())
{
mDepressedBmp.LoadFile( mImageFileName, mImageFileType );
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 );
}
-void wxNewBitmapButton::OnPaint( wxPaintEvent& event )
+void wxNewBitmapButton::OnPaint( wxPaintEvent& WXUNUSED(event) )
{
wxPaintDC dc(this);
DrawDecorations( dc );
}
-void wxNewBitmapButton::OnEraseBackground( wxEraseEvent& event )
+void wxNewBitmapButton::OnEraseBackground( wxEraseEvent& WXUNUSED(event) )
{
// do nothing
}
-void wxNewBitmapButton::OnKillFocus( wxFocusEvent& event )
+void wxNewBitmapButton::OnKillFocus( wxFocusEvent& WXUNUSED(event) )
{
// useless
- wxMessageBox("kill-focus for button!");
+ wxMessageBox(wxT("kill-focus for button!"));
}
-#ifdef __WXMSW__
-WXHBITMAP wxNewBitmapButton::MapBitmap(WXHBITMAP bitmap, int width, int height)
-{
- MemoryHDC hdcMem;
-
- if ( !hdcMem )
- {
- wxLogLastError(_T("CreateCompatibleDC"));
-
- return bitmap;
- }
-
- SelectInHDC bmpInHDC(hdcMem, (HBITMAP)bitmap);
+// ----------------------------------------------------------------------------
+// UI updates
+// ----------------------------------------------------------------------------
- if ( !bmpInHDC )
- {
- wxLogLastError(_T("SelectObject"));
+void wxNewBitmapButton::OnIdle(wxIdleEvent& event)
+{
+ DoButtonUpdate();
- return bitmap;
- }
+ event.Skip();
+}
- wxCOLORMAP *cmap = wxGetStdColourMap();
+// Do the toolbar button updates (check for EVT_UPDATE_UI handlers)
+void wxNewBitmapButton::DoButtonUpdate()
+{
+ wxUpdateUIEvent event(GetId());
+ event.SetEventObject(this);
- for ( int i = 0; i < width; i++ )
+ if ( GetParent()->ProcessEvent(event) )
{
- for ( int j = 0; j < height; j++ )
+ if ( event.GetSetEnabled() )
{
- COLORREF pixel = ::GetPixel(hdcMem, i, j);
-
- for ( size_t k = 0; k < wxSTD_COL_MAX; k++ )
- {
- COLORREF col = cmap[k].from;
- if ( abs(GetRValue(pixel) - GetRValue(col)) < 10 &&
- abs(GetGValue(pixel) - GetGValue(col)) < 10 &&
- abs(GetBValue(pixel) - GetBValue(col)) < 10 )
- {
- ::SetPixel(hdcMem, i, j, cmap[k].to);
- break;
- }
- }
+ bool enabled = event.GetEnabled();
+ if ( enabled != IsEnabled() )
+ Enable( enabled );
}
+ if ( event.GetSetChecked() )
+ Toggle( event.GetChecked() );
}
-
- return bitmap;
}
-#endif
projects / wxWidgets.git / blobdiff