Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bitmap button updates

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17091 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2002-09-09 03:08:12 +00:00
parent 4147efe9ab
commit db16e5c3aa
7 changed files with 581 additions and 504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

120
include/wx/os2/bmpbuttn.h
View File

@@ -20,69 +20,83 @@ WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
class WXDLLEXPORT wxBitmapButton: public wxBitmapButtonBase class WXDLLEXPORT wxBitmapButton: public wxBitmapButtonBase
{ {
DECLARE_DYNAMIC_CLASS(wxBitmapButton) public:
public: inline wxBitmapButton()
inline wxBitmapButton() { m_marginX = wxDEFAULT_BUTTON_MARGIN; m_marginY = wxDEFAULT_BUTTON_MARGIN; } {
inline wxBitmapButton(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap, m_marginX = wxDEFAULT_BUTTON_MARGIN;
const wxPoint& pos = wxDefaultPosition, m_marginY = wxDEFAULT_BUTTON_MARGIN;
const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW, }
inline wxBitmapButton( wxWindow* pParent
,wxWindowID vId
,const wxBitmap& rBitmap
,const wxPoint& rPos = wxDefaultPosition
,const wxSize& rSize = wxDefaultSize
,long lStyle = wxBU_AUTODRAW
#if wxUSE_VALIDATORS #if wxUSE_VALIDATORS
const wxValidator& validator = wxDefaultValidator, ,const wxValidator& rValidator = wxDefaultValidator
#endif #endif
const wxString& name = wxButtonNameStr) ,const wxString& rsName = wxButtonNameStr
{ )
Create(parent, id, bitmap, pos, size, style, validator, name); {
} Create( pParent
,vId
bool Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap, ,rBitmap
const wxPoint& pos = wxDefaultPosition, ,rPos
const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW, ,rSize
,lStyle
#if wxUSE_VALIDATORS #if wxUSE_VALIDATORS
const wxValidator& validator = wxDefaultValidator, ,rValidator
#endif #endif
const wxString& name = wxButtonNameStr); ,rsName
);
}
virtual void SetLabel(const wxBitmap& bitmap) bool Create( wxWindow* pParent
{ ,wxWindowID vId
SetBitmapLabel(bitmap); ,const wxBitmap& rBitmap
} ,const wxPoint& rPos = wxDefaultPosition
,const wxSize& rSize = wxDefaultSize
,long lStyle = wxBU_AUTODRAW
#if wxUSE_VALIDATORS
,const wxValidator& rValidator = wxDefaultValidator
#endif
,const wxString& rsName = wxButtonNameStr
);
virtual void SetBitmapLabel(const wxBitmap& bitmap); virtual void SetLabel(const wxBitmap& rBitmap)
{
SetBitmapLabel(rBitmap);
}
#if WXWIN_COMPATIBILITY #if WXWIN_COMPATIBILITY
wxBitmap *GetBitmap() const { return (wxBitmap *) & m_buttonBitmap; } wxBitmap* GetBitmap(void) const
{
return (wxBitmap *)&m_buttonBitmap;
}
#endif #endif
inline wxBitmap& GetBitmapLabel() const { return (wxBitmap&) m_buttonBitmap; } //
inline wxBitmap& GetBitmapSelected() const { return (wxBitmap&) m_buttonBitmapSelected; } // Implementation
inline wxBitmap& GetBitmapFocus() const { return (wxBitmap&) m_buttonBitmapFocus; } //
inline wxBitmap& GetBitmapDisabled() const { return (wxBitmap&) m_buttonBitmapDisabled; } virtual void SetDefault();
virtual bool OS2OnDraw(WXDRAWITEMSTRUCT* pItem);
inline void SetBitmapSelected(const wxBitmap& sel) { m_buttonBitmapSelected = sel; };
inline void SetBitmapFocus(const wxBitmap& focus) { m_buttonBitmapFocus = focus; };
inline void SetBitmapDisabled(const wxBitmap& disabled) { m_buttonBitmapDisabled = disabled; };
inline void SetMargins(int x, int y) { m_marginX = x; m_marginY = y; }
inline int GetMarginX() { return m_marginX; }
inline int GetMarginY() { return m_marginY; }
virtual void SetDefault();
// virtual bool OS2OnDraw(WXDRAWITEMSTRUCT *item);
virtual void DrawFace( WXHDC dc, int left, int top, int right, int bottom, bool sel );
virtual void DrawButtonFocus( WXHDC dc, int left, int top, int right, int bottom, bool sel );
virtual void DrawButtonDisable( WXHDC dc, int left, int top, int right, int bottom, bool with_marg );
protected:
wxBitmap m_buttonBitmap;
wxBitmap m_buttonBitmapSelected;
wxBitmap m_buttonBitmapFocus;
wxBitmap m_buttonBitmapDisabled;
int m_marginX;
int m_marginY;
private: private:
virtual void SetLabel(const wxString& string)
{ wxButton::SetLabel(string); };
};
#endif virtual void DrawFace( wxClientDC& rDC
// _WX_BMPBUTTN_H_ ,bool bSel
);
virtual void DrawButtonFocus(wxClientDC& rDC);
virtual void DrawButtonDisable( wxClientDC& rDC
,wxBitmap& rBmp
);
DECLARE_DYNAMIC_CLASS(wxBitmapButton)
virtual void SetLabel(const wxString& rsString)
{
wxButton::SetLabel(rsString);
}
}; // end of CLASS wxBitmapButton
#endif // _WX_BMPBUTTN_H_

