merged 2.2 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -20,7 +20,7 @@ almost any other window.
|
||||
|
||||
A bitmap button can be supplied with a single bitmap, and wxWindows will draw
|
||||
all button states using this bitmap. If the application needs more control, additional bitmaps for
|
||||
the selected state, unpressed focussed state, and greyed-out state may be supplied.
|
||||
the selected state, unpressed focused state, and greyed-out state may be supplied.
|
||||
|
||||
\wxheading{Window styles}
|
||||
|
||||
@@ -29,7 +29,11 @@ the selected state, unpressed focussed state, and greyed-out state may be suppli
|
||||
\twocolitem{\windowstyle{wxBU\_AUTODRAW}}{If
|
||||
this is specified, the button will be drawn automatically using the label bitmap only, providing
|
||||
a 3D-look border. If this style is not specified, the button will be drawn without borders and using all
|
||||
provided bitmaps.}
|
||||
provided bitmaps. WIN32 only.}
|
||||
\twocolitem{\windowstyle{wxBU\_LEFT}}{Left-justifies the bitmap label. WIN32 only.}
|
||||
\twocolitem{\windowstyle{wxBU\_TOP}}{Aligns the bitmap label to the top of the button. WIN32 only.}
|
||||
\twocolitem{\windowstyle{wxBU\_RIGHT}}{Right-justifies the bitmap label. WIN32 only.}
|
||||
\twocolitem{\windowstyle{wxBU\_BOTTOM}}{Aligns the bitmap label to the bottom of the button. WIN32 only.}
|
||||
\end{twocollist}
|
||||
|
||||
See also \helpref{window styles overview}{windowstyles}.
|
||||
@@ -115,7 +119,7 @@ Button creation function for two-step creation. For more details, see \helpref{w
|
||||
|
||||
\membersection{wxBitmapButton::GetBitmapDisabled}\label{wxbitmapbuttongetbitmapdisabled}
|
||||
|
||||
\constfunc{wxBitmap\&}{GetBitmapLabel}{\void}
|
||||
\constfunc{wxBitmap\&}{GetBitmapDisabled}{\void}
|
||||
|
||||
Returns the bitmap for the disabled state.
|
||||
|
||||
@@ -131,11 +135,11 @@ A reference to the disabled state bitmap.
|
||||
|
||||
\constfunc{wxBitmap\&}{GetBitmapFocus}{\void}
|
||||
|
||||
Returns the bitmap for the focussed state.
|
||||
Returns the bitmap for the focused state.
|
||||
|
||||
\wxheading{Return value}
|
||||
|
||||
A reference to the focussed state bitmap.
|
||||
A reference to the focused state bitmap.
|
||||
|
||||
\wxheading{See also}
|
||||
|
||||
|
Reference in New Issue
Block a user