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:
Bryan Petty
2000-07-15 19:51:35 +00:00
parent 8a693e6e04
commit f6bcfd974e
1835 changed files with 237729 additions and 67990 deletions

View File

@@ -80,7 +80,7 @@ it to wxBitmap form. Note that using wxImage is the preferred way to
load images in wxWindows, with the exception of resources (XPM-files or
native Windows resources). Writing an image format handler for wxImage
is also far easier than writing one for wxBitmap, because wxImage has
exactly one format on all platforms wheras wxBitmap can store pixel data
exactly one format on all platforms whereas wxBitmap can store pixel data
very differently, depending on colour depths and platform.
\wxheading{wxBitmap}