Merge in from trunk r68684 - r69046

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

docs/doxygen/Doxyfile_inc

@@ -83,7 +83,10 @@ ALIASES += flag{1}="</div>\li <span class='flag'>\1</span>:<div class='flagDesc'
 ALIASES += endFlagTable="</div>\n"
 
 # creates appearance section: this should be used for all main GUI controls
+# that look different in different ports. genericAppearance can be used for the
+# controls that always look the same.
 ALIASES += appearance{1}="\htmlonly <br><div><span class='appearance'>Appearance:</span><br><table class='appearance'><tr><td><img src='wxmsw/\1' alt='wxMSW appearance' class='appearance'/></td><td><img src='wxgtk/\1' alt='wxGTK appearance' class='appearance'/></td><td><img src='wxmac/\1' alt='wxMac appearance' class='appearance'/></td></tr><tr><td>wxMSW appearance</td><td>wxGTK appearance</td><td>wxMac appearance</td></tr></table></div> \endhtmlonly"
+ALIASES += genericAppearance{1}="\htmlonly <br><div><span class='appearance'>Appearance:</span><br><table class='appearance'><tr><td><img src='generic/\1' alt='Generic appearance' class='appearance'/></td></tr></table></div> \endhtmlonly"
 
 # aliases for the creation of "named member groups"
 # USAGE: the first argument must not contain spaces and be a unique identifier 

docs/doxygen/mainpages/cat_classes.h

@@ -191,6 +191,7 @@ Controls that are not static can have wxValidator associated with them.
 @li wxTextCtrl: Single or multiline text editing control
 @li wxToggleButton: A button which stays pressed when clicked by user.
 @li wxTreeCtrl: Tree (hierarchy) control
+@li wxTreeListCtrl: Multi-column tree control with simple interface
 @li wxStaticBitmap: A control to display a bitmap
 @li wxStyledTextCtrl: A wxWidgets implementation of the Scintilla source code
     editing component for plain text editing.

docs/doxygen/mainpages/const_wxusedef.h

@@ -251,6 +251,7 @@ library:
 @itemdef{wxUSE_TOOLTIPS, Use wxToolTip class.}
 @itemdef{wxUSE_TREEBOOK, Use wxTreebook class.}
 @itemdef{wxUSE_TREECTRL, Use wxTreeCtrl class.}
+@itemdef{wxUSE_TREELISTCTRL, Use wxTreeListCtrl class.}
 @itemdef{wxUSE_TTM_WINDOWFROMPOINT, Obsolete, do not use.}
 @itemdef{wxUSE_URL, Use wxURL class.}
 @itemdef{wxUSE_URL_NATIVE, Use native support for some operations with wxURL.}

docs/doxygen/overviews/bitmap.h

@@ -70,7 +70,7 @@ wxBitmap bmp(wxBITMAP(bmpname));
 
 // which is roughly equivalent to the following
 #if defined(__WXMSW__) || defined(__WXPM__)
-    wxBitmap bmp("bmpname", wxBITMAP_TYPE_RESOURCE);
+    wxBitmap bmp("bmpname", wxBITMAP_TYPE_BMP_RESOURCE);
 #else // Unix
     wxBitmap bmp(bmpname_xpm, wxBITMAP_TYPE_XPM);
 #endif

docs/doxygen/overviews/xrc_format.h

@@ -526,6 +526,27 @@ controls cannot have children.
 @endTable
 
 
+@subsubsection xrc_wxanimationctrl wxBannerWindow
+
+@beginTable
+@hdr3col{property, type, description}
+@row3col{direction, @c wxLEFT|wxRIGHT|wxTOP|wxBOTTOM,
+    The side along which the banner will be positioned.}
+@row3col{bitmap, @ref overview_xrcformat_type_bitmap,
+    Bitmap to use as the banner background.}
+@row3col{title, @ref overview_xrcformat_type_text,
+    Banner title, should be single line.}
+@row3col{message, @ref overview_xrcformat_type_text,
+    Possibly multi-line banner message.}
+@row3col{gradient-start, @ref overview_xrcformat_type_colour,
+    Starting colour of the gradient used as banner background. Can't be used if
+    a valid bitmap is specified.}
+@row3col{gradient-end, @ref overview_xrcformat_type_colour,
+    End colour of the gradient used as banner background. Can't be used if
+    a valid bitmap is specified.}
+@endTable
+
+
 @subsubsection xrc_wxbitmapbutton wxBitmapButton
 
 @beginTable

docs/doxygen/regen.bat

@@ -7,6 +7,7 @@ REM readable.
 
 mkdir out 2>&1 >NUL
 mkdir out\html 2>&1 >NUL
+mkdir out\html\generic 2>&1 >NUL
 mkdir out\html\wxgtk 2>&1 >NUL
 mkdir out\html\wxmsw 2>&1 >NUL
 mkdir out\html\wxmac 2>&1 >NUL
@@ -17,6 +18,7 @@ REM custom aliases
 copy images\powered-by-wxwidgets.png out\html 2>&1 >NUL
 copy images\logo_*.png out\html 2>&1 >NUL
 copy images\tab_*.gif out\html 2>&1 >NUL
+copy images\generic\*.png out\html\generic 2>&1 >NUL
 copy images\wxgtk\*.png out\html\wxgtk 2>&1 >NUL
 copy images\wxmsw\*.png out\html\wxmsw 2>&1 >NUL
 copy images\wxmac\*.png out\html\wxmac 2>&1 >NUL

docs/doxygen/regen.sh

@@ -24,7 +24,7 @@ export WXWIDGETS=`cd ../.. && pwd`
 
 # prepare folders for the cp commands below
 mkdir -p out/html       # we need to copy files in this folder below
-mkdir -p out/html/wxmsw out/html/wxgtk out/html/wxmac
+mkdir -p out/html/generic out/html/wxmsw out/html/wxgtk out/html/wxmac
 
 # These are not automatically copied by Doxygen because they're not
 # used in doxygen documentation, only in our html footer and by our
@@ -35,6 +35,7 @@ cp images/tab_*.gif out/html
 cp images/wxmsw/*png out/html/wxmsw
 cp images/wxmac/*png out/html/wxmac
 cp images/wxgtk/*png out/html/wxgtk
+cp images/generic/*png out/html/generic
 cp wxwidgets.js out/html
 
 # these CSS are not automatically copied by Doxygen because they're