GetSocketManager() has no GUI-specific version under Darwin finally

[wxWidgets.git] / interface / bitmap.h

diff --git a/interface/bitmap.h b/interface/bitmap.h
index 1de90974addef1c5563a4a815330e09dbc2b1409..41fa0c644b8b75c2e5ca25663d658c6349eac683 100644 (file)
--- a/interface/bitmap.h
+++ b/interface/bitmap.h
@@ -95,6 +95,10 @@ public:
             The meaning of name is determined by the type parameter.
         @param type
             See ::wxBitmapType for values this can take.
             The meaning of name is determined by the type parameter.
         @param type
             See ::wxBitmapType for values this can take.

+        @param desiredWidth
+            The desired width for the loaded bitmap.
+        @param desiredHeight
+            The desired height for the loaded bitmap.

 
         @returns @true if the operation succeeded, @false otherwise.
 
 
         @returns @true if the operation succeeded, @false otherwise.
 


@@ -120,7 +124,7 @@ public:
         @see wxBitmap::LoadFile, wxBitmap::SaveFile, LoadFile()
     */
     virtual bool SaveFile(const wxBitmap* bitmap, const wxString& name, wxBitmapType type,
         @see wxBitmap::LoadFile, wxBitmap::SaveFile, LoadFile()
     */
     virtual bool SaveFile(const wxBitmap* bitmap, const wxString& name, wxBitmapType type,

-                          wxPalette* palette = NULL) const;
+                          const wxPalette* palette = NULL) const;

 
     /**
         Sets the handler extension.
 
     /**
         Sets the handler extension.


@@ -154,6 +158,11 @@ public:
 
     This class encapsulates the concept of a platform-dependent bitmap,
     either monochrome or colour or colour with alpha channel support.
 
     This class encapsulates the concept of a platform-dependent bitmap,
     either monochrome or colour or colour with alpha channel support.

+    
+    If you need direct access the bitmap data instead going through
+    drawing to it using wxMemoryDC you need to use the wxPixelData
+    class (either wxNativePixelData for RGB bitmaps or wxAlphaPixelData
+    for bitmaps with an additionaly alpha channel).

 
     @note
     Many wxBitmap functions take a @e type parameter, which is a value of the
 
     @note
     Many wxBitmap functions take a @e type parameter, which is a value of the


@@ -174,7 +183,7 @@ public:
     ::wxNullBitmap
 
     @see @ref overview_bitmap, @ref overview_bitmap_supportedformats,
     ::wxNullBitmap
 
     @see @ref overview_bitmap, @ref overview_bitmap_supportedformats,

-         wxDC::Blit, wxIcon, wxCursor, wxBitmap, wxMemoryDC
+         wxDC::Blit, wxIcon, wxCursor, wxMemoryDC, wxImage, wxPixelData

 */
 class wxBitmap : public wxGDIObject
 {
 */
 class wxBitmap : public wxGDIObject
 {