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 )
{
}
{
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 );
{
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
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 );
-
+
#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()
{
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 ) )
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
- if ( mImageFileName != "" )
+ if ( mImageFileName != wxT("") )
{
mDepressedBmp.LoadFile( mImageFileName, mImageFileType );
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!"));
}
+// ----------------------------------------------------------------------------
+// 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() );
+ }
+}
projects / wxWidgets.git / blobdiff