12
include/wx/os2/private.h
View File

@@ -39,6 +39,7 @@
class WXDLLEXPORT wxFont; class WXDLLEXPORT wxFont;
class WXDLLEXPORT wxWindow; class WXDLLEXPORT wxWindow;
class WXDLLEXPORT wxString; class WXDLLEXPORT wxString;
class WXDLLEXPORT wxBitmap;
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// private constants // private constants
@@ -334,9 +335,12 @@ WXDLLEXPORT extern void wxOS2SetFont( HWND hWnd
); );
WXDLLEXPORT extern bool wxCheckWindowWndProc( WXHWND hWnd WXDLLEXPORT extern bool wxCheckWindowWndProc( WXHWND hWnd
,WXFARPROC fnWndProc ,WXFARPROC fnWndProc
); );
WXDLLEXPORT extern wxBitmap wxDisableBitmap( const wxBitmap& rBmp
,long lColor
);
#endif // _WX_PRIVATE_H_
#endif
// _WX_PRIVATE_H_

482
src/os2/bmpbuttn.cpp
View File

@@ -12,6 +12,8 @@
// For compilers that support precompilation, includes "wx.h". // For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h" #include "wx/wxprec.h"
#if wxUSE_BMPBUTTON
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/bmpbuttn.h" #include "wx/bmpbuttn.h"
#endif #endif
@@ -23,263 +25,307 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
#define BUTTON_HEIGHT_FACTOR (EDIT_CONTROL_FACTOR * 1.1) #define BUTTON_HEIGHT_FACTOR (EDIT_CONTROL_FACTOR * 1.1)
bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap, bool wxBitmapButton::Create(
const wxPoint& pos, wxWindow* pParent
const wxSize& size, long style, , wxWindowID vId
, const wxBitmap& rBitmap
, const wxPoint& rPos
, const wxSize& rSize
, long lStyle
#if wxUSE_VALIDATORS #if wxUSE_VALIDATORS
const wxValidator& validator, , const wxValidator& rValidator
#endif #endif
const wxString& name) , const wxString& rsName
)
{ {
m_buttonBitmap = bitmap; m_bmpNormal = rBitmap;
SetName(name); SetName(rsName);
#if wxUSE_VALIDATORS #if wxUSE_VALIDATORS
SetValidator(validator); SetValidator(rValidator);
#endif #endif
parent->AddChild(this); pParent->AddChild(this);
m_backgroundColour = parent->GetBackgroundColour() ; m_backgroundColour = pParent->GetBackgroundColour() ;
m_foregroundColour = parent->GetForegroundColour() ; m_foregroundColour = pParent->GetForegroundColour() ;
m_windowStyle = style; m_windowStyle = lStyle;
m_marginX = 0;
m_marginY = 0;
if ( style & wxBU_AUTODRAW ) if (lStyle & wxBU_AUTODRAW)
{ {
m_marginX = wxDEFAULT_BUTTON_MARGIN; m_marginX = wxDEFAULT_BUTTON_MARGIN;
m_marginY = wxDEFAULT_BUTTON_MARGIN; m_marginY = wxDEFAULT_BUTTON_MARGIN;
} }
int x = pos.x; int nX = rPos.x;
int y = pos.y; int nY = rPos.y;
int width = size.x; int nWidth = rSize.x;
int height = size.y; int nHeight = rSize.y;
if (id == -1) if (vId == -1)
m_windowId = NewControlId(); m_windowId = NewControlId();
else else
m_windowId = id; m_windowId = vId;
if ( width == -1 && bitmap.Ok()) if (nWidth == -1 && rBitmap.Ok())
width = bitmap.GetWidth() + 2*m_marginX; nWidth = rBitmap.GetWidth() + 2 * m_marginX;
if ( height == -1 && bitmap.Ok()) if (nHeight == -1 && rBitmap.Ok())
height = bitmap.GetHeight() + 2*m_marginY; nHeight = rBitmap.GetHeight() + 2 * m_marginY;
// TODO: ULONG ulOS2Style = WS_VISIBLE | WS_TABSTOP | BS_USERBUTTON;
/*
m_hWnd = (WXHWND)CreateWindowEx if (m_windowStyle & wxCLIP_SIBLINGS)
( ulOS2Style |= WS_CLIPSIBLINGS;
0,
wxT("BUTTON"), m_hWnd = (WXHWND)::WinCreateWindow( GetHwndOf(pParent)
wxT(""), ,WC_BUTTON
WS_VISIBLE | WS_TABSTOP | WS_CHILD | BS_OWNERDRAW , ,wxT("")
0, 0, 0, 0, ,ulOS2Style
GetWinHwnd(parent), ,0, 0, 0, 0
(HMENU)m_windowId, ,GetHwndOf(pParent)
wxGetInstance(), ,HWND_TOP
NULL ,m_windowId
); ,NULL
*/ ,NULL
// Subclass again for purposes of dialog editing mode );
//
//Subclass again for purposes of dialog editing mode
//
SubclassWin(m_hWnd); SubclassWin(m_hWnd);
SetFont(*wxSMALL_FONT);
SetFont(parent->GetFont()) ; SetSize( nX
,nY
SetSize(x, y, width, height); ,nWidth
,nHeight
return FALSE; );
}
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; return TRUE;
} } // end of wxBitmapButton::Create
*/
void wxBitmapButton::DrawFace( WXHDC dc, int left, int top, int right, int bottom, bool sel ) bool wxBitmapButton::OS2OnDraw(
WXDRAWITEMSTRUCT* pItem
)
{ {
// TODO: PUSERBUTTON pUser = (PUSERBUTTON)pItem;
/* bool bAutoDraw = (GetWindowStyleFlag() & wxBU_AUTODRAW) != 0;
HPEN oldp;
HBRUSH oldb ;
HPEN penBorder; if (!pUser)
HPEN penLight; return FALSE;
HPEN penShadow;
HBRUSH brushFace;
COLORREF ms_color;
ms_color = GetSysColor(COLOR_WINDOWFRAME) ; wxBitmap* pBitmap;
penBorder = CreatePen(PS_SOLID,0,ms_color) ; RECTL vRect;
bool bIsSelected = pUser->fsState & BDS_HILITED;
wxClientDC vDc(this);
ms_color = GetSysColor(COLOR_BTNSHADOW) ; if (bIsSelected && m_bmpSelected.Ok())
penShadow = CreatePen(PS_SOLID,0,ms_color) ; pBitmap = &m_bmpSelected;
else if ((pUser->fsState & BDS_DEFAULT) && m_bmpFocus.Ok())
ms_color = GetSysColor(COLOR_BTNHIGHLIGHT) ; pBitmap = &m_bmpFocus;
penLight = CreatePen(PS_SOLID,0,ms_color) ; else if ((pUser->fsState & BDS_DISABLED) && m_bmpDisabled.Ok())
pBitmap = &m_bmpDisabled;
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 else
pBitmap = &m_bmpNormal;
if (!pBitmap->Ok() )
return FALSE;
//
// Centre the bitmap in the control area
//
int nX = 0;
int nY = 0;
int nX1 = 0;
int nY1 = 0;
int nWidth = vDc.m_vRclPaint.xRight - vDc.m_vRclPaint.xLeft;
int nHeight = vDc.m_vRclPaint.xRight - vDc.m_vRclPaint.xLeft;
int nBmpWidth = pBitmap->GetWidth();
int nBmpHeight = pBitmap->GetHeight();
nX1 = nX + (nWidth - nBmpWidth) / 2;
nY1 = nX + (nHeight - nBmpHeight) / 2;
if (bIsSelected && bAutoDraw)
{ {
MoveToEx((HDC) dc,left+1 ,bottom-2 ,NULL) ; nX1++;
LineTo((HDC) dc, right-2 ,bottom-2) ; nY1++;
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); // Draw the button face
DeleteObject(penShadow); //
DeleteObject(brushFace); {
*/ DrawFace( vDc
} ,bIsSelected
);
}
#define FOCUS_MARGIN 6 //
// Draw the bitmap
//
vDc.DrawBitmap( *pBitmap
,nX1
,nY1
,TRUE
);
void wxBitmapButton::DrawButtonFocus( WXHDC dc, int left, int top, int right, int bottom, bool sel ) //
// Draw focus / disabled state, if auto-drawing
//
if ((pUser->fsState == BDS_DISABLED) && bAutoDraw)
{
DrawButtonDisable( vDc
,*pBitmap
);
}
else if ((pUser->fsState == BDS_DEFAULT) && bAutoDraw)
{
DrawButtonFocus(vDc);
}
return TRUE;
} // end of wxBitmapButton::OS2OnDraw
void wxBitmapButton::DrawFace (
wxClientDC& rDC
, bool bSel
)
{ {
// TODO: //
/* // Set up drawing colors
RECT rect; //
rect.left = left; wxPen vHiLitePen(wxColour(255, 255, 255), 1, wxSOLID); // White
rect.top = top; wxPen vLitePen(wxColour(223, 223, 223), 1, wxSOLID); // Very Light Grey
rect.right = right; wxPen vShadowPen(wxColour(191, 191, 191), 1, wxSOLID); // Medium Grey
rect.bottom = bottom; wxPen vDarkShadowPen(wxColour(128, 128, 128), 1, wxSOLID);
InflateRect( &rect, - FOCUS_MARGIN, - FOCUS_MARGIN ) ; wxColour vFaceColor(wxColour(204, 204, 204)); // Light Grey
if ( sel )
OffsetRect( &rect, 1, 1 ) ;
DrawFocusRect( (HDC) dc, &rect ) ;
*/
}
// extern HBRUSH wxDisableButtonBrush; //
// Draw the main button face
//
::WinFillRect(rDC.GetHPS(), &rDC.m_vRclPaint, vFaceColor.GetPixel());
void wxBitmapButton::DrawButtonDisable( WXHDC dc, int left, int top, int right, int bottom, bool with_marg ) //
// Draw the border
//
rDC.SetPen(bSel ? vDarkShadowPen : vHiLitePen);
rDC.DrawLine( rDC.m_vRclPaint.xLeft
,rDC.m_vRclPaint.yTop
,rDC.m_vRclPaint.xRight - 1
,rDC.m_vRclPaint.yTop
);
rDC.DrawLine( rDC.m_vRclPaint.xLeft
,rDC.m_vRclPaint.yTop + 1
,rDC.m_vRclPaint.xLeft
,rDC.m_vRclPaint.yBottom - 1
);
rDC.SetPen(bSel ? vShadowPen : vLitePen);
rDC.DrawLine( rDC.m_vRclPaint.xLeft + 1
,rDC.m_vRclPaint.yTop + 1
,rDC.m_vRclPaint.xRight - 2
,rDC.m_vRclPaint.yTop + 1
);
rDC.DrawLine( rDC.m_vRclPaint.xLeft + 1
,rDC.m_vRclPaint.yTop + 2
,rDC.m_vRclPaint.xLeft + 1
,rDC.m_vRclPaint.yBottom - 2
);
rDC.SetPen(bSel ? vLitePen : vShadowPen);
rDC.DrawLine( rDC.m_vRclPaint.xLeft + 1
,rDC.m_vRclPaint.yBottom - 2
,rDC.m_vRclPaint.xRight - 1
,rDC.m_vRclPaint.yBottom - 2
);
rDC.DrawLine( rDC.m_vRclPaint.xRight - 2
,rDC.m_vRclPaint.yBottom - 3
,rDC.m_vRclPaint.xRight - 2
,rDC.m_vRclPaint.yTop
);
rDC.SetPen(bSel ? vDarkShadowPen : vHiLitePen);
rDC.DrawLine( rDC.m_vRclPaint.xLeft
,rDC.m_vRclPaint.yBottom - 1
,rDC.m_vRclPaint.xRight + 2
,rDC.m_vRclPaint.yBottom - 1
);
rDC.DrawLine( rDC.m_vRclPaint.xRight - 1
,rDC.m_vRclPaint.yBottom - 2
,rDC.m_vRclPaint.xRight - 1
,rDC.m_vRclPaint.yTop - 1
);
} // end of wxBitmapButton::DrawFace
void wxBitmapButton::DrawButtonFocus (
wxClientDC& rDC
)
{ {
// TODO: wxPen vBlackPen(wxColour(0, 0, 0), 2, wxSOLID);
/*
HBRUSH old = (HBRUSH) SelectObject( (HDC) dc, wxDisableButtonBrush ) ;
if ( with_marg ) //
::PatBlt( (HDC) dc, left + m_marginX, top + m_marginY, // Draw a thick black line around the outside of the button
right - 2 * m_marginX, bottom - 2 * m_marginY, //
#ifdef __SALFORDC__ rDC.SetPen(vBlackPen);
0xfa0089L ) ; rDC.DrawLine( rDC.m_vRclPaint.xLeft
#else ,rDC.m_vRclPaint.yTop
0xfa0089UL ) ; ,rDC.m_vRclPaint.xRight
#endif ,rDC.m_vRclPaint.yTop
else ::PatBlt( (HDC) dc, left, top, right, bottom, );
#ifdef __SALFORDC__ rDC.DrawLine( rDC.m_vRclPaint.xRight
0xfa0089L ) ; ,rDC.m_vRclPaint.yTop
#else ,rDC.m_vRclPaint.xRight
0xfa0089UL ) ; ,rDC.m_vRclPaint.yBottom
#endif );
::SelectObject( (HDC) dc, old ) ; rDC.DrawLine( rDC.m_vRclPaint.xRight
*/ ,rDC.m_vRclPaint.yBottom
} ,rDC.m_vRclPaint.xLeft
,rDC.m_vRclPaint.yBottom
);
rDC.DrawLine( rDC.m_vRclPaint.xLeft
,rDC.m_vRclPaint.yBottom
,rDC.m_vRclPaint.xLeft
,rDC.m_vRclPaint.yTop
);
} // end of wxBitmapButton::DrawButtonFocus
void wxBitmapButton::DrawButtonDisable(
wxClientDC& rDC
, wxBitmap& rBmp
)
{
wxPen vGreyPen(wxColour(128, 128, 128), 2, wxSOLID);
//
// Draw a thick black line around the outside of the button
//
rDC.SetPen(vGreyPen);
rDC.DrawLine( rDC.m_vRclPaint.xLeft
,rDC.m_vRclPaint.yTop
,rDC.m_vRclPaint.xRight
,rDC.m_vRclPaint.yTop
);
rDC.DrawLine( rDC.m_vRclPaint.xRight
,rDC.m_vRclPaint.yTop
,rDC.m_vRclPaint.xRight
,rDC.m_vRclPaint.yBottom
);
rDC.DrawLine( rDC.m_vRclPaint.xRight
,rDC.m_vRclPaint.yBottom
,rDC.m_vRclPaint.xLeft
,rDC.m_vRclPaint.yBottom
);
rDC.DrawLine( rDC.m_vRclPaint.xLeft
,rDC.m_vRclPaint.yBottom
,rDC.m_vRclPaint.xLeft
,rDC.m_vRclPaint.yTop
);
wxDisableBitmap(rBmp, vGreyPen.GetColour().GetPixel());
} // end of wxBitmapButton::DrawButtonDisable
void wxBitmapButton::SetDefault() void wxBitmapButton::SetDefault()
{ {
wxButton::SetDefault(); wxButton::SetDefault();
} }
#endif // ndef for wxUSE_BMPBUTTON

