Fixed wxToolBar for WinCE so normal bitmaps can be used;

no longer uses standard buttons.
wxToolBar under Smartphone no longer tries to create
buttons since a toolbar makes no sense on this platform.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

docs/latex/wx/toolbar.tex

@@ -6,14 +6,11 @@ The name wxToolBar is defined to be a synonym for one of the following classes:
 \item {\bf wxToolBar95} The native Windows 95 toolbar. Used on Windows 95, NT 4 and above.
 \item {\bf wxToolBarMSW} A Windows implementation. Used on 16-bit Windows.
 \item {\bf wxToolBarGTK} The GTK toolbar.
-\item {\bf wxToolBarSimple} A simple implementation, with scrolling.
-Used on platforms with no native toolbar control, or where scrolling is required.
 \end{itemize}
 
 Note that the base class {\bf wxToolBarBase} defines
 automatic scrolling management functionality which is similar
 to \helpref{wxScrolledWindow}{wxscrolledwindow}, so please refer to this class also.
-Not all toolbars support scrolling, but wxToolBarSimple does.
 
 \wxheading{Derived from}
 
@@ -29,7 +26,6 @@ wxToolBarBase\\
 <wx/tbarbase.h> (the base class)\\
 <wx/tbarmsw.h> (the non-Windows 95 Windows toolbar class)\\
 <wx/tbar95.h> (the Windows 95/98 toolbar class)\\
-<wx/tbarsmpl.h> (the generic simple toolbar class)
 
 \wxheading{Remarks}
 
@@ -206,7 +202,7 @@ Adds a separator for spacing groups of tools.
 Adds a tool to the toolbar. The first (short and most commonly used) version
 has fewer parameters than the full version at the price of not being able to
 specify some of the more rarely used button features. The last version allows
-to add an existing tool.
+you to add an existing tool.
 
 \wxheading{Parameters}
 
@@ -332,8 +328,7 @@ Enables or disables the tool.
 
 \wxheading{Remarks}
 
-For wxToolBarSimple, does nothing. Some other implementations
-will change the visible state of the tool to indicate that it is disabled.
+Some implementations will change the visible state of the tool to indicate that it is disabled.
 
 \wxheading{See also}
 
@@ -660,6 +655,13 @@ change to take place, it will happen immediately.
 
 \helpref{DeleteTool}{wxtoolbardeletetool}
 
+\membersection{wxToolBar::SetBitmapResource}\label{wxtoolbarsetbitmapresource}
+
+\func{void}{SetBitmapResource}{\param{int }{resourceId}}
+
+Sets the bitmap resource identifier for specifying tool bitmaps as indices
+into a custom bitmap. Windows CE only.
+
 \membersection{wxToolBar::SetMargins}\label{wxtoolbarsetmargins}
 
 \func{void}{SetMargins}{\param{const wxSize\&}{ size}}

docs/latex/wx/wxmsw.tex

@@ -123,17 +123,13 @@ implemented in the future for PocketPC.
 
 Menubars and toolbars can only be implemented using a combined control,
 but you can use the same syntax as before; wxWidgets will combine the menubar
-and toolbar. However, you cannot at present use arbitrary toolbar bitmaps
-(since they have to be loaded from a Windows resource), so only standard
-identifiers will work (wxID\_OPEN, wxID\_SAVE, wxID\_COPY and so on).
-
-The wxWidgets API doesn't currently provide us with a method of passing resource
-identifiers to AddTool, which is something that needs to be addressed.
+and toolbar.
 
 On PocketPC, a frame must always have a menubar, even if it's empty.
 
 On Smartphone, there are only two menu buttons, so a menubar is simulated
-using a nested menu on the right menu button.
+using a nested menu on the right menu button. Toolbars are simply ignored on
+Smartphone.
 
 \subsubsection{Closing windows in wxWinCE}
 
@@ -163,9 +159,6 @@ to be supported.
 
 \itemsep=0pt
 \begin{itemize}
-\item {\bf Custom toolbar buttons.} The bitmaps could be loaded from a resource
-named using the string normally used for a tool caption. Currently only buttons with
-standard identifiers can be used.
 \item {\bf Font dialog.} The generic font dialog is currently used, which
 needs to be simplified (and speeded up).
 \item {\bf Sizer speed.} Particularly for dialogs containing notebooks,
@@ -185,9 +178,10 @@ indicating that drawing works a bit differently between desktop and mobile versi
 Win32.
 \item {\bf wxStaticBitmap.} The About box in the "Life!" demo shows a bitmap that is
 the correct size on the emulator, but too small on a VGA Pocket Loox device.
+\item {\bf wxStaticLine.} Lines don't show up, and the documentation suggests that
+missing styles are implemented with WM\_PAINT.
 \item {\bf OK button.} We should allow the OK button on a dialog to be optional, perhaps
 by using wxCLOSE\_BOX to indicate when the OK button should be displayed.
-\item {\bf Data storage.} Methods for saving data on Smartphone need to be supported and documented.
 \item {\bf Dynamic adaptation.} We should probably be using run-time tests more
 than preprocessor tests, so that the same WinCE application can run on different
 versions of the operating system.