X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0e320a79f187558effb04d92020b470372bbe456..e4315700228573d42a9afb1498fec4ee7b95ccb0:/src/os2/bmpbuttn.cpp?ds=sidebyside diff --git a/src/os2/bmpbuttn.cpp b/src/os2/bmpbuttn.cpp index 169f0d557a..ae0b2843da 100644 --- a/src/os2/bmpbuttn.cpp +++ b/src/os2/bmpbuttn.cpp @@ -1,33 +1,42 @@ ///////////////////////////////////////////////////////////////////////////// // Name: bmpbuttn.cpp // Purpose: wxBitmapButton -// Author: AUTHOR +// Author: David Webster // Modified by: -// Created: ??/??/98 +// Created: 10/13/99 // RCS-ID: $Id$ -// Copyright: (c) AUTHOR -// Licence: wxWindows licence +// Copyright: (c) David Webster +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "bmpbuttn.h" -#endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" +#ifndef WX_PRECOMP #include "wx/bmpbuttn.h" +#endif + +#include "wx/os2/private.h" + -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton) -#endif + +#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) { m_buttonBitmap = bitmap; SetName(name); +#if wxUSE_VALIDATORS SetValidator(validator); +#endif + parent->AddChild(this); m_backgroundColour = parent->GetBackgroundColour() ; @@ -36,6 +45,12 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit m_marginX = 0; m_marginY = 0; + 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; @@ -47,13 +62,32 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit m_windowId = id; if ( width == -1 && bitmap.Ok()) - width = bitmap.GetWidth() + 2*m_marginX; + width = bitmap.GetWidth() + 2*m_marginX; if ( height == -1 && bitmap.Ok()) - height = bitmap.GetHeight() + 2*m_marginY; + 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 + SubclassWin(m_hWnd); + + SetFont(parent->GetFont()) ; - /* TODO: create bitmap button - */ + SetSize(x, y, width, height); return FALSE; } @@ -63,3 +97,189 @@ void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap) m_buttonBitmap = bitmap; } +// TODO: +/* +bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item) +{ +#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; + + 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); + + ::DeleteDC(memDC); + + 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) + { + 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); +*/ +} + +#define FOCUS_MARGIN 6 + +void wxBitmapButton::DrawButtonFocus( WXHDC dc, int left, int top, int right, int bottom, bool sel ) +{ + // 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 ) +{ +// 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() +{ + wxButton::SetDefault(); +}