A couple of changes to wxImage:

[wxWidgets.git] / docs / latex / wx / bbutton.tex

diff --git a/docs/latex/wx/bbutton.tex b/docs/latex/wx/bbutton.tex
index 4aa48eeba7c96905d59cdc2fffeceb4883195cee..14d993ffe5fc624b199318c267626d81aed125b0 100644 (file)
--- a/docs/latex/wx/bbutton.tex
+++ b/docs/latex/wx/bbutton.tex
@@ -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
 
 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}
 
 
 \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
 \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}.
 \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}
 
 
 \membersection{wxBitmapButton::GetBitmapDisabled}\label{wxbitmapbuttongetbitmapdisabled}
 

-\constfunc{wxBitmap\&}{GetBitmapLabel}{\void}
+\constfunc{wxBitmap\&}{GetBitmapDisabled}{\void}

 
 Returns the bitmap for the disabled state.
 
 
 Returns the bitmap for the disabled state.
 


@@ -131,11 +135,11 @@ A reference to the disabled state bitmap.
 
 \constfunc{wxBitmap\&}{GetBitmapFocus}{\void}
 
 
 \constfunc{wxBitmap\&}{GetBitmapFocus}{\void}
 

-Returns the bitmap for the focussed state.
+Returns the bitmap for the focused state.

 
 \wxheading{Return value}
 
 
 \wxheading{Return value}
 

-A reference to the focussed state bitmap.
+A reference to the focused state bitmap.

 
 \wxheading{See also}
 
 
 \wxheading{See also}