split wxRegion(wxBitmap) ctor into two ctors with clearer semantics

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

diff --git a/include/wx/msw/dib.h b/include/wx/msw/dib.h
index 6a2a40a02077f88e3d253f9f1ea55a929fa2e292..104955b89ec113d2eb0154dd8e3871d35fd90687 100644 (file)
--- a/include/wx/msw/dib.h
+++ b/include/wx/msw/dib.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     03.03.03 (replaces the old file with the same name)
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     03.03.03 (replaces the old file with the same name)
 // RCS-ID:      $Id$

-// Copyright:   (c) 1997-2003 wxWindows team
+// Copyright:   (c) 1997-2003 wxWidgets team

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -17,6 +17,8 @@ class WXDLLEXPORT wxPalette;
 
 #include "wx/msw/private.h"
 
 
 #include "wx/msw/private.h"
 

+#if wxUSE_WXDIB
+

 // ----------------------------------------------------------------------------
 // wxDIB: represents a DIB section
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxDIB: represents a DIB section
 // ----------------------------------------------------------------------------


@@ -57,10 +59,12 @@ public:
     // operations
     // ----------
 
     // operations
     // ----------
 

+#ifndef __WXWINCE__

     // create a bitmap compatiblr with the given HDC (or screen by default) and
     // return its handle, the caller is responsible for freeing it (using
     // DeleteObject())
     HBITMAP CreateDDB(HDC hdc = 0) const;
     // create a bitmap compatiblr with the given HDC (or screen by default) and
     // return its handle, the caller is responsible for freeing it (using
     // DeleteObject())
     HBITMAP CreateDDB(HDC hdc = 0) const;

+#endif // !__WXWINCE__

 
     // get the handle from the DIB and reset it, i.e. this object won't destroy
     // the DIB after this (but the caller should do it)
 
     // get the handle from the DIB and reset it, i.e. this object won't destroy
     // the DIB after this (but the caller should do it)


@@ -100,9 +104,10 @@ public:
     // HBITMAP conversion
     // ------------------
 
     // HBITMAP conversion
     // ------------------
 

-    // these functions are only used by wxWindows internally right now, please
+    // these functions are only used by wxWidgets internally right now, please

     // don't use them directly if possible as they're subject to change
 
     // don't use them directly if possible as they're subject to change
 

+#ifndef __WXWINCE__

     // creates a DDB compatible with the given (or screen) DC from either
     // a plain DIB or a DIB section (in which case the last parameter must be
     // non NULL)
     // creates a DDB compatible with the given (or screen) DC from either
     // a plain DIB or a DIB section (in which case the last parameter must be
     // non NULL)


@@ -120,6 +125,7 @@ public:
     // function (this overload is needed for wxBitmapDataObject code in
     // src/msw/ole/dataobj.cpp)
     static size_t ConvertFromBitmap(BITMAPINFO *pbi, HBITMAP hbmp);
     // function (this overload is needed for wxBitmapDataObject code in
     // src/msw/ole/dataobj.cpp)
     static size_t ConvertFromBitmap(BITMAPINFO *pbi, HBITMAP hbmp);

+#endif // __WXWINCE__

 
 
     // wxImage conversion
 
 
     // wxImage conversion


@@ -156,6 +162,11 @@ private:
     // free resources
     void Free();
 
     // free resources
     void Free();
 

+    // initialize the contents from the provided DDB (Create() must have been
+    // already called)
+    bool CopyFromDDB(HBITMAP hbmp);
+
+

     // the DIB section handle, 0 if invalid
     HBITMAP m_handle;
 
     // the DIB section handle, 0 if invalid
     HBITMAP m_handle;
 


@@ -225,5 +236,8 @@ inline wxDIB::~wxDIB()
     Free();
 }
 
     Free();
 }
 

+#endif
+    // wxUSE_WXDIB
+

 #endif // _WX_MSW_DIB_H_
 
 #endif // _WX_MSW_DIB_H_