11
src/os2/settings.cpp
View File

@@ -149,6 +149,17 @@ wxColour wxSystemSettingsNative::GetColour(
); );
break; break;
case wxSYS_COLOUR_BTNDARKSHADOW:
vRef = (ULONG)::WinQuerySysColor( HWND_DESKTOP
,SYSCLR_BUTTONDARK
,0L
);
vCol.Set( GetRValue(vRef)
,GetGValue(vRef)
,GetBValue(vRef)
);
break;
case wxSYS_COLOUR_MENUBAR: case wxSYS_COLOUR_MENUBAR:
vRef = (ULONG)::WinQuerySysColor( HWND_DESKTOP vRef = (ULONG)::WinQuerySysColor( HWND_DESKTOP
,SYSCLR_MENU ,SYSCLR_MENU

216
src/os2/toolbar.cpp
View File

@@ -28,222 +28,6 @@
bool wxToolBar::m_bInitialized = FALSE; bool wxToolBar::m_bInitialized = FALSE;
// ---------------------------------------------------------------------------
// Helper for taking a regular bitmap and giving it a disabled look
// ---------------------------------------------------------------------------
wxBitmap wxDisableBitmap(
const wxBitmap& rBmp
, long lColor
)
{
wxMask* pMask = rBmp.GetMask();
if (!pMask)
return(wxNullBitmap);
DEVOPENSTRUC vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L};
SIZEL vSize = {0, 0};
HDC hDC = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE);
HPS hPS = ::GpiCreatePS(vHabmain, hDC, &vSize, PU_PELS | GPIA_ASSOC);
BITMAPINFOHEADER2 vHeader;
BITMAPINFO2 vInfo;
ERRORID vError;
wxString sError;
HBITMAP hBitmap = (HBITMAP)rBmp.GetHBITMAP();
HBITMAP hOldBitmap = NULLHANDLE;
HBITMAP hOldMask = NULLHANDLE;
HBITMAP hMask = (HBITMAP)rBmp.GetMask()->GetMaskBitmap();
unsigned char* pucBits; // buffer that will contain the bitmap data
unsigned char* pucData; // pointer to use to traverse bitmap data
unsigned char* pucBitsMask; // buffer that will contain the mask data
unsigned char* pucDataMask; // pointer to use to traverse mask data
LONG lScans = 0L;
LONG lScansSet = 0L;
bool bpp16 = (wxDisplayDepth() == 16);
memset(&vHeader, '\0', 16);
vHeader.cbFix = 16;
memset(&vInfo, '\0', 16);
vInfo.cbFix = 16;
vInfo.cx = (ULONG)rBmp.GetWidth();
vInfo.cy = (ULONG)rBmp.GetHeight();
vInfo.cPlanes = 1;
vInfo.cBitCount = 24; // Set to desired count going in
//
// Create the buffers for data....all wxBitmaps are 24 bit internally
//
int nBytesPerLine = rBmp.GetWidth() * 3;
int nSizeDWORD = sizeof(DWORD);
int nLineBoundary = nBytesPerLine % nSizeDWORD;
int nPadding = 0;
int i;
int j;
//
// Bitmap must be ina double-word alligned address so we may
// have some padding to worry about
//
if (nLineBoundary > 0)
{
nPadding = nSizeDWORD - nLineBoundary;
nBytesPerLine += nPadding;
}
pucBits = (unsigned char *)malloc(nBytesPerLine * rBmp.GetHeight());
memset(pucBits, '\0', (nBytesPerLine * rBmp.GetHeight()));
pucBitsMask = (unsigned char *)malloc(nBytesPerLine * rBmp.GetHeight());
memset(pucBitsMask, '\0', (nBytesPerLine * rBmp.GetHeight()));
//
// Extract the bitmap and mask data
//
if ((hOldBitmap = ::GpiSetBitmap(hPS, hBitmap)) == HBM_ERROR)
{
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
}
::GpiQueryBitmapInfoHeader(hBitmap, &vHeader);
vInfo.cBitCount = 24;
if ((lScans = ::GpiQueryBitmapBits( hPS
,0L
,(LONG)rBmp.GetHeight()
,(PBYTE)pucBits
,&vInfo
)) == GPI_ALTERROR)
{
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
}
if ((hOldMask = ::GpiSetBitmap(hPS, hMask)) == HBM_ERROR)
{
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
}
::GpiQueryBitmapInfoHeader(hMask, &vHeader);
vInfo.cBitCount = 24;
if ((lScans = ::GpiQueryBitmapBits( hPS
,0L
,(LONG)rBmp.GetHeight()
,(PBYTE)pucBitsMask
,&vInfo
)) == GPI_ALTERROR)
{
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
}
if (( hMask = ::GpiSetBitmap(hPS, hOldMask)) == HBM_ERROR)
{
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
}
pucData = pucBits;
pucDataMask = pucBitsMask;
//
// Get the mask value
//
for (i = 0; i < rBmp.GetHeight(); i++)
{
for (j = 0; j < rBmp.GetWidth(); j++)
{
// Byte 1
if (bpp16 && *pucDataMask == 0xF8) // 16 bit display gobblygook
{
*pucData = 0x7F;
pucData++;
}
else if (*pucDataMask == 0xFF) // set to grey
{
*pucData = 0x7F;
pucData++;
}
else
{
*pucData = ((unsigned char)(lColor >> 16));
pucData++;
}
// Byte 2
if (bpp16 && *(pucDataMask + 1) == 0xFC) // 16 bit display gobblygook
{
*pucData = 0x7F;
pucData++;
}
else if (*(pucDataMask + 1) == 0xFF) // set to grey
{
*pucData = 0x7F;
pucData++;
}
else
{
*pucData = ((unsigned char)(lColor >> 8));
pucData++;
}
// Byte 3
if (bpp16 && *(pucDataMask + 2) == 0xF8) // 16 bit display gobblygook
{
*pucData = 0x7F;
pucData++;
}
else if (*(pucDataMask + 2) == 0xFF) // set to grey
{
*pucData = 0x7F;
pucData++;
}
else
{
*pucData = ((unsigned char)lColor);
pucData++;
}
pucDataMask += 3;
}
for (j = 0; j < nPadding; j++)
{
pucData++;
pucDataMask++;
}
}
//
// Create a new bitmap and set the modified bits
//
wxBitmap vNewBmp( rBmp.GetWidth()
,rBmp.GetHeight()
,24
);
HBITMAP hNewBmp = (HBITMAP)vNewBmp.GetHBITMAP();
if ((hOldBitmap = ::GpiSetBitmap(hPS, hNewBmp)) == HBM_ERROR)
{
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
}
if ((lScansSet = ::GpiSetBitmapBits( hPS
,0L
,(LONG)rBmp.GetHeight()
,(PBYTE)pucBits
,&vInfo
)) == GPI_ALTERROR)
{
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
}
wxMask* pNewMask;
pNewMask = new wxMask(pMask->GetMaskBitmap());
vNewBmp.SetMask(pNewMask);
free(pucBits);
::GpiSetBitmap(hPS, NULLHANDLE);
::GpiDestroyPS(hPS);
::DevCloseDC(hDC);
if (vNewBmp.Ok())
return(vNewBmp);
return(wxNullBitmap);
} // end of wxDisableBitmap
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// private classes // private classes
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

