AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/cocoa/bmpbuttn.mm
View File

@ -13,8 +13,9 @@
#if wxUSE_BMPBUTTON #if wxUSE_BMPBUTTON
#include "wx/bmpbuttn.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/bmpbuttn.h"
#include "wx/log.h" #include "wx/log.h"
#endif #endif

2
src/generic/dirdlgg.cpp
View File

@ -26,13 +26,13 @@
#include "wx/intl.h" #include "wx/intl.h"
#include "wx/log.h" #include "wx/log.h"
#include "wx/msgdlg.h" #include "wx/msgdlg.h"
#include "wx/bmpbuttn.h"
#endif #endif
#include "wx/statline.h" #include "wx/statline.h"
#include "wx/dirctrl.h" #include "wx/dirctrl.h"
#include "wx/generic/dirdlgg.h" #include "wx/generic/dirdlgg.h"
#include "wx/artprov.h" #include "wx/artprov.h"
#include "wx/bmpbuttn.h"
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// constants // constants

2
src/generic/filedlgg.cpp
View File

@ -29,6 +29,7 @@
#include "wx/settings.h" #include "wx/settings.h"
#include "wx/log.h" #include "wx/log.h"
#include "wx/msgdlg.h" #include "wx/msgdlg.h"
#include "wx/bmpbuttn.h"
#endif #endif
#include "wx/checkbox.h" #include "wx/checkbox.h"
@ -38,7 +39,6 @@
#include "wx/stattext.h" #include "wx/stattext.h"
#include "wx/longlong.h" #include "wx/longlong.h"
#include "wx/sizer.h" #include "wx/sizer.h"
#include "wx/bmpbuttn.h"
#include "wx/tokenzr.h" #include "wx/tokenzr.h"
#include "wx/config.h" #include "wx/config.h"
#include "wx/imaglist.h" #include "wx/imaglist.h"

3
src/msw/bmpbuttn.cpp
View File

@ -18,8 +18,9 @@
#if wxUSE_BMPBUTTON #if wxUSE_BMPBUTTON
#include "wx/bmpbuttn.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/bmpbuttn.h"
#include "wx/log.h" #include "wx/log.h"
#include "wx/dcmemory.h" #include "wx/dcmemory.h"
#endif #endif

33
src/os2/bmpbuttn.cpp
View File

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

4
src/palmos/bmpbuttn.cpp
View File

@ -18,8 +18,9 @@
#if wxUSE_BMPBUTTON #if wxUSE_BMPBUTTON
#include "wx/bmpbuttn.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/bmpbuttn.h"
#include "wx/log.h" #include "wx/log.h"
#include "wx/dcmemory.h" #include "wx/dcmemory.h"
#endif #endif
@ -127,4 +128,3 @@ wxSize wxBitmapButton::DoGetBestSize() const
} }
#endif // wxUSE_BMPBUTTON #endif // wxUSE_BMPBUTTON

6
src/univ/bmpbuttn.cpp
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: univ/bmpbuttn.cpp // Name: src/univ/bmpbuttn.cpp
// Purpose: wxBitmapButton implementation // Purpose: wxBitmapButton implementation
// Author: Vadim Zeitlin // Author: Vadim Zeitlin
// Modified by: // Modified by:
@ -25,9 +25,10 @@
#if wxUSE_BMPBUTTON #if wxUSE_BMPBUTTON
#include "wx/bmpbuttn.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/dc.h" #include "wx/dc.h"
#include "wx/bmpbuttn.h"
#include "wx/validate.h" #include "wx/validate.h"
#endif #endif
@ -154,4 +155,3 @@ void wxBitmapButton::Release()
} }
#endif // wxUSE_BMPBUTTON #endif // wxUSE_BMPBUTTON

11
src/xrc/xh_bmpbt.cpp
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: xh_bmpbt.cpp // Name: src/xrc/xh_bmpbt.cpp
// Purpose: XRC resource for bitmap buttons // Purpose: XRC resource for bitmap buttons
// Author: Brian Gavin // Author: Brian Gavin
// Created: 2000/09/09 // Created: 2000/09/09
@ -15,10 +15,13 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#if wxUSE_XRC #if wxUSE_XRC && wxUSE_BMPBUTTON
#include "wx/xrc/xh_bmpbt.h" #include "wx/xrc/xh_bmpbt.h"
#include "wx/bmpbuttn.h"
#ifndef WX_PRECOMP
#include "wx/bmpbuttn.h"
#endif
IMPLEMENT_DYNAMIC_CLASS(wxBitmapButtonXmlHandler, wxXmlResourceHandler) IMPLEMENT_DYNAMIC_CLASS(wxBitmapButtonXmlHandler, wxXmlResourceHandler)
@ -64,4 +67,4 @@ bool wxBitmapButtonXmlHandler::CanHandle(wxXmlNode *node)
return IsOfClass(node, wxT("wxBitmapButton")); return IsOfClass(node, wxT("wxBitmapButton"));
} }
#endif // wxUSE_XRC #endif // wxUSE_XRC && wxUSE_BMPBUTTON