added selecting-while-dragging

[wxWidgets.git] / include / wx / msw / bitmap.h

diff --git a/include/wx/msw/bitmap.h b/include/wx/msw/bitmap.h
index e79dc0e9353319bf4f8ab61d62fb54b389061b87..c545d275ec321b5bf78d9bf0e08a75d39b3ce2d0 100644 (file)
--- a/include/wx/msw/bitmap.h
+++ b/include/wx/msw/bitmap.h
@@ -20,17 +20,18 @@
 #include "wx/gdicmn.h"
 #include "wx/palette.h"
 
 #include "wx/gdicmn.h"
 #include "wx/palette.h"
 

-class WXDLLEXPORT wxDC;
-class WXDLLEXPORT wxControl;

 class WXDLLEXPORT wxBitmap;
 class WXDLLEXPORT wxBitmapHandler;
 class WXDLLEXPORT wxBitmapRefData;
 class WXDLLEXPORT wxBitmap;
 class WXDLLEXPORT wxBitmapHandler;
 class WXDLLEXPORT wxBitmapRefData;

-class WXDLLEXPORT wxIcon;
-class WXDLLEXPORT wxMask;
-class WXDLLEXPORT wxCursor;

 class WXDLLEXPORT wxControl;
 class WXDLLEXPORT wxControl;

+class WXDLLEXPORT wxCursor;
+class WXDLLEXPORT wxDC;
+class WXDLLEXPORT wxDIB;
+class WXDLLEXPORT wxIcon;

 class WXDLLEXPORT wxImage;
 class WXDLLEXPORT wxImage;

+class WXDLLEXPORT wxMask;

 class WXDLLEXPORT wxPalette;
 class WXDLLEXPORT wxPalette;

+class WXDLLEXPORT wxPixelDataBase;

 
 // ----------------------------------------------------------------------------
 // wxBitmap: a mono or colour bitmap
 
 // ----------------------------------------------------------------------------
 // wxBitmap: a mono or colour bitmap


@@ -58,13 +59,24 @@ public:
     // New constructor for generalised creation from data
     wxBitmap(void *data, long type, int width, int height, int depth = 1);
 
     // New constructor for generalised creation from data
     wxBitmap(void *data, long type, int width, int height, int depth = 1);
 

-    // If depth is omitted, will create a bitmap compatible with the display
+    // Create a new, uninitialized bitmap of the given size and depth (if it
+    // is omitted, will create a bitmap compatible with the display)
+    //
+    // NB: this ctor will create a DIB for 24 and 32bpp bitmaps, use ctor
+    //     taking a DC argument if you want to force using DDB in this case

     wxBitmap(int width, int height, int depth = -1);
 
     wxBitmap(int width, int height, int depth = -1);
 

+    // Create a bitmap compatible with the given DC
+    wxBitmap(int width, int height, const wxDC& dc);
+

 #if wxUSE_IMAGE
 #if wxUSE_IMAGE

-    // Convert from wxImage:
+    // Convert from wxImage

     wxBitmap(const wxImage& image, int depth = -1)
         { (void)CreateFromImage(image, depth); }
     wxBitmap(const wxImage& image, int depth = -1)
         { (void)CreateFromImage(image, depth); }

+
+    // Create a DDB compatible with the given DC from wxImage
+    wxBitmap(const wxImage& image, const wxDC& dc)
+        { (void)CreateFromImage(image, dc); }

 #endif // wxUSE_IMAGE
 
     // we must have this, otherwise icons are silently copied into bitmaps using
 #endif // wxUSE_IMAGE
 
     // we must have this, otherwise icons are silently copied into bitmaps using


@@ -107,7 +119,11 @@ public:
     // copies the contents and mask of the given cursor to the bitmap
     bool CopyFromCursor(const wxCursor& cursor);
 
     // copies the contents and mask of the given cursor to the bitmap
     bool CopyFromCursor(const wxCursor& cursor);
 

+    // copies from a device independent bitmap
+    bool CopyFromDIB(const wxDIB& dib);
+

     virtual bool Create(int width, int height, int depth = -1);
     virtual bool Create(int width, int height, int depth = -1);

+    virtual bool Create(int width, int height, const wxDC& dc);

     virtual bool Create(void *data, long type, int width, int height, int depth = 1);
     virtual bool LoadFile(const wxString& name, long type = wxBITMAP_TYPE_BMP_RESOURCE);
     virtual bool SaveFile(const wxString& name, int type, const wxPalette *cmap = NULL);
     virtual bool Create(void *data, long type, int width, int height, int depth = 1);
     virtual bool LoadFile(const wxString& name, long type = wxBITMAP_TYPE_BMP_RESOURCE);
     virtual bool SaveFile(const wxString& name, int type, const wxPalette *cmap = NULL);


@@ -115,21 +131,25 @@ public:
     wxBitmapRefData *GetBitmapData() const
         { return (wxBitmapRefData *)m_refData; }
 
     wxBitmapRefData *GetBitmapData() const
         { return (wxBitmapRefData *)m_refData; }
 

+    // raw bitmap access support functions
+    void *GetRawData(wxPixelDataBase& data, int bpp);
+    void UngetRawData(wxPixelDataBase& data);
+

 #if wxUSE_PALETTE
     wxPalette* GetPalette() const;
     void SetPalette(const wxPalette& palette);
 #endif // wxUSE_PALETTE
 
     wxMask *GetMask() const;
 #if wxUSE_PALETTE
     wxPalette* GetPalette() const;
     void SetPalette(const wxPalette& palette);
 #endif // wxUSE_PALETTE
 
     wxMask *GetMask() const;