218
src/os2/utils.cpp
View File

@@ -1303,3 +1303,221 @@ void wxOS2SetFont(
} }
::WinSetPresParam(hWnd, PP_FONTNAMESIZE, strlen(zFont) + 1, (PVOID)zFont); ::WinSetPresParam(hWnd, PP_FONTNAMESIZE, strlen(zFont) + 1, (PVOID)zFont);
} // end of wxOS2SetFont } // end of wxOS2SetFont
// ---------------------------------------------------------------------------
// Helper for taking a regular bitmap and giving it a disabled look
// ---------------------------------------------------------------------------
wxBitmap wxDisableBitmap(
const wxBitmap& rBmp
, long lColor
)
{
wxMask* pMask = rBmp.GetMask();
if (!pMask)
return(wxNullBitmap);
DEVOPENSTRUC vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L};
SIZEL vSize = {0, 0};
HDC hDC = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE);
HPS hPS = ::GpiCreatePS(vHabmain, hDC, &vSize, PU_PELS | GPIA_ASSOC);
BITMAPINFOHEADER2 vHeader;
BITMAPINFO2 vInfo;
ERRORID vError;
wxString sError;
HBITMAP hBitmap = (HBITMAP)rBmp.GetHBITMAP();
HBITMAP hOldBitmap = NULLHANDLE;
HBITMAP hOldMask = NULLHANDLE;
HBITMAP hMask = (HBITMAP)rBmp.GetMask()->GetMaskBitmap();
unsigned char* pucBits; // buffer that will contain the bitmap data
unsigned char* pucData; // pointer to use to traverse bitmap data
unsigned char* pucBitsMask; // buffer that will contain the mask data
unsigned char* pucDataMask; // pointer to use to traverse mask data
LONG lScans = 0L;
LONG lScansSet = 0L;
bool bpp16 = (wxDisplayDepth() == 16);
memset(&vHeader, '\0', 16);
vHeader.cbFix = 16;
memset(&vInfo, '\0', 16);
vInfo.cbFix = 16;
vInfo.cx = (ULONG)rBmp.GetWidth();
vInfo.cy = (ULONG)rBmp.GetHeight();
vInfo.cPlanes = 1;
vInfo.cBitCount = 24; // Set to desired count going in
//
// Create the buffers for data....all wxBitmaps are 24 bit internally
//
int nBytesPerLine = rBmp.GetWidth() * 3;
int nSizeDWORD = sizeof(DWORD);
int nLineBoundary = nBytesPerLine % nSizeDWORD;
int nPadding = 0;
int i;
int j;
//
// Bitmap must be ina double-word alligned address so we may
// have some padding to worry about
//
if (nLineBoundary > 0)
{
nPadding = nSizeDWORD - nLineBoundary;
nBytesPerLine += nPadding;
}
pucBits = (unsigned char *)malloc(nBytesPerLine * rBmp.GetHeight());
memset(pucBits, '\0', (nBytesPerLine * rBmp.GetHeight()));
pucBitsMask = (unsigned char *)malloc(nBytesPerLine * rBmp.GetHeight());
memset(pucBitsMask, '\0', (nBytesPerLine * rBmp.GetHeight()));
//
// Extract the bitmap and mask data
//
if ((hOldBitmap = ::GpiSetBitmap(hPS, hBitmap)) == HBM_ERROR)
{
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
}
::GpiQueryBitmapInfoHeader(hBitmap, &vHeader);
vInfo.cBitCount = 24;
if ((lScans = ::GpiQueryBitmapBits( hPS
,0L
,(LONG)rBmp.GetHeight()
,(PBYTE)pucBits
,&vInfo
)) == GPI_ALTERROR)
{
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
}
if ((hOldMask = ::GpiSetBitmap(hPS, hMask)) == HBM_ERROR)
{
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
}
::GpiQueryBitmapInfoHeader(hMask, &vHeader);
vInfo.cBitCount = 24;
if ((lScans = ::GpiQueryBitmapBits( hPS
,0L
,(LONG)rBmp.GetHeight()
,(PBYTE)pucBitsMask
,&vInfo
)) == GPI_ALTERROR)
{
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
}
if (( hMask = ::GpiSetBitmap(hPS, hOldMask)) == HBM_ERROR)
{
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
}
pucData = pucBits;
pucDataMask = pucBitsMask;
//
// Get the mask value
//
for (i = 0; i < rBmp.GetHeight(); i++)
{
for (j = 0; j < rBmp.GetWidth(); j++)
{
// Byte 1
if (bpp16 && *pucDataMask == 0xF8) // 16 bit display gobblygook
{
*pucData = 0x7F;
pucData++;
}
else if (*pucDataMask == 0xFF) // set to grey
{
*pucData = 0x7F;
pucData++;
}
else
{
*pucData = ((unsigned char)(lColor >> 16));
pucData++;
}
// Byte 2
if (bpp16 && *(pucDataMask + 1) == 0xFC) // 16 bit display gobblygook
{
*pucData = 0x7F;
pucData++;
}
else if (*(pucDataMask + 1) == 0xFF) // set to grey
{
*pucData = 0x7F;
pucData++;
}
else
{
*pucData = ((unsigned char)(lColor >> 8));
pucData++;
}
// Byte 3
if (bpp16 && *(pucDataMask + 2) == 0xF8) // 16 bit display gobblygook
{
*pucData = 0x7F;
pucData++;
}
else if (*(pucDataMask + 2) == 0xFF) // set to grey
{
*pucData = 0x7F;
pucData++;
}
else
{
*pucData = ((unsigned char)lColor);
pucData++;
}
pucDataMask += 3;
}
for (j = 0; j < nPadding; j++)
{
pucData++;
pucDataMask++;
}
}
//
// Create a new bitmap and set the modified bits
//
wxBitmap vNewBmp( rBmp.GetWidth()
,rBmp.GetHeight()
,24
);
HBITMAP hNewBmp = (HBITMAP)vNewBmp.GetHBITMAP();
if ((hOldBitmap = ::GpiSetBitmap(hPS, hNewBmp)) == HBM_ERROR)
{
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
}
if ((lScansSet = ::GpiSetBitmapBits( hPS
,0L
,(LONG)rBmp.GetHeight()
,(PBYTE)pucBits
,&vInfo
)) == GPI_ALTERROR)
{
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
}
wxMask* pNewMask;
pNewMask = new wxMask(pMask->GetMaskBitmap());
vNewBmp.SetMask(pNewMask);
free(pucBits);
::GpiSetBitmap(hPS, NULLHANDLE);
::GpiDestroyPS(hPS);
::DevCloseDC(hDC);
if (vNewBmp.Ok())
return(vNewBmp);
return(wxNullBitmap);
} // end of wxDisableBitmap

