/////////////////////////////////////////////////////////////////////////////
-// Name: bmpbuttn.cpp
+// Name: src/os2/bmpbuttn.cpp
// Purpose: wxBitmapButton
// Author: David Webster
// Modified by:
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
-#ifndef WX_PRECOMP
+#if wxUSE_BMPBUTTON
+
#include "wx/bmpbuttn.h"
+
+#ifndef WX_PRECOMP
#endif
+#include "wx/os2/dcclient.h"
#include "wx/os2/private.h"
#define BUTTON_HEIGHT_FACTOR (EDIT_CONTROL_FACTOR * 1.1)
-bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
- const wxPoint& pos,
- const wxSize& size, long style,
-#if wxUSE_VALIDATORS
- const wxValidator& validator,
-#endif
- const wxString& name)
+bool wxBitmapButton::Create( wxWindow* pParent,
+ wxWindowID vId,
+ const wxBitmap& rBitmap,
+ const wxPoint& rPos,
+ const wxSize& rSize,
+ long lStyle,
+ const wxValidator& rValidator,
+ const wxString& rsName )
{
- m_buttonBitmap = bitmap;
- SetName(name);
+ m_bmpNormal = rBitmap;
+ SetName(rsName);
#if wxUSE_VALIDATORS
- SetValidator(validator);
+ SetValidator(rValidator);
#endif
- parent->AddChild(this);
+ pParent->AddChild(this);
- m_backgroundColour = parent->GetBackgroundColour() ;
- m_foregroundColour = parent->GetForegroundColour() ;
- m_windowStyle = style;
- m_marginX = 0;
- m_marginY = 0;
+ m_backgroundColour = pParent->GetBackgroundColour() ;
+ m_foregroundColour = pParent->GetForegroundColour() ;
+ m_windowStyle = lStyle;
- if ( style & wxBU_AUTODRAW )
+ if (lStyle & 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;
+ int nX = rPos.x;
+ int nY = rPos.y;
+ int nWidth = rSize.x;
+ int nHeight = rSize.y;
- if (id == -1)
+ if (vId == wxID_ANY)
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;
-
- // TODO:
- /*
- m_hWnd = (WXHWND)CreateWindowEx
- (
- 0,
- wxT("BUTTON"),
- wxT(""),
- WS_VISIBLE | WS_TABSTOP | WS_CHILD | BS_OWNERDRAW ,
- 0, 0, 0, 0,
- GetWinHwnd(parent),
- (HMENU)m_windowId,
- wxGetInstance(),
- NULL
- );
- */
- // Subclass again for purposes of dialog editing mode
+ m_windowId = vId;
+
+ if (nWidth == wxDefaultCoord && rBitmap.Ok())
+ nWidth = rBitmap.GetWidth() + 4 * m_marginX;
+
+ if (nHeight == wxDefaultCoord && rBitmap.Ok())
+ nHeight = rBitmap.GetHeight() + 4 * m_marginY;
+
+ ULONG ulOS2Style = WS_VISIBLE | WS_TABSTOP | BS_USERBUTTON;
+
+ if (m_windowStyle & wxCLIP_SIBLINGS)
+ ulOS2Style |= WS_CLIPSIBLINGS;
+
+ m_hWnd = (WXHWND)::WinCreateWindow( GetHwndOf(pParent)
+ ,WC_BUTTON
+ ,(PSZ)wxEmptyString
+ ,ulOS2Style
+ ,0, 0, 0, 0
+ ,GetHwndOf(pParent)
+ ,HWND_TOP
+ ,m_windowId
+ ,NULL
+ ,NULL
+ );
+
+ //
+ //Subclass again for purposes of dialog editing mode
+ //
SubclassWin(m_hWnd);
-
- SetFont(parent->GetFont()) ;
-
- SetSize(x, y, width, height);
-
- return FALSE;
-}
-
-void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
-{
- m_buttonBitmap = bitmap;
-}
-
-// TODO:
-/*
-bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
+ SetFont(*wxSMALL_FONT);
+ SetSize( nX
+ ,nY
+ ,nWidth
+ ,nHeight
+ );
+ return true;
+} // end of wxBitmapButton::Create
+
+bool wxBitmapButton::OS2OnDraw( WXDRAWITEMSTRUCT* pItem)
{
-#if defined(__WIN95__)
- 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;
-
- 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 = (HBITMAP) ::SelectObject(memDC, (HBITMAP) bitmap->GetHBITMAP());
-
- if (!old)
- return FALSE;
+ PUSERBUTTON pUser = (PUSERBUTTON)pItem;
+ bool bAutoDraw = (GetWindowStyleFlag() & wxBU_AUTODRAW) != 0;
+
+ if (!pUser)
+ return false;
+
+ wxBitmap* pBitmap;
+ bool bIsSelected = pUser->fsState & BDS_HILITED;
+ wxClientDC vDc(this);
+
+ if (bIsSelected && m_bmpSelected.Ok())
+ pBitmap = &m_bmpSelected;
+ else if ((pUser->fsState & BDS_DEFAULT) && m_bmpFocus.Ok())
+ pBitmap = &m_bmpFocus;
+ else if ((pUser->fsState & BDS_DISABLED) && m_bmpDisabled.Ok())
+ pBitmap = &m_bmpDisabled;
+ else
+ pBitmap = &m_bmpNormal;
- int x = lpDIS->rcItem.left;
- int y = lpDIS->rcItem.top;
- int width = lpDIS->rcItem.right - x;
- int height = lpDIS->rcItem.bottom - y;
+ if (!pBitmap->Ok() )
+ return false;
- // 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) )
+ //
+ int nX1 = 0;
+ int nY1 = 0;
+ wxPMDCImpl *impl = (wxPMDCImpl*) vDc.GetImpl();
+ int nWidth = impl->m_vRclPaint.xRight - impl->m_vRclPaint.xLeft;
+ int nHeight = impl->m_vRclPaint.yTop - impl->m_vRclPaint.yBottom;
+ int nBmpWidth = pBitmap->GetWidth();
+ int nBmpHeight = pBitmap->GetHeight();
+
+ nX1 = (nWidth - nBmpWidth) / 2;
+ nY1 = (nHeight - nBmpHeight) / 2;
+
+ if (bIsSelected && bAutoDraw)
{
- x1 ++;
- y1 ++;
+ nX1++;
+ nY1++;
}
- ::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);
+ //
+ // Draw the button face
+ //
+ DrawFace( vDc, bIsSelected );
- ::DeleteDC(memDC);
+ //
+ // Draw the bitmap
+ //
+ vDc.DrawBitmap( *pBitmap, nX1, nY1, true );
- return TRUE;
-}
-*/
-
-void wxBitmapButton::DrawFace( WXHDC dc, int left, int top, int right, int bottom, bool sel )
-{
-// TODO:
-/*
- 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 = (HPEN) SelectObject( (HDC) dc, GetStockObject( NULL_PEN ) ) ;
- oldb = (HBRUSH) 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)
+ //
+ // Draw focus / disabled state, if auto-drawing
+ //
+ if ((pUser->fsState == BDS_DISABLED) && bAutoDraw)
{
- MoveToEx((HDC) dc,left+1 ,bottom-2 ,NULL) ;
- LineTo((HDC) dc, left+1 ,top+1) ;
- LineTo((HDC) dc, right-2 ,top+1) ;
+ DrawButtonDisable( vDc, *pBitmap );
}
- else
+ else if ((pUser->fsState == BDS_DEFAULT) && bAutoDraw)
{
- 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) ;
+ DrawButtonFocus(vDc);
}
- SelectObject((HDC) dc,oldp) ;
- SelectObject((HDC) dc,oldb) ;
-
- DeleteObject(penBorder);
- DeleteObject(penLight);
- DeleteObject(penShadow);
- DeleteObject(brushFace);
-*/
-}
+ return true;
+} // end of wxBitmapButton::OS2OnDraw
-#define FOCUS_MARGIN 6
-
-void wxBitmapButton::DrawButtonFocus( WXHDC dc, int left, int top, int right, int bottom, bool sel )
+void wxBitmapButton::DrawFace (wxClientDC& rDC, bool bSel)
{
- // TODO:
-/*
- 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 ) ;
-*/
-}
-
-// extern HBRUSH wxDisableButtonBrush;
-
-void wxBitmapButton::DrawButtonDisable( WXHDC dc, int left, int top, int right, int bottom, bool with_marg )
+ //
+ // Set up drawing colors
+ //
+ wxPen vHiLitePen(*wxWHITE, 2, wxSOLID); // White
+ wxColour gray85(85, 85, 85);
+ wxPen vDarkShadowPen(gray85, 2, wxSOLID);
+ wxColour vFaceColor(204, 204, 204); // Light Grey
+
+ //
+ // Draw the main button face
+ //
+ // This triggers a redraw and destroys the bottom & left focus border and
+ // doesn't seem to do anything useful.
+ // ::WinFillRect(rDC.GetHPS(), &rDC.m_vRclPaint, vFaceColor.GetPixel());
+
+ //
+ // Draw the border
+ // Note: DrawLine expects wxWidgets coordinate system so swap
+ //
+ rDC.SetPen(bSel ? vDarkShadowPen : vHiLitePen);
+ wxPMDCImpl *impl = (wxPMDCImpl*) rDC.GetImpl();
+ // top
+ rDC.DrawLine( impl->m_vRclPaint.xLeft + 1
+ ,impl->m_vRclPaint.yBottom + 1
+ ,impl->m_vRclPaint.xRight - 1
+ ,impl->m_vRclPaint.yBottom + 1
+ );
+ // left
+ rDC.DrawLine( impl->m_vRclPaint.xLeft + 1
+ ,impl->m_vRclPaint.yBottom + 1
+ ,impl->m_vRclPaint.xLeft + 1
+ ,impl->m_vRclPaint.yTop - 1
+ );
+
+ rDC.SetPen(bSel ? vHiLitePen : vDarkShadowPen);
+ // bottom
+ rDC.DrawLine( impl->m_vRclPaint.xLeft + 1
+ ,impl->m_vRclPaint.yTop - 1
+ ,impl->m_vRclPaint.xRight - 1
+ ,impl->m_vRclPaint.yTop - 1
+ );
+ // right
+ rDC.DrawLine( impl->m_vRclPaint.xRight - 1
+ ,impl->m_vRclPaint.yBottom + 1
+ ,impl->m_vRclPaint.xRight - 1
+ ,impl->m_vRclPaint.yTop - 1
+ );
+
+} // end of wxBitmapButton::DrawFace
+
+void wxBitmapButton::DrawButtonFocus (
+ wxClientDC& rDC
+)
{
-// TODO:
-/*
- HBRUSH old = (HBRUSH) SelectObject( (HDC) dc, wxDisableButtonBrush ) ;
-
- if ( with_marg )
- ::PatBlt( (HDC) dc, left + m_marginX, top + m_marginY,
- right - 2 * m_marginX, bottom - 2 * m_marginY,
-#ifdef __SALFORDC__
- 0xfa0089L ) ;
-#else
- 0xfa0089UL ) ;
-#endif
- else ::PatBlt( (HDC) dc, left, top, right, bottom,
-#ifdef __SALFORDC__
- 0xfa0089L ) ;
-#else
- 0xfa0089UL ) ;
-#endif
- ::SelectObject( (HDC) dc, old ) ;
-*/
-}
-
-void wxBitmapButton::SetDefault()
+ wxPen vBlackPen(*wxBLACK, 2, wxSOLID);
+
+ //
+ // Draw a thick black line around the outside of the button
+ // Note: DrawLine expects wxWidgets coordinate system so swap
+ //
+ rDC.SetPen(vBlackPen);
+ wxPMDCImpl *impl = (wxPMDCImpl*) rDC.GetImpl();
+ // top
+ rDC.DrawLine( impl->m_vRclPaint.xLeft
+ ,impl->m_vRclPaint.yBottom
+ ,impl->m_vRclPaint.xRight
+ ,impl->m_vRclPaint.yBottom
+ );
+ // right
+ rDC.DrawLine( impl->m_vRclPaint.xRight
+ ,impl->m_vRclPaint.yBottom
+ ,impl->m_vRclPaint.xRight
+ ,impl->m_vRclPaint.yTop
+ );
+ // bottom
+ rDC.DrawLine( impl->m_vRclPaint.xRight
+ ,impl->m_vRclPaint.yTop
+ ,impl->m_vRclPaint.xLeft
+ ,impl->m_vRclPaint.yTop
+ );
+ // left
+ rDC.DrawLine( impl->m_vRclPaint.xLeft
+ ,impl->m_vRclPaint.yTop
+ ,impl->m_vRclPaint.xLeft
+ ,impl->m_vRclPaint.yBottom
+ );
+} // end of wxBitmapButton::DrawButtonFocus
+
+void wxBitmapButton::DrawButtonDisable( wxClientDC& rDC,
+ wxBitmap& rBmp )
{
- wxButton::SetDefault();
-}
+ wxPen vGreyPen(wxT("GREY"), 2, wxSOLID);
+
+ //
+ // Draw a thick black line around the outside of the button
+ // Note: DrawLine expects wxWidgets coordinate system so swap
+ //
+ rDC.SetPen(vGreyPen);
+ wxPMDCImpl *impl = (wxPMDCImpl*) rDC.GetImpl();
+ // top
+ rDC.DrawLine( impl->m_vRclPaint.xLeft
+ ,impl->m_vRclPaint.yBottom
+ ,impl->m_vRclPaint.xRight
+ ,impl->m_vRclPaint.yBottom
+ );
+ // right
+ rDC.DrawLine( impl->m_vRclPaint.xRight
+ ,impl->m_vRclPaint.yBottom
+ ,impl->m_vRclPaint.xRight
+ ,impl->m_vRclPaint.yTop
+ );
+ // bottom
+ rDC.DrawLine( impl->m_vRclPaint.xRight
+ ,impl->m_vRclPaint.yTop
+ ,impl->m_vRclPaint.xLeft
+ ,impl->m_vRclPaint.yTop
+ );
+ // left
+ rDC.DrawLine( impl->m_vRclPaint.xLeft
+ ,impl->m_vRclPaint.yTop
+ ,impl->m_vRclPaint.xLeft
+ ,impl->m_vRclPaint.yBottom
+ );
+ wxDisableBitmap(rBmp, vGreyPen.GetColour().GetPixel());
+} // end of wxBitmapButton::DrawButtonDisable
+
+#endif // ndef for wxUSE_BMPBUTTON
projects / wxWidgets.git / blobdiff