Fix some wrong code: add parentheses to correct precedence,

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

diff --git a/include/wx/msw/bitmap.h b/include/wx/msw/bitmap.h
index 75efef8d651780e0395a8e9a1ac879973f3cdbdc..0daef6ee896e0b371d260bdf60c442074e09c5f3 100644 (file)
--- a/include/wx/msw/bitmap.h
+++ b/include/wx/msw/bitmap.h
@@ -26,12 +26,14 @@ class WXDLLEXPORT wxBitmapRefData;
 class WXDLLEXPORT wxControl;
 class WXDLLEXPORT wxCursor;
 class WXDLLEXPORT wxDC;
 class WXDLLEXPORT wxControl;
 class WXDLLEXPORT wxCursor;
 class WXDLLEXPORT wxDC;

+#if wxUSE_WXDIB

 class WXDLLEXPORT wxDIB;
 class WXDLLEXPORT wxDIB;

+#endif

 class WXDLLEXPORT wxIcon;
 class WXDLLEXPORT wxImage;
 class WXDLLEXPORT wxMask;
 class WXDLLEXPORT wxPalette;
 class WXDLLEXPORT wxIcon;
 class WXDLLEXPORT wxImage;
 class WXDLLEXPORT wxMask;
 class WXDLLEXPORT wxPalette;

-class WXDLLEXPORT wxRawBitmapData;
+class WXDLLEXPORT wxPixelDataBase;

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


@@ -119,8 +121,10 @@ 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);
 

+#if wxUSE_WXDIB

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

+#endif

 
     virtual bool Create(int width, int height, int depth = -1);
     virtual bool Create(int width, int height, const wxDC& dc);
 
     virtual bool Create(int width, int height, int depth = -1);
     virtual bool Create(int width, int height, const wxDC& dc);


@@ -132,8 +136,8 @@ public:
         { return (wxBitmapRefData *)m_refData; }
 
     // raw bitmap access support functions
         { return (wxBitmapRefData *)m_refData; }
 
     // raw bitmap access support functions

-    bool GetRawData(wxRawBitmapData *data);
-    void UngetRawData(wxRawBitmapData *);
+    void *GetRawData(wxPixelDataBase& data, int bpp);
+    void UngetRawData(wxPixelDataBase& data);

 
 #if wxUSE_PALETTE
     wxPalette* GetPalette() const;
 
 #if wxUSE_PALETTE
     wxPalette* GetPalette() const;