/////////////////////////////////////////////////////////////////////////////
-// Name: bmpbuttn.cpp
+// Name: src/msw/bmpbuttn.cpp
// Purpose: wxBitmapButton
// Author: Julian Smart
// Modified by:
// Created: 04/01/98
// RCS-ID: $Id$
-// Copyright: (c) Julian Smart and Markus Holzem
-// Licence: wxWindows license
+// Copyright: (c) Julian Smart
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "bmpbuttn.h"
#endif
#include "wx/wxprec.h"
#ifdef __BORLANDC__
-#pragma hdrstop
+ #pragma hdrstop
#endif
+#if wxUSE_BMPBUTTON
+
#ifndef WX_PRECOMP
-#include "wx/bmpbuttn.h"
+ #include "wx/bmpbuttn.h"
+ #include "wx/log.h"
+ #include "wx/dcmemory.h"
#endif
#include "wx/msw/private.h"
-#if !USE_SHARED_LIBRARY
+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------
+
+#if wxUSE_EXTENDED_RTTI
+
+WX_DEFINE_FLAGS( wxBitmapButtonStyle )
+
+wxBEGIN_FLAGS( wxBitmapButtonStyle )
+ // new style border flags, we put them first to
+ // use them for streaming out
+ wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+ wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+ wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+ wxFLAGS_MEMBER(wxBORDER_RAISED)
+ wxFLAGS_MEMBER(wxBORDER_STATIC)
+ wxFLAGS_MEMBER(wxBORDER_NONE)
+
+ // old style border flags
+ wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+ wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+ wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+ wxFLAGS_MEMBER(wxRAISED_BORDER)
+ wxFLAGS_MEMBER(wxSTATIC_BORDER)
+ wxFLAGS_MEMBER(wxBORDER)
+
+ // standard window styles
+ wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+ wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+ wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+ wxFLAGS_MEMBER(wxWANTS_CHARS)
+ wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+ wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+ wxFLAGS_MEMBER(wxVSCROLL)
+ wxFLAGS_MEMBER(wxHSCROLL)
+
+ wxFLAGS_MEMBER(wxBU_AUTODRAW)
+ wxFLAGS_MEMBER(wxBU_LEFT)
+ wxFLAGS_MEMBER(wxBU_RIGHT)
+ wxFLAGS_MEMBER(wxBU_TOP)
+ wxFLAGS_MEMBER(wxBU_BOTTOM)
+wxEND_FLAGS( wxBitmapButtonStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxBitmapButton, wxButton,"wx/bmpbuttn.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxBitmapButton)
+ wxPROPERTY_FLAGS( WindowStyle , wxBitmapButtonStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxBitmapButton)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_5( wxBitmapButton , wxWindow* , Parent , wxWindowID , Id , wxBitmap , Bitmap , wxPoint , Position , wxSize , Size )
+
+#else
IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
#endif
-#define BUTTON_HEIGHT_FACTOR (EDIT_CONTROL_FACTOR * 1.1)
-
-bool wxBitmapButton::Create(wxWindow *parent, const wxWindowID id, const wxBitmap& bitmap,
- const wxPoint& pos,
- const wxSize& size, const long style,
- const wxValidator& validator,
- const wxString& name)
-{
- m_buttonBitmap = bitmap;
- SetName(name);
- SetValidator(validator);
-
- parent->AddChild(this);
+/*
+TODO PROPERTIES :
- m_backgroundColour = parent->GetDefaultBackgroundColour() ;
- m_foregroundColour = parent->GetDefaultForegroundColour() ;
- m_windowStyle = style;
- m_marginX = 0;
- m_marginY = 0;
+long "style" , wxBU_AUTODRAW
+bool "default" , 0
+bitmap "selected" ,
+bitmap "focus" ,
+bitmap "disabled" ,
+*/
- if ( style & wxBU_AUTODRAW )
- {
- m_marginX = wxDEFAULT_BUTTON_MARGIN;
- m_marginY = wxDEFAULT_BUTTON_MARGIN;
- }
-
- int x = pos.x;
- int y = pos.y;
- int width = size.x;
- int height = size.y;
-
- if (id == -1)
- m_windowId = NewControlId();
- else
- m_windowId = id;
-
- if ( width == -1 && bitmap.Ok())
- width = bitmap.GetWidth() + 2*m_marginX;
-
- if ( height == -1 && bitmap.Ok())
- height = bitmap.GetHeight() + 2*m_marginY;
+#define BUTTON_HEIGHT_FACTOR (EDIT_CONTROL_FACTOR * 1.1)
- HWND wx_button =
- CreateWindowEx(0, "BUTTON", "", BS_OWNERDRAW | WS_TABSTOP | WS_CHILD,
- 0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
- wxGetInstance(), NULL);
+bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id,
+ const wxBitmap& bitmap,
+ const wxPoint& pos,
+ const wxSize& size, long style,
+ const wxValidator& wxVALIDATOR_PARAM(validator),
+ const wxString& name)
+{
+ m_bmpNormal = bitmap;
+ SetName(name);
+
+#if wxUSE_VALIDATORS
+ SetValidator(validator);
+#endif // wxUSE_VALIDATORS
+
+ parent->AddChild(this);
+
+ m_backgroundColour = parent->GetBackgroundColour();
+ m_foregroundColour = parent->GetForegroundColour();
+ m_windowStyle = style;
+
+ if ( style & wxBU_AUTODRAW )
+ {
+ m_marginX = wxDEFAULT_BUTTON_MARGIN;
+ m_marginY = wxDEFAULT_BUTTON_MARGIN;
+ }
+
+ int x = pos.x;
+ int y = pos.y;
+ int width = size.x;
+ int height = size.y;
+
+ if (id == -1)
+ m_windowId = NewControlId();
+ else
+ m_windowId = id;
+
+ if ( width == -1 && bitmap.Ok())
+ width = bitmap.GetWidth() + 2*m_marginX;
+
+ if ( height == -1 && bitmap.Ok())
+ height = bitmap.GetHeight() + 2*m_marginY;
+
+ long msStyle = WS_VISIBLE | WS_TABSTOP | WS_CHILD | BS_OWNERDRAW ;
+
+ if ( m_windowStyle & wxCLIP_SIBLINGS )
+ msStyle |= WS_CLIPSIBLINGS;
+
+#ifdef __WIN32__
+ if(m_windowStyle & wxBU_LEFT)
+ msStyle |= BS_LEFT;
+ if(m_windowStyle & wxBU_RIGHT)
+ msStyle |= BS_RIGHT;
+ if(m_windowStyle & wxBU_TOP)
+ msStyle |= BS_TOP;
+ if(m_windowStyle & wxBU_BOTTOM)
+ msStyle |= BS_BOTTOM;
+#endif
- m_hWnd = (WXHWND)wx_button;
+ m_hWnd = (WXHWND) CreateWindowEx(
+ 0,
+ wxT("BUTTON"),
+ wxEmptyString,
+ msStyle,
+ 0, 0, 0, 0,
+ GetWinHwnd(parent),
+ (HMENU)m_windowId,
+ wxGetInstance(),
+ NULL
+ );
- // Subclass again for purposes of dialog editing mode
- SubclassWin((WXHWND)wx_button);
+ // Subclass again for purposes of dialog editing mode
+ SubclassWin(m_hWnd);
- // TODO? If in future we have a facility for having a label as well
- // as a bitmap, set the font.
-// SetFont(parent->GetFont()) ;
+ SetFont(parent->GetFont());
- SetSize(x, y, width, height);
- ShowWindow(wx_button, SW_SHOW);
+ SetSize(x, y, width, height);
- return TRUE;
+ return true;
}
-void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
-{
- m_buttonBitmap = bitmap;
-}
+// VZ: should be at the very least less than wxDEFAULT_BUTTON_MARGIN
+#define FOCUS_MARGIN 3
bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
{
- long style = GetWindowLong((HWND) GetHWND(), GWL_STYLE);
-#if defined(__WIN95__)
- if (style & BS_BITMAP)
- {
- // Should we call Default() here?
-// Default();
-
- // Let default procedure draw the bitmap, which is defined
- // in the Windows resource.
- return FALSE;
- }
+#ifndef __WXWINCE__
+ long style = GetWindowLong((HWND) GetHWND(), GWL_STYLE);
+ if (style & BS_BITMAP)
+ {
+ // Let default procedure draw the bitmap, which is defined
+ // in the Windows resource.
+ return false;
+ }
#endif
LPDRAWITEMSTRUCT lpDIS = (LPDRAWITEMSTRUCT) item;
+ HDC hDC = lpDIS->hDC;
+ UINT state = lpDIS->itemState;
+ bool isSelected = (state & ODS_SELECTED) != 0;
+ bool autoDraw = (GetWindowStyleFlag() & wxBU_AUTODRAW) != 0;
+
+
+ // choose the bitmap to use depending on the button state
+ wxBitmap* bitmap;
+
+ if ( isSelected && m_bmpSelected.Ok() )
+ bitmap = &m_bmpSelected;
+ else if ((state & ODS_FOCUS) && m_bmpFocus.Ok())
+ bitmap = &m_bmpFocus;
+ else if ((state & ODS_DISABLED) && m_bmpDisabled.Ok())
+ bitmap = &m_bmpDisabled;
+ else
+ bitmap = &m_bmpNormal;
+
+ if ( !bitmap->Ok() )
+ return false;
+
+ // centre the bitmap in the control area
+ int x = lpDIS->rcItem.left;
+ int y = lpDIS->rcItem.top;
+ int width = lpDIS->rcItem.right - x;
+ int height = lpDIS->rcItem.bottom - y;
+ int wBmp = bitmap->GetWidth();
+ int hBmp = bitmap->GetHeight();
+
+ int x1,y1;
+
+ if(m_windowStyle & wxBU_LEFT)
+ x1 = x + (FOCUS_MARGIN+1);
+ else if(m_windowStyle & wxBU_RIGHT)
+ x1 = x + (width - wBmp) - (FOCUS_MARGIN+1);
+ else
+ x1 = x + (width - wBmp) / 2;
+
+ if(m_windowStyle & wxBU_TOP)
+ y1 = y + (FOCUS_MARGIN+1);
+ else if(m_windowStyle & wxBU_BOTTOM)
+ y1 = y + (height - hBmp) - (FOCUS_MARGIN+1);
+ else
+ y1 = y + (height - hBmp) / 2;
+
+ if ( isSelected && autoDraw )
+ {
+ x1++;
+ y1++;
+ }
+
+ // draw the face, if auto-drawing
+ if ( autoDraw )
+ {
+ DrawFace((WXHDC) hDC,
+ lpDIS->rcItem.left, lpDIS->rcItem.top,
+ lpDIS->rcItem.right, lpDIS->rcItem.bottom,
+ isSelected);
+ }
+
+ // draw the bitmap
+ wxDC dst;
+ dst.SetHDC((WXHDC) hDC, false);
+ dst.DrawBitmap(*bitmap, x1, y1, true);
+
+ // draw focus / disabled state, if auto-drawing
+ if ( (state & ODS_DISABLED) && autoDraw )
+ {
+ DrawButtonDisable((WXHDC) hDC,
+ lpDIS->rcItem.left, lpDIS->rcItem.top,
+ lpDIS->rcItem.right, lpDIS->rcItem.bottom,
+ true);
+ }
+ else if ( (state & ODS_FOCUS) && autoDraw )
+ {
+ DrawButtonFocus((WXHDC) hDC,
+ lpDIS->rcItem.left,
+ lpDIS->rcItem.top,
+ lpDIS->rcItem.right,
+ lpDIS->rcItem.bottom,
+ isSelected);
+ }
+
+ return true;
+}
- wxBitmap* bitmap = &m_buttonBitmap;
-
- UINT state = lpDIS->itemState;
- if ((state & ODS_SELECTED) && m_buttonBitmapSelected.Ok())
- bitmap = &m_buttonBitmapSelected;
- else if ((state & ODS_FOCUS) && m_buttonBitmapFocus.Ok())
- bitmap = &m_buttonBitmapFocus;
- else if ((state & ODS_DISABLED) && m_buttonBitmapDisabled.Ok())
- bitmap = &m_buttonBitmapDisabled;
-
- if ( !bitmap->Ok() )
- return FALSE;
-
- HDC hDC = lpDIS->hDC;
- HDC memDC = ::CreateCompatibleDC(hDC);
-
- HBITMAP old = ::SelectObject(memDC, (HBITMAP) bitmap->GetHBITMAP());
-
- if (!old)
- return FALSE;
-
- RECT rect = lpDIS->rcItem;
-
- int x = lpDIS->rcItem.left;
- int y = lpDIS->rcItem.top;
- int width = lpDIS->rcItem.right - x;
- int height = lpDIS->rcItem.bottom - y;
-
- // Draw the face, if auto-drawing
- if ( GetWindowStyleFlag() & wxBU_AUTODRAW )
- DrawFace((WXHDC) hDC, lpDIS->rcItem.left, lpDIS->rcItem.top, lpDIS->rcItem.right, lpDIS->rcItem.bottom,
- ((state & ODS_SELECTED) == ODS_SELECTED));
-
- // Centre the bitmap in the control area
- int x1 = (int) (x + ((width - bitmap->GetWidth()) / 2));
- int y1 = (int) (y + ((height - bitmap->GetHeight()) / 2));
-
- if ( (state & ODS_SELECTED) && (GetWindowStyleFlag() & wxBU_AUTODRAW) )
- {
- x1 ++;
- y1 ++;
- }
-
- ::BitBlt(hDC, x1, y1, bitmap->GetWidth(), bitmap->GetHeight(), memDC, 0, 0, SRCCOPY);
-
- if ( (state & ODS_DISABLED) && (GetWindowStyleFlag() & wxBU_AUTODRAW) )
- DrawButtonDisable( (WXHDC) hDC, lpDIS->rcItem.left, lpDIS->rcItem.top, lpDIS->rcItem.right, lpDIS->rcItem.bottom, TRUE ) ;
- else if ( (state & ODS_FOCUS) && (GetWindowStyleFlag() & wxBU_AUTODRAW) )
- DrawButtonFocus( (WXHDC) hDC, lpDIS->rcItem.left, lpDIS->rcItem.top, lpDIS->rcItem.right, lpDIS->rcItem.bottom, ((state & ODS_SELECTED) == ODS_SELECTED));
-
- ::SelectObject(memDC, old);
+// GRG Feb/2000, support for bmp buttons with Win95/98 standard LNF
- ::DeleteDC(memDC);
+#if defined(__WIN95__)
- return TRUE;
+void wxBitmapButton::DrawFace( WXHDC dc, int left, int top,
+ int right, int bottom, bool sel )
+{
+ HPEN oldp;
+ HPEN penHiLight;
+ HPEN penLight;
+ HPEN penShadow;
+ HPEN penDkShadow;
+ HBRUSH brushFace;
+
+ // create needed pens and brush
+ penHiLight = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_3DHILIGHT));
+ penLight = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_3DLIGHT));
+ penShadow = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_3DSHADOW));
+ penDkShadow = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_3DDKSHADOW));
+ // brushFace = CreateSolidBrush(GetSysColor(COLOR_BTNFACE));
+ // Taking the background colour fits in better with
+ // Windows XP themes.
+ brushFace = CreateSolidBrush(m_backgroundColour.m_pixel);
+
+ // draw the rectangle
+ RECT rect;
+ rect.left = left;
+ rect.right = right;
+ rect.top = top;
+ rect.bottom = bottom;
+ FillRect((HDC) dc, &rect, brushFace);
+
+ // draw the border
+ oldp = (HPEN) SelectObject( (HDC) dc, sel? penDkShadow : penHiLight);
+
+ wxDrawLine((HDC) dc, left, top, right-1, top);
+ wxDrawLine((HDC) dc, left, top+1, left, bottom-1);
+
+ SelectObject( (HDC) dc, sel? penShadow : penLight);
+ wxDrawLine((HDC) dc, left+1, top+1, right-2, top+1);
+ wxDrawLine((HDC) dc, left+1, top+2, left+1, bottom-2);
+
+ SelectObject( (HDC) dc, sel? penLight : penShadow);
+ wxDrawLine((HDC) dc, left+1, bottom-2, right-1, bottom-2);
+ wxDrawLine((HDC) dc, right-2, bottom-3, right-2, top);
+
+ SelectObject( (HDC) dc, sel? penHiLight : penDkShadow);
+ wxDrawLine((HDC) dc, left, bottom-1, right+2, bottom-1);
+ wxDrawLine((HDC) dc, right-1, bottom-2, right-1, top-1);
+
+ // delete allocated resources
+ SelectObject((HDC) dc,oldp);
+ DeleteObject(penHiLight);
+ DeleteObject(penLight);
+ DeleteObject(penShadow);
+ DeleteObject(penDkShadow);
+ DeleteObject(brushFace);
}
-void wxBitmapButton::DrawFace( WXHDC dc, int left, int top, int right, int bottom, bool sel )
+#else
+
+void wxBitmapButton::DrawFace( WXHDC dc, int left, int top,
+ int right, int bottom, bool sel )
{
- HPEN oldp;
- HBRUSH oldb ;
-
- HPEN penBorder;
- HPEN penLight;
- HPEN penShadow;
- HBRUSH brushFace;
- COLORREF ms_color;
-
- ms_color = GetSysColor(COLOR_WINDOWFRAME) ;
- penBorder = CreatePen(PS_SOLID,0,ms_color) ;
-
- ms_color = GetSysColor(COLOR_BTNSHADOW) ;
- penShadow = CreatePen(PS_SOLID,0,ms_color) ;
-
- ms_color = GetSysColor(COLOR_BTNHIGHLIGHT) ;
- penLight = CreatePen(PS_SOLID,0,ms_color) ;
-
- ms_color = GetSysColor(COLOR_BTNFACE) ;
- brushFace = CreateSolidBrush(ms_color) ;
-
- oldp = SelectObject( (HDC) dc, GetStockObject( NULL_PEN ) ) ;
- oldb = SelectObject( (HDC) dc, brushFace ) ;
- Rectangle( (HDC) dc, left, top, right, bottom ) ;
- SelectObject( (HDC) dc, penBorder) ;
- MoveToEx((HDC) dc,left+1,top,NULL);LineTo((HDC) dc,right-1,top);
- MoveToEx((HDC) dc,left,top+1,NULL);LineTo((HDC) dc,left,bottom-1);
- MoveToEx((HDC) dc,left+1,bottom-1,NULL);LineTo((HDC) dc,right-1,bottom-1);
- MoveToEx((HDC) dc,right-1,top+1,NULL);LineTo((HDC) dc,right-1,bottom-1);
-
- SelectObject( (HDC) dc, penShadow) ;
- if (sel)
- {
- MoveToEx((HDC) dc,left+1 ,bottom-2 ,NULL) ;
- LineTo((HDC) dc, left+1 ,top+1) ;
- LineTo((HDC) dc, right-2 ,top+1) ;
- }
- else
- {
- MoveToEx((HDC) dc,left+1 ,bottom-2 ,NULL) ;
- LineTo((HDC) dc, right-2 ,bottom-2) ;
- LineTo((HDC) dc, right-2 ,top) ;
- MoveToEx((HDC) dc,left+2 ,bottom-3 ,NULL) ;
- LineTo((HDC) dc, right-3 ,bottom-3) ;
- LineTo((HDC) dc, right-3 ,top+1) ;
-
- SelectObject( (HDC) dc, penLight) ;
-
- MoveToEx((HDC) dc,left+1 ,bottom-2 ,NULL) ;
- LineTo((HDC) dc, left+1 ,top+1) ;
- LineTo((HDC) dc, right-2 ,top+1) ;
- }
- SelectObject((HDC) dc,oldp) ;
- SelectObject((HDC) dc,oldb) ;
-
- DeleteObject(penBorder);
- DeleteObject(penLight);
- DeleteObject(penShadow);
- DeleteObject(brushFace);
+ HPEN oldp;
+ HPEN penBorder;
+ HPEN penLight;
+ HPEN penShadow;
+ HBRUSH brushFace;
+
+ // create needed pens and brush
+ penBorder = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_WINDOWFRAME));
+ penShadow = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_BTNSHADOW));
+ penLight = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_BTNHIGHLIGHT));
+ brushFace = CreateSolidBrush(COLOR_BTNFACE);
+
+ // draw the rectangle
+ RECT rect;
+ rect.left = left;
+ rect.right = right;
+ rect.top = top;
+ rect.bottom = bottom;
+ FillRect((HDC) dc, &rect, brushFace);
+
+ // draw the border
+ oldp = (HPEN) SelectObject( (HDC) dc, penBorder);
+ MoveToEx((HDC) dc,left+1,top,NULL);LineTo((HDC) dc,right-1,top);
+ MoveToEx((HDC) dc,left,top+1,NULL);LineTo((HDC) dc,left,bottom-1);
+ MoveToEx((HDC) dc,left+1,bottom-1,NULL);LineTo((HDC) dc,right-1,bottom-1);
+ MoveToEx((HDC) dc,right-1,top+1,NULL);LineTo((HDC) dc,right-1,bottom-1);
+
+ SelectObject( (HDC) dc, penShadow);
+ if (sel)
+ {
+ MoveToEx((HDC) dc,left+1 ,bottom-2 ,NULL);
+ LineTo((HDC) dc, left+1 ,top+1);
+ LineTo((HDC) dc, right-2 ,top+1);
+ }
+ else
+ {
+ MoveToEx((HDC) dc,left+1 ,bottom-2 ,NULL);
+ LineTo((HDC) dc, right-2 ,bottom-2);
+ LineTo((HDC) dc, right-2 ,top);
+
+ MoveToEx((HDC) dc,left+2 ,bottom-3 ,NULL);
+ LineTo((HDC) dc, right-3 ,bottom-3);
+ LineTo((HDC) dc, right-3 ,top+1);
+
+ SelectObject( (HDC) dc, penLight);
+
+ MoveToEx((HDC) dc,left+1 ,bottom-2 ,NULL);
+ LineTo((HDC) dc, left+1 ,top+1);
+ LineTo((HDC) dc, right-2 ,top+1);
+ }
+
+ // delete allocated resources
+ SelectObject((HDC) dc,oldp);
+ DeleteObject(penBorder);
+ DeleteObject(penLight);
+ DeleteObject(penShadow);
+ DeleteObject(brushFace);
}
-#define FOCUS_MARGIN 6
+#endif // defined(__WIN95__)
-void wxBitmapButton::DrawButtonFocus( WXHDC dc, int left, int top, int right, int bottom, bool sel )
+
+void wxBitmapButton::DrawButtonFocus( WXHDC dc, int left, int top, int right,
+ int bottom, bool WXUNUSED(sel) )
{
- RECT rect;
- rect.left = left;
- rect.top = top;
- rect.right = right;
- rect.bottom = bottom;
- InflateRect( &rect, - FOCUS_MARGIN, - FOCUS_MARGIN ) ;
- if ( sel )
- OffsetRect( &rect, 1, 1 ) ;
- DrawFocusRect( (HDC) dc, &rect ) ;
+ RECT rect;
+ rect.left = left;
+ rect.top = top;
+ rect.right = right;
+ rect.bottom = bottom;
+ InflateRect( &rect, - FOCUS_MARGIN, - FOCUS_MARGIN );
+
+ // GRG: the focus rectangle should not move when the button is pushed!
+/*
+ if ( sel )
+ OffsetRect( &rect, 1, 1 );
+*/
+
+ DrawFocusRect( (HDC) dc, &rect );
}
extern HBRUSH wxDisableButtonBrush;
-void wxBitmapButton::DrawButtonDisable( WXHDC dc, int left, int top, int right, int bottom, bool with_marg )
+void wxBitmapButton::DrawButtonDisable( WXHDC dc, int left, int top, int right,
+ int bottom, bool with_marg )
{
- HBRUSH old = SelectObject( (HDC) dc, wxDisableButtonBrush ) ;
+ HBRUSH old = (HBRUSH) SelectObject( (HDC) dc, wxDisableButtonBrush );
+
+ // ROP for "dest |= pattern" operation -- as it doesn't have a standard
+ // name, give it our own
+ static const DWORD PATTERNPAINT = 0xFA0089UL;
- if ( with_marg )
- ::PatBlt( (HDC) dc, left + m_marginX, top + m_marginY,
- right - 2 * m_marginX, bottom - 2 * m_marginY,
- 0xfa0089ul ) ;
- else ::PatBlt( (HDC) dc, left, top, right, bottom, 0xfa0089ul ) ;
+ if ( with_marg )
+ {
+ left += m_marginX;
+ top += m_marginY;
+ right -= 2 * m_marginX;
+ bottom -= 2 * m_marginY;
+ }
- ::SelectObject( (HDC) dc, old ) ;
+ ::PatBlt( (HDC) dc, left, top, right, bottom, PATTERNPAINT);
+
+ ::SelectObject( (HDC) dc, old );
+}
+
+void wxBitmapButton::SetDefault()
+{
+ wxButton::SetDefault();
}
+#endif // wxUSE_BMPBUTTON
projects / wxWidgets.git / blobdiff