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

Include wx/wx/bmpbuttn.h according to precompiled headers of wx/wx.h (with other minor cleaning).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-05-26 18:47:45 +00:00
parent 45dc66f8e2
commit 910b005366
8 changed files with 35 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/os2/bmpbuttn.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: bmpbuttn.cpp
// Name: src/os2/bmpbuttn.cpp
// Purpose: wxBitmapButton
// Author: David Webster
// Modified by:
@@ -14,8 +14,9 @@
#if wxUSE_BMPBUTTON
#ifndef WX_PRECOMP
#include "wx/bmpbuttn.h"
#ifndef WX_PRECOMP
#endif
#include "wx/os2/private.h"
@@ -52,20 +53,20 @@ bool wxBitmapButton::Create( wxWindow* pParent,
m_marginY = wxDEFAULT_BUTTON_MARGIN;
}
int nX = rPos.x;
int nY = rPos.y;
int nWidth = rSize.x;
int nHeight = rSize.y;
int nX = rPos.x;
int nY = rPos.y;
int nWidth = rSize.x;
int nHeight = rSize.y;
if (vId == -1)
if (vId == wxID_ANY)
m_windowId = NewControlId();
else
m_windowId = vId;
if (nWidth == -1 && rBitmap.Ok())
if (nWidth == wxDefaultCoord && rBitmap.Ok())
nWidth = rBitmap.GetWidth() + 4 * m_marginX;
if (nHeight == -1 && rBitmap.Ok())
if (nHeight == wxDefaultCoord && rBitmap.Ok())
nHeight = rBitmap.GetHeight() + 4 * m_marginY;
ULONG ulOS2Style = WS_VISIBLE | WS_TABSTOP | BS_USERBUTTON;
@@ -100,15 +101,15 @@ bool wxBitmapButton::Create( wxWindow* pParent,
bool wxBitmapButton::OS2OnDraw( WXDRAWITEMSTRUCT* pItem)
{
PUSERBUTTON pUser = (PUSERBUTTON)pItem;
bool bAutoDraw = (GetWindowStyleFlag() & wxBU_AUTODRAW) != 0;
PUSERBUTTON pUser = (PUSERBUTTON)pItem;
bool bAutoDraw = (GetWindowStyleFlag() & wxBU_AUTODRAW) != 0;
if (!pUser)
return FALSE;
return false;
wxBitmap* pBitmap;
bool bIsSelected = pUser->fsState & BDS_HILITED;
wxClientDC vDc(this);
wxBitmap* pBitmap;
bool bIsSelected = pUser->fsState & BDS_HILITED;
wxClientDC vDc(this);
if (bIsSelected && m_bmpSelected.Ok())
pBitmap = &m_bmpSelected;
@@ -120,7 +121,7 @@ bool wxBitmapButton::OS2OnDraw( WXDRAWITEMSTRUCT* pItem)
pBitmap = &m_bmpNormal;
if (!pBitmap->Ok() )
return FALSE;
return false;
//