From: Bryan Petty Date: Tue, 4 Mar 2008 04:20:27 +0000 (+0000) Subject: Converted bitmaps to PNG (saving 600KB+), flattened any transparent PNGs in case... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/de2b67e6996decc38233075cb803cce0cfe80168 Converted bitmaps to PNG (saving 600KB+), flattened any transparent PNGs in case of incompatible browsers/printing, and renamed a number of images to indicate what page it's used on. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52297 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/docs/doxygen/htmlfooter.inc b/docs/doxygen/htmlfooter.inc index 3b93ff5c1b..06365b7411 100644 --- a/docs/doxygen/htmlfooter.inc +++ b/docs/doxygen/htmlfooter.inc @@ -8,7 +8,7 @@ - wxWidgets logo + wxWidgets logo diff --git a/docs/doxygen/images/alignv.bmp b/docs/doxygen/images/alignv.bmp deleted file mode 100644 index cee82bcfa4..0000000000 Binary files a/docs/doxygen/images/alignv.bmp and /dev/null differ diff --git a/docs/doxygen/images/alignv.png b/docs/doxygen/images/alignv.png new file mode 100644 index 0000000000..bcc182ca7a Binary files /dev/null and b/docs/doxygen/images/alignv.png differ diff --git a/docs/doxygen/images/border.bmp b/docs/doxygen/images/border.bmp deleted file mode 100644 index 92b490a87d..0000000000 Binary files a/docs/doxygen/images/border.bmp and /dev/null differ diff --git a/docs/doxygen/images/border.png b/docs/doxygen/images/border.png new file mode 100644 index 0000000000..d1a79f40cb Binary files /dev/null and b/docs/doxygen/images/border.png differ diff --git a/docs/doxygen/images/cont.bmp b/docs/doxygen/images/cont.bmp deleted file mode 100644 index 56bed6b028..0000000000 Binary files a/docs/doxygen/images/cont.bmp and /dev/null differ diff --git a/docs/doxygen/images/contbox.bmp b/docs/doxygen/images/contbox.bmp deleted file mode 100644 index 183b266e63..0000000000 Binary files a/docs/doxygen/images/contbox.bmp and /dev/null differ diff --git a/docs/doxygen/images/descent.bmp b/docs/doxygen/images/descent.bmp deleted file mode 100644 index 82f04cf191..0000000000 Binary files a/docs/doxygen/images/descent.bmp and /dev/null differ diff --git a/docs/doxygen/images/descent.png b/docs/doxygen/images/descent.png new file mode 100644 index 0000000000..af6278c2c2 Binary files /dev/null and b/docs/doxygen/images/descent.png differ diff --git a/docs/doxygen/images/grid1.bmp b/docs/doxygen/images/grid1.bmp deleted file mode 100644 index 100be252da..0000000000 Binary files a/docs/doxygen/images/grid1.bmp and /dev/null differ diff --git a/docs/doxygen/images/grid1.png b/docs/doxygen/images/grid1.png new file mode 100644 index 0000000000..3ac121bff7 Binary files /dev/null and b/docs/doxygen/images/grid1.png differ diff --git a/docs/doxygen/images/hello.bmp b/docs/doxygen/images/hello.bmp deleted file mode 100644 index 98fc776673..0000000000 Binary files a/docs/doxygen/images/hello.bmp and /dev/null differ diff --git a/docs/doxygen/images/indent.bmp b/docs/doxygen/images/indent.bmp deleted file mode 100644 index ddac2334f3..0000000000 Binary files a/docs/doxygen/images/indent.bmp and /dev/null differ diff --git a/docs/doxygen/images/indent.png b/docs/doxygen/images/indent.png new file mode 100644 index 0000000000..45ff3e774f Binary files /dev/null and b/docs/doxygen/images/indent.png differ diff --git a/docs/doxygen/images/main_wxlogo.png b/docs/doxygen/images/main_wxlogo.png new file mode 100644 index 0000000000..70aded2e9b Binary files /dev/null and b/docs/doxygen/images/main_wxlogo.png differ diff --git a/docs/doxygen/images/osxleopard_logo.png b/docs/doxygen/images/osxleopard_logo.png index 92000c4b40..c2f50db4f2 100644 Binary files a/docs/doxygen/images/osxleopard_logo.png and b/docs/doxygen/images/osxleopard_logo.png differ diff --git a/docs/doxygen/images/overview_html_cont.png b/docs/doxygen/images/overview_html_cont.png new file mode 100644 index 0000000000..cc4d20668b Binary files /dev/null and b/docs/doxygen/images/overview_html_cont.png differ diff --git a/docs/doxygen/images/overview_html_contbox.png b/docs/doxygen/images/overview_html_contbox.png new file mode 100644 index 0000000000..fb17984c54 Binary files /dev/null and b/docs/doxygen/images/overview_html_contbox.png differ diff --git a/docs/doxygen/images/overview_html_hello.png b/docs/doxygen/images/overview_html_hello.png new file mode 100644 index 0000000000..cd26c48fc3 Binary files /dev/null and b/docs/doxygen/images/overview_html_hello.png differ diff --git a/docs/doxygen/images/overview_sizer_00.png b/docs/doxygen/images/overview_sizer_00.png new file mode 100644 index 0000000000..26750c3590 Binary files /dev/null and b/docs/doxygen/images/overview_sizer_00.png differ diff --git a/docs/doxygen/images/overview_sizer_01.png b/docs/doxygen/images/overview_sizer_01.png new file mode 100644 index 0000000000..27786690bd Binary files /dev/null and b/docs/doxygen/images/overview_sizer_01.png differ diff --git a/docs/doxygen/images/overview_sizer_02.png b/docs/doxygen/images/overview_sizer_02.png new file mode 100644 index 0000000000..4635cd05a0 Binary files /dev/null and b/docs/doxygen/images/overview_sizer_02.png differ diff --git a/docs/doxygen/images/overview_sizer_03.png b/docs/doxygen/images/overview_sizer_03.png new file mode 100644 index 0000000000..359fdf6070 Binary files /dev/null and b/docs/doxygen/images/overview_sizer_03.png differ diff --git a/docs/doxygen/images/overview_sizer_04.png b/docs/doxygen/images/overview_sizer_04.png new file mode 100644 index 0000000000..dccfd3c3fc Binary files /dev/null and b/docs/doxygen/images/overview_sizer_04.png differ diff --git a/docs/doxygen/images/overview_sizer_05.png b/docs/doxygen/images/overview_sizer_05.png new file mode 100644 index 0000000000..4066f51b12 Binary files /dev/null and b/docs/doxygen/images/overview_sizer_05.png differ diff --git a/docs/doxygen/images/overview_sizer_06.png b/docs/doxygen/images/overview_sizer_06.png new file mode 100644 index 0000000000..e24a67e6f2 Binary files /dev/null and b/docs/doxygen/images/overview_sizer_06.png differ diff --git a/docs/doxygen/images/overview_sizer_07.png b/docs/doxygen/images/overview_sizer_07.png new file mode 100644 index 0000000000..006c0caa85 Binary files /dev/null and b/docs/doxygen/images/overview_sizer_07.png differ diff --git a/docs/doxygen/images/overview_sizer_08.png b/docs/doxygen/images/overview_sizer_08.png new file mode 100644 index 0000000000..63a50a681a Binary files /dev/null and b/docs/doxygen/images/overview_sizer_08.png differ diff --git a/docs/doxygen/images/overview_sizer_09.png b/docs/doxygen/images/overview_sizer_09.png new file mode 100644 index 0000000000..943d2ee1a9 Binary files /dev/null and b/docs/doxygen/images/overview_sizer_09.png differ diff --git a/docs/doxygen/images/overview_sizer_10.png b/docs/doxygen/images/overview_sizer_10.png new file mode 100644 index 0000000000..884807c2fa Binary files /dev/null and b/docs/doxygen/images/overview_sizer_10.png differ diff --git a/docs/doxygen/images/overview_sizer_11.png b/docs/doxygen/images/overview_sizer_11.png new file mode 100644 index 0000000000..f7f353c490 Binary files /dev/null and b/docs/doxygen/images/overview_sizer_11.png differ diff --git a/docs/doxygen/images/overview_splitter_3d.png b/docs/doxygen/images/overview_splitter_3d.png new file mode 100644 index 0000000000..de35ed394e Binary files /dev/null and b/docs/doxygen/images/overview_splitter_3d.png differ diff --git a/docs/doxygen/images/richtextctrl.bmp b/docs/doxygen/images/richtextctrl.bmp deleted file mode 100644 index 29bfb472fc..0000000000 Binary files a/docs/doxygen/images/richtextctrl.bmp and /dev/null differ diff --git a/docs/doxygen/images/sizer00.bmp b/docs/doxygen/images/sizer00.bmp deleted file mode 100644 index f9a1905a83..0000000000 Binary files a/docs/doxygen/images/sizer00.bmp and /dev/null differ diff --git a/docs/doxygen/images/sizer01.bmp b/docs/doxygen/images/sizer01.bmp deleted file mode 100644 index b5ae0f77c7..0000000000 Binary files a/docs/doxygen/images/sizer01.bmp and /dev/null differ diff --git a/docs/doxygen/images/sizer02.bmp b/docs/doxygen/images/sizer02.bmp deleted file mode 100644 index 1b68da9772..0000000000 Binary files a/docs/doxygen/images/sizer02.bmp and /dev/null differ diff --git a/docs/doxygen/images/sizer03.bmp b/docs/doxygen/images/sizer03.bmp deleted file mode 100644 index d093307dcb..0000000000 Binary files a/docs/doxygen/images/sizer03.bmp and /dev/null differ diff --git a/docs/doxygen/images/sizer04.bmp b/docs/doxygen/images/sizer04.bmp deleted file mode 100644 index 04df07073b..0000000000 Binary files a/docs/doxygen/images/sizer04.bmp and /dev/null differ diff --git a/docs/doxygen/images/sizer05.bmp b/docs/doxygen/images/sizer05.bmp deleted file mode 100644 index 9d90496173..0000000000 Binary files a/docs/doxygen/images/sizer05.bmp and /dev/null differ diff --git a/docs/doxygen/images/sizer06.bmp b/docs/doxygen/images/sizer06.bmp deleted file mode 100644 index ccc2e9f174..0000000000 Binary files a/docs/doxygen/images/sizer06.bmp and /dev/null differ diff --git a/docs/doxygen/images/sizer07.bmp b/docs/doxygen/images/sizer07.bmp deleted file mode 100644 index 4797967f24..0000000000 Binary files a/docs/doxygen/images/sizer07.bmp and /dev/null differ diff --git a/docs/doxygen/images/sizer08.bmp b/docs/doxygen/images/sizer08.bmp deleted file mode 100644 index 21040933bc..0000000000 Binary files a/docs/doxygen/images/sizer08.bmp and /dev/null differ diff --git a/docs/doxygen/images/sizer09.bmp b/docs/doxygen/images/sizer09.bmp deleted file mode 100644 index a29ca7601c..0000000000 Binary files a/docs/doxygen/images/sizer09.bmp and /dev/null differ diff --git a/docs/doxygen/images/sizer10.bmp b/docs/doxygen/images/sizer10.bmp deleted file mode 100644 index 0ddafc917e..0000000000 Binary files a/docs/doxygen/images/sizer10.bmp and /dev/null differ diff --git a/docs/doxygen/images/sizer11.bmp b/docs/doxygen/images/sizer11.bmp deleted file mode 100644 index ca7e6c428f..0000000000 Binary files a/docs/doxygen/images/sizer11.bmp and /dev/null differ diff --git a/docs/doxygen/images/splitter.bmp b/docs/doxygen/images/splitter.bmp deleted file mode 100644 index d5d50d0096..0000000000 Binary files a/docs/doxygen/images/splitter.bmp and /dev/null differ diff --git a/docs/doxygen/images/treetst.bmp b/docs/doxygen/images/treetst.bmp deleted file mode 100644 index fd6103035f..0000000000 Binary files a/docs/doxygen/images/treetst.bmp and /dev/null differ diff --git a/docs/doxygen/images/treetst.png b/docs/doxygen/images/treetst.png new file mode 100644 index 0000000000..5bd2adcb03 Binary files /dev/null and b/docs/doxygen/images/treetst.png differ diff --git a/docs/doxygen/images/win_logo.png b/docs/doxygen/images/win_logo.png index d15389a6cd..7b3c7ac5fb 100644 Binary files a/docs/doxygen/images/win_logo.png and b/docs/doxygen/images/win_logo.png differ diff --git a/docs/doxygen/images/wx.png b/docs/doxygen/images/wx.png deleted file mode 100644 index c4eb0d98bb..0000000000 Binary files a/docs/doxygen/images/wx.png and /dev/null differ diff --git a/docs/doxygen/images/wxtab1.bmp b/docs/doxygen/images/wxtab1.bmp deleted file mode 100644 index 754c02827e..0000000000 Binary files a/docs/doxygen/images/wxtab1.bmp and /dev/null differ diff --git a/docs/doxygen/images/wxtab1.png b/docs/doxygen/images/wxtab1.png new file mode 100644 index 0000000000..799ff28fe4 Binary files /dev/null and b/docs/doxygen/images/wxtab1.png differ diff --git a/docs/doxygen/images/x11_logo.png b/docs/doxygen/images/x11_logo.png index dc86d74037..e410276f08 100644 Binary files a/docs/doxygen/images/x11_logo.png and b/docs/doxygen/images/x11_logo.png differ diff --git a/docs/doxygen/mainpages/libs.h b/docs/doxygen/mainpages/libs.h index 432bd61e18..f905b81315 100644 --- a/docs/doxygen/mainpages/libs.h +++ b/docs/doxygen/mainpages/libs.h @@ -15,7 +15,7 @@ wxWidgets can be built either as a single large library (this is called a (multilib build). Multilib build is the default. wxWidgets library is divided into libraries briefly described below. This -diagram show dependencies between them: +diagram shows the dependencies between them: @dot digraph Dependancies diff --git a/docs/doxygen/mainpages/manual.h b/docs/doxygen/mainpages/manual.h index 37cd1a4112..857a03cd7e 100644 --- a/docs/doxygen/mainpages/manual.h +++ b/docs/doxygen/mainpages/manual.h @@ -13,7 +13,7 @@ @author Julian Smart, Robert Roebling, Vadim Zeitlin, Robin Dunn, et al @date February, 2008 - @image html wx.png + @image html main_wxlogo.png @section manual_contents Contents @li @subpage page_copyright diff --git a/docs/doxygen/overviews/html.h b/docs/doxygen/overviews/html.h index d20f5e3acb..56a2080d8d 100644 --- a/docs/doxygen/overviews/html.h +++ b/docs/doxygen/overviews/html.h @@ -12,7 +12,7 @@ The wxHTML library provides classes for parsing and displaying HTML. It is not intended to be a high-end HTML browser. If you are looking for - something like that try http://www.mozilla.org. + something like that try . wxHTML can be used as a generic rich text viewer - for example to display a nice About Box (like those of GNOME apps) or to display the result of @@ -244,8 +244,10 @@ Container is kind of cell that may contain sub-cells. Its size depends on number and sizes of its sub-cells (and also depends on width of window). - See wxHtmlContainerCell, wxHtmlCell::Layout. - This image shows the cells and containers: @image html contbox.bmp + See wxHtmlContainerCell, wxHtmlCell::Layout. This image shows the cells and + containers: + + @image html overview_html_contbox.png @subsection overview_html_cells_conttaghandler Using Containers in Tag Handler @@ -259,8 +261,9 @@ Use wxHtmlWinParser::CloseContainer to close the container. This doesn't create a new container with same depth level but it returns "control" - to the parent container. - See explanation: @image html cont.bmp + to the parent container. See explanation: + + @image html overview_html_cont.png There clearly must be same number of calls to OpenContainer as to CloseContainer. @@ -281,7 +284,9 @@ m_WParser -> OpenContainer(); @endcode - and here is image of the situation: @image html hello.bmp + and here is image of the situation: + + @image html overview_html_hello.png You can see that there was an opened container before the code was executed. We closed it, created our own container, then closed our container and opened diff --git a/docs/doxygen/overviews/richtextctrl.h b/docs/doxygen/overviews/richtextctrl.h index 14515089cb..c48d0578c3 100644 --- a/docs/doxygen/overviews/richtextctrl.h +++ b/docs/doxygen/overviews/richtextctrl.h @@ -89,10 +89,7 @@ You might mitigate this by providing the choice between wxTextCtrl and wxRichTextCtrl, with fewer features in the former case. A good way to understand wxRichTextCtrl's capabilities is to compile and run -the sample, @c samples/richtext, and browse the code. The following screenshot -shows the sample in action: - -@image html richtextctrl.bmp +the sample, @c samples/richtext, and browse the code. @section overview_richtextctrl_example Code Example diff --git a/docs/doxygen/overviews/sizer.h b/docs/doxygen/overviews/sizer.h index b7599dc106..3fcbfcadb9 100644 --- a/docs/doxygen/overviews/sizer.h +++ b/docs/doxygen/overviews/sizer.h @@ -84,11 +84,11 @@ don't have any natural width or height and thus require an explicit size. Some controls can calculate their height, but not their width (e.g. a single line text control): -@image html sizer03.bmp +@image html overview_sizer_03.png -@image html sizer04.bmp +@image html overview_sizer_04.png -@image html sizer05.bmp +@image html overview_sizer_05.png A border: The border is just empty space and is used to separate dialog items in a dialog. This border can either be all around, or at any combination @@ -97,11 +97,11 @@ must be set explicitly, typically 5 points. The following samples show dialogs with only one dialog item (a button) and a border of 0, 5, and 10 pixels around the button: -@image html sizer00.bmp +@image html overview_sizer_00.png -@image html sizer01.bmp +@image html overview_sizer_01.png -@image html sizer02.bmp +@image html overview_sizer_02.png An alignment: Often, a dialog item is given more space than its minimal size plus its border. Depending on what flags are used for the respective @@ -112,7 +112,7 @@ space. The following sample shows a listbox and three buttons in a horizontal box sizer; one button is centred, one is aligned at the top, one is aligned at the bottom: -@image html sizer06.bmp +@image html overview_sizer_06.png A stretch factor: If a sizer contains more than one child and it is offered more space than its children and their borders need, the question @@ -127,7 +127,7 @@ other or not. The following sample shows a dialog with three buttons, the first one has a stretch factor of 1 and thus gets stretched, whereas the other two buttons have a stretch factor of zero and keep their initial width: -@image html sizer07.bmp +@image html overview_sizer_07.png Within wxDesigner, this stretch factor gets set from the @e Option menu. @@ -157,14 +157,14 @@ horizontal box sizer, the stretch factor determines how much the child can be stretched horizontally. The following sample shows the same dialog as in the last sample, only the box sizer is a vertical box sizer now: -@image html sizer08.bmp +@image html overview_sizer_08.png @subsection overview_sizer_hiding_static wxStaticBoxSizer wxStaticBoxSixer is the same as a wxBoxSizer, but surrounded by a static box. Here is a sample: -@image html sizer09.bmp +@image html overview_sizer_09.png @subsection overview_sizer_hiding_grid wxGridSizer @@ -174,7 +174,7 @@ control in the left bottom border. Either the number of columns or the number or rows is fixed and the grid sizer will grow in the respectively other orientation if new children are added: -@image html sizer10.bmp +@image html overview_sizer_10.png For programming information, see wxGridSizer. @@ -187,7 +187,7 @@ and rows can be declared to be stretchable if the sizer is assigned a size different from the one it requested. The following sample shows the same dialog as the one above, but using a flex grid sizer: -@image html sizer11.bmp +@image html overview_sizer_11.png @section overview_sizer_box Programming with wxBoxSizer diff --git a/docs/doxygen/overviews/splitterwindow.h b/docs/doxygen/overviews/splitterwindow.h index 401f4fb831..148ae0e320 100644 --- a/docs/doxygen/overviews/splitterwindow.h +++ b/docs/doxygen/overviews/splitterwindow.h @@ -25,7 +25,7 @@ horizontal split. The style wxSP_3D has been used to show a 3D border and 3D sash. -@image html splitter.bmp +@image html overview_splitter_3d.png @section overview_splitterwindow_example Example