corrected conditional include

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

diff --git a/include/wx/os2/bitmap.h b/include/wx/os2/bitmap.h
index 0908e667d57a038674b90cf4d8b559b963850a3b..ba920a1fac854db08a765dd328f31dfad61df552 100644 (file)
--- a/include/wx/os2/bitmap.h
+++ b/include/wx/os2/bitmap.h
@@ -29,6 +29,7 @@ class WXDLLEXPORT wxIcon;
 class WXDLLEXPORT wxMask;
 class WXDLLEXPORT wxCursor;
 class WXDLLEXPORT wxControl;
+class WXDLLEXPORT wxImage;
 
 // ----------------------------------------------------------------------------
 // Bitmap data
@@ -54,12 +55,12 @@ public:
     // ------------
 
     wxDC*                           m_pSelectedInto;
-    HPS                             m_hPresentationSpace;
-    LONG                            m_lId;
 
-    // optional mask for transparent drawing
+    //
+    // Optional mask for transparent drawing
+    //
     wxMask*                         m_pBitmapMask;
-};
+}; // end of CLASS wxBitmapRefData
 
 // ----------------------------------------------------------------------------
 // wxBitmap: a mono or colour bitmap
@@ -83,9 +84,8 @@ public:
             );
 
     // Initialize with XPM data
-    wxBitmap( char**     ppData
-             ,wxControl* pAnItem = NULL
-            );
+    wxBitmap(const char** ppData);
+    wxBitmap(char** ppData);
 
     // Load a file or resource
     wxBitmap( const wxString& rName
@@ -106,6 +106,9 @@ public:
              ,int nDepth = -1
             );
 
+    wxBitmap( const wxImage& image, int depth = -1 ) 
+                         { (void)CreateFromImage(image, depth); }
+
     // we must have this, otherwise icons are silently copied into bitmaps using
     // the copy ctor but the resulting bitmap is invalid!
     inline wxBitmap(const wxIcon& rIcon)
@@ -133,6 +136,8 @@ public:
 
     virtual ~wxBitmap();
 
+    wxImage ConvertToImage() const;  
+
     // get the given part of bitmap
     wxBitmap GetSubBitmap(const wxRect& rRect) const;
 
@@ -214,8 +219,8 @@ public:
     // An OS/2 version that probably doesn't do anything like the msw version
     wxBitmap GetBitmapForDC(wxDC& rDc) const;
 
-    inline LONG GetId() const
-      { return (GetBitmapData() ? GetBitmapData()->m_lId : 0L); }
+//    inline LONG GetId() const
+//      { return (GetBitmapData() ? GetBitmapData()->m_lId : 0L); }
 
 
 protected:
@@ -227,6 +232,7 @@ protected:
 
     // creates the bitmap from XPM data, supposed to be called from ctor
     bool CreateFromXpm(const char **bits);
+    bool CreateFromImage(const wxImage& image, int depth);
 
 private:
     bool CopyFromIconOrCursor(const wxGDIImage& rIcon);
@@ -281,10 +287,7 @@ public:
 protected:
     WXHBITMAP                       m_hMaskBitmap;
     DECLARE_DYNAMIC_CLASS(wxMask)
-private:
-    HDC                             m_hDc;
-    HPS                             m_hPs;
-}; // end of wxMask
+}; // end of CLASS wxMask
 
 // ----------------------------------------------------------------------------
 // wxBitmapHandler is a class which knows how to load/save bitmaps to/from file
@@ -348,7 +351,7 @@ public:
                      );
 private:
     DECLARE_DYNAMIC_CLASS(wxBitmapHandler)
-}; // end of wxBitmapHandler
+}; // end of CLASS wxBitmapHandler
 
 #endif
   // _WX_BITMAP_H_