EVT_LEFT_DOWN ( wxNewBitmapButton::OnLButtonDown )
EVT_LEFT_UP ( wxNewBitmapButton::OnLButtonUp )
- EVT_LEFT_DCLICK ( wxNewBitmapButton::OnLButtonDClick )
+// EVT_LEFT_DCLICK ( wxNewBitmapButton::OnLButtonDClick )
+ EVT_LEFT_DCLICK ( wxNewBitmapButton::OnLButtonDown )
EVT_ENTER_WINDOW( wxNewBitmapButton::OnMouseEnter )
EVT_LEAVE_WINDOW( wxNewBitmapButton::OnMouseLeave )
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 ),
+ mDragStarted ( FALSE ),
+ mIsPressed ( FALSE ),
+ mIsInFocus ( FALSE ),
+ mIsToggled ( FALSE ),
mHasFocusedBmp( FALSE ),
mFiredEventType( firedEventType ),
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 ),
mpDisabledImg ( NULL ),
mpFocusedImg ( NULL ),
- mDragStarted ( FALSE ),
- mIsPressed ( FALSE ),
- mIsInFocus ( FALSE ),
+ mDragStarted ( FALSE ),
+ mIsPressed ( FALSE ),
+ mIsInFocus ( FALSE ),
+ mIsToggled ( FALSE ),
mHasFocusedBmp( FALSE ),
mFiredEventType( wxEVT_COMMAND_MENU_SELECTED ),
{
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,
+ destDc.Blit( imgPos.x, imgPos.y,
srcBmp->GetWidth()+1,
srcBmp->GetHeight()+1,
&srcDc, 0,0, wxCOPY,TRUE );
}
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( -1,-1,
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()
RenderLabelImage( mpFocusedImg, &mFocusedBmp, TRUE, FALSE );
}
}
-
+
void wxNewBitmapButton::RenderLabelImages()
{
}
else
- if ( mIsPressed )
+ if ( mIsPressed )
RenderLabelImage( mpPressedImg, &mDepressedBmp, TRUE, TRUE );
else
}
}
+bool wxNewBitmapButton::Toggle(bool enable)
+{
+ if ( mIsToggled == enable )
+ {
+ return FALSE;
+ }
+
+ mIsToggled = enable;
+ Refresh();
+
+ return TRUE;
+}
+
bool wxNewBitmapButton::Enable(bool enable)
{
if ( enable != m_isEnabled )
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;
}
}
-void wxNewBitmapButton::OnLButtonDClick( wxMouseEvent& event )
-{
- if ( IsInWindow( event.m_x, event.m_y ) )
- {
- // fire event, if mouse was released
- // within the bounds of button
- wxCommandEvent cmd( mFiredEventType, GetId() );
- GetParent()->ProcessEvent( cmd );
-
- mDragStarted = FALSE;
- mIsPressed = FALSE;
- Refresh();
- }
-}
-
bool wxNewBitmapButton::IsInWindow( int x, int y )
{
int width, height;
y < height );
}
-void wxNewBitmapButton::OnMouseEnter( wxMouseEvent& event )
+void wxNewBitmapButton::OnMouseEnter( wxMouseEvent& WXUNUSED(event) )
{
bool prevIsInFocus = mIsInFocus;
}
}
-void wxNewBitmapButton::OnMouseLeave( wxMouseEvent& event )
+void wxNewBitmapButton::OnMouseLeave( wxMouseEvent& WXUNUSED(event) )
{
bool prevIsInFocus = mIsInFocus;
bool prevIsPressed = mIsPressed;
}
}
-void wxNewBitmapButton::OnSize( wxSizeEvent& event )
+void wxNewBitmapButton::OnSize( wxSizeEvent& WXUNUSED(event) )
{
//Reshape();
}
// 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!"));
}
-#ifdef __WXMSW__
-WXHBITMAP wxNewBitmapButton::MapBitmap(WXHBITMAP bitmap, int width, int height)
-{
- MemoryHDC hdcMem;
-
- if ( !hdcMem )
- {
- wxLogLastError(_T("CreateCompatibleDC"));
-
- return bitmap;
- }
+// ----------------------------------------------------------------------------
+// UI updates
+// ----------------------------------------------------------------------------
- SelectInHDC bmpInHDC(hdcMem, (HBITMAP)bitmap);
-
- 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