-    void SetMask(wxMask *mask) ;
+    void SetMask(wxMask *mask);

 
     bool operator==(const wxBitmap& bitmap) const { return m_refData == bitmap.m_refData; }
     bool operator!=(const wxBitmap& bitmap) const { return m_refData != bitmap.m_refData; }
 
 
     bool operator==(const wxBitmap& bitmap) const { return m_refData == bitmap.m_refData; }
     bool operator!=(const wxBitmap& bitmap) const { return m_refData != bitmap.m_refData; }
 

-#if wxUSE_DIB_FOR_BITMAP
-    // returns TRUE if this bitmap is a DIB (otherwise it's a DDB)
-    bool IsDIB() const;
-#endif // wxUSE_DIB_FOR_BITMAP
+    // these functions are internal and shouldn't be used, they risk to
+    // disappear in the future
+    bool HasAlpha() const;
+    void UseAlpha();

 
 #if WXWIN_COMPATIBILITY_2_4
     // these functions do nothing and are only there for backwards
 
 #if WXWIN_COMPATIBILITY_2_4
     // these functions do nothing and are only there for backwards


@@ -142,34 +162,24 @@ public:
     void SetOk(bool isOk);
 #endif // WXWIN_COMPATIBILITY_2
 
     void SetOk(bool isOk);
 #endif // WXWIN_COMPATIBILITY_2
 

-#if wxUSE_PALETTE

 #if WXWIN_COMPATIBILITY
 #if WXWIN_COMPATIBILITY

+#if wxUSE_PALETTE

     wxPalette *GetColourMap() const { return GetPalette(); }
     void SetColourMap(wxPalette *cmap) { SetPalette(*cmap); };
     wxPalette *GetColourMap() const { return GetPalette(); }
     void SetColourMap(wxPalette *cmap) { SetPalette(*cmap); };

-#endif // WXWIN_COMPATIBILITY

 #endif // wxUSE_PALETTE
 #endif // wxUSE_PALETTE

+#endif // WXWIN_COMPATIBILITY
+
+    // implementation only from now on
+    // -------------------------------

 
 

-    // Implementation

 public:
     void SetHBITMAP(WXHBITMAP bmp) { SetHandle((WXHANDLE)bmp); }
     WXHBITMAP GetHBITMAP() const { return (WXHBITMAP)GetHandle(); }
 
 public:
     void SetHBITMAP(WXHBITMAP bmp) { SetHandle((WXHANDLE)bmp); }
     WXHBITMAP GetHBITMAP() const { return (WXHBITMAP)GetHandle(); }
 

+#ifdef __WXDEBUG__

     void SetSelectedInto(wxDC *dc);
     wxDC *GetSelectedInto() const;
     void SetSelectedInto(wxDC *dc);
     wxDC *GetSelectedInto() const;

-
-    // Creates a bitmap that matches the device context's depth, from an
-    // arbitray bitmap. At present, the original bitmap must have an associated
-    // palette. (TODO: use a default palette if no palette exists.) This
-    // function is necessary for you to Blit an arbitrary bitmap (which may
-    // have the wrong depth). wxDC::SelectObject will compare the depth of the
-    // bitmap with the DC's depth, and create a new bitmap if the depths
-    // differ. Eventually we should perhaps make this a public API function so
-    // that an app can efficiently produce bitmaps of the correct depth. The
-    // Windows solution is to use SetDibBits to blit an arbotrary DIB directly
-    // to a DC, but this is too Windows-specific, hence this solution of
-    // quietly converting the wxBitmap. Contributed by Frederic Villeneuve
-    // <frederic.villeneuve@natinst.com>
-    wxBitmap GetBitmapForDC(wxDC& dc) const;
+#endif // __WXDEBUG__

 
 protected:
     // common part of all ctors
 
 protected:
     // common part of all ctors


@@ -180,16 +190,19 @@ protected:
     // creates the bitmap from XPM data, supposed to be called from ctor
     bool CreateFromXpm(const char **bits);
 
     // creates the bitmap from XPM data, supposed to be called from ctor
     bool CreateFromXpm(const char **bits);
 

+    // creates an uninitialized bitmap, called from Create()s above
+    bool DoCreate(int w, int h, int depth, WXHDC hdc);
+

 #if wxUSE_IMAGE
     // creates the bitmap from wxImage, supposed to be called from ctor
     bool CreateFromImage(const wxImage& image, int depth);
 #if wxUSE_IMAGE
     // creates the bitmap from wxImage, supposed to be called from ctor
     bool CreateFromImage(const wxImage& image, int depth);

-#endif // wxUSE_IMAGE

 
 

-#if wxUSE_DIB_FOR_BITMAP
-    void *CreateDIB(int width, int height, int depth);
+    // creates a DDB from wxImage, supposed to be called from ctor
+    bool CreateFromImage(const wxImage& image, const wxDC& dc);

 
 

-    void CopyDIBLine(void* src, void* dest, int count) const;
-#endif // wxUSE_DIB_FOR_BITMAP
+    // common part of the 2 methods above (hdc may be 0)
+    bool CreateFromImage(const wxImage& image, int depth, WXHDC hdc);
+#endif // wxUSE_IMAGE

 
 private:
 #ifdef __WIN32__
 
 private:
 #ifdef __WIN32__