26
src/os2/wx23.def
View File

@@ -4,7 +4,7 @@ DATA MULTIPLE NONSHARED READWRITE LOADONCALL
CODE LOADONCALL CODE LOADONCALL
EXPORTS EXPORTS
;From library: H:\DEV\WX2\WXWINDOWS\LIB\wx.lib ;From library: F:\DEV\WX2\WXWINDOWS\LIB\WX.lib
;From object file: dummy.cpp ;From object file: dummy.cpp
;PUBDEFs (Symbols available from object file): ;PUBDEFs (Symbols available from object file):
wxDummyChar wxDummyChar
@@ -1963,7 +1963,7 @@ EXPORTS
wxEVT_NC_LEFT_DCLICK wxEVT_NC_LEFT_DCLICK
wxEVT_INIT_DIALOG wxEVT_INIT_DIALOG
wxEVT_COMMAND_SET_FOCUS wxEVT_COMMAND_SET_FOCUS
;From object file: H:\DEV\WX2\WXWINDOWS\src\common\extended.c ;From object file: F:\DEV\WX2\WXWINDOWS\src\common\extended.c
;PUBDEFs (Symbols available from object file): ;PUBDEFs (Symbols available from object file):
ConvertToIeeeExtended ConvertToIeeeExtended
ConvertFromIeeeExtended ConvertFromIeeeExtended
@@ -6246,7 +6246,7 @@ EXPORTS
Read32__17wxTextInputStreamFv Read32__17wxTextInputStreamFv
;wxTextInputStream::SkipIfEndOfLine(char) ;wxTextInputStream::SkipIfEndOfLine(char)
SkipIfEndOfLine__17wxTextInputStreamFc SkipIfEndOfLine__17wxTextInputStreamFc
;From object file: H:\DEV\WX2\WXWINDOWS\src\common\unzip.c ;From object file: F:\DEV\WX2\WXWINDOWS\src\common\unzip.c
;PUBDEFs (Symbols available from object file): ;PUBDEFs (Symbols available from object file):
unzReadCurrentFile unzReadCurrentFile
unzGetCurrentFileInfo unzGetCurrentFileInfo
@@ -11735,23 +11735,23 @@ EXPORTS
SetMask__8wxBitmapFP6wxMask SetMask__8wxBitmapFP6wxMask
;From object file: ..\os2\bmpbuttn.cpp ;From object file: ..\os2\bmpbuttn.cpp
;PUBDEFs (Symbols available from object file): ;PUBDEFs (Symbols available from object file):
;wxBitmapButton::DrawFace(unsigned long,int,int,int,int,unsigned long) ;wxBitmapButton::OS2OnDraw(void**)
DrawFace__14wxBitmapButtonFUliN32T1 OS2OnDraw__14wxBitmapButtonFPPv
;wxBitmapButton::SetBitmapLabel(const wxBitmap&) ;wxBitmapButton::DrawButtonFocus(wxClientDC&)
SetBitmapLabel__14wxBitmapButtonFRC8wxBitmap DrawButtonFocus__14wxBitmapButtonFR10wxClientDC
;wxBitmapButton::DrawFace(wxClientDC&,unsigned long)
DrawFace__14wxBitmapButtonFR10wxClientDCUl
__vft14wxBitmapButton8wxObject __vft14wxBitmapButton8wxObject
;wxBitmapButton::DrawButtonDisable(unsigned long,int,int,int,int,unsigned long)
DrawButtonDisable__14wxBitmapButtonFUliN32T1
;wxConstructorForwxBitmapButton() ;wxConstructorForwxBitmapButton()
wxConstructorForwxBitmapButton__Fv wxConstructorForwxBitmapButton__Fv
;wxBitmapButton::SetDefault() ;wxBitmapButton::SetDefault()
SetDefault__14wxBitmapButtonFv SetDefault__14wxBitmapButtonFv
;wxBitmapButton::Create(wxWindow*,int,const wxBitmap&,const wxPoint&,const wxSize&,long,const wxValidator&,const wxString&) ;wxBitmapButton::Create(wxWindow*,int,const wxBitmap&,const wxPoint&,const wxSize&,long,const wxValidator&,const wxString&)
Create__14wxBitmapButtonFP8wxWindowiRC8wxBitmapRC7wxPointRC6wxSizelRC11wxValidatorRC8wxString Create__14wxBitmapButtonFP8wxWindowiRC8wxBitmapRC7wxPointRC6wxSizelRC11wxValidatorRC8wxString
;wxBitmapButton::DrawButtonDisable(wxClientDC&,wxBitmap&)
DrawButtonDisable__14wxBitmapButtonFR10wxClientDCR8wxBitmap
;wxBitmapButton::sm_classwxBitmapButton ;wxBitmapButton::sm_classwxBitmapButton
sm_classwxBitmapButton__14wxBitmapButton sm_classwxBitmapButton__14wxBitmapButton
;wxBitmapButton::DrawButtonFocus(unsigned long,int,int,int,int,unsigned long)
DrawButtonFocus__14wxBitmapButtonFUliN32T1
;From object file: ..\os2\brush.cpp ;From object file: ..\os2\brush.cpp
;PUBDEFs (Symbols available from object file): ;PUBDEFs (Symbols available from object file):
;wxBrush::FreeResource(unsigned long) ;wxBrush::FreeResource(unsigned long)
@@ -14773,8 +14773,6 @@ EXPORTS
GetEventTable__9wxToolBarCFv GetEventTable__9wxToolBarCFv
;wxToolBar::CreateTool(int,const wxString&,const wxBitmap&,const wxBitmap&,wxItemKind,wxObject*,const wxString&,const wxString&) ;wxToolBar::CreateTool(int,const wxString&,const wxBitmap&,const wxBitmap&,wxItemKind,wxObject*,const wxString&,const wxString&)
CreateTool__9wxToolBarFiRC8wxStringRC8wxBitmapT310wxItemKindP8wxObjectN22 CreateTool__9wxToolBarFiRC8wxStringRC8wxBitmapT310wxItemKindP8wxObjectN22
;wxDisableBitmap(const wxBitmap&,long)
wxDisableBitmap__FRC8wxBitmapl
;wxConstructorForwxToolBar() ;wxConstructorForwxToolBar()
wxConstructorForwxToolBar__Fv wxConstructorForwxToolBar__Fv
;wxToolBar::m_bInitialized ;wxToolBar::m_bInitialized
@@ -14925,6 +14923,8 @@ EXPORTS
wxShell__FRC8wxString wxShell__FRC8wxString
;wxGetUserHome(const wxString&) ;wxGetUserHome(const wxString&)
wxGetUserHome__FRC8wxString wxGetUserHome__FRC8wxString
;wxDisableBitmap(const wxBitmap&,long)
wxDisableBitmap__FRC8wxBitmapl
;wxWriteResource(const wxString&,const wxString&,const wxString&,const wxString&) ;wxWriteResource(const wxString&,const wxString&,const wxString&,const wxString&)
wxWriteResource__FRC8wxStringN31 wxWriteResource__FRC8wxStringN31
;wxWriteResource(const wxString&,const wxString&,long,const wxString&) ;wxWriteResource(const wxString&,const wxString&,long,const wxString&)