Fixed missing paint events when overriding DoMoveWindow()

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

diff --git a/include/wx/os2/bitmap.h b/include/wx/os2/bitmap.h
index 6982b9fe85103bfd4b51a2d26783c31d21189eb7..6eccf80a0cd9f6108bb0949cacb4b8246b9452ad 100644 (file)
--- a/include/wx/os2/bitmap.h
+++ b/include/wx/os2/bitmap.h
@@ -16,6 +16,7 @@
     #pragma interface "bitmap.h"
 #endif
 
+#include "wx/os2/private.h"
 #include "wx/os2/gdiimage.h"
 #include "wx/gdicmn.h"
 #include "wx/palette.h"
@@ -159,17 +160,17 @@ public:
       { return (wxBitmapRefData *)m_refData; }
 
     inline int GetQuality() const
-      { return (GetBitmapData() ? GetBitmapData()->m_quality : 0); }
+      { return (GetBitmapData() ? GetBitmapData()->m_nQuality : 0); }
 
     void SetQuality(int nQ);
 
     wxPalette* GetPalette() const
-      { return (GetBitmapData() ? (& GetBitmapData()->m_bitmapPalette) : (wxPalette*) NULL); }
+      { return (GetBitmapData() ? (& GetBitmapData()->m_vBitmapPalette) : (wxPalette*) NULL); }
 
     void       SetPalette(const wxPalette& rPalette);
 
     inline wxMask* GetMask() const
-      { return (GetBitmapData() ? GetBitmapData()->m_bitmapMask : (wxMask*) NULL); }
+      { return (GetBitmapData() ? GetBitmapData()->m_pBitmapMask : (wxMask*) NULL); }
 
     void SetMask(wxMask* pMask) ;
 
@@ -194,17 +195,17 @@ public:
 
     // Implementation
 public:
-    inline void SetHBITMAP(WXHBITMAP hHmp)
-      { SetHandle((WXHANDLE)bmp); }
+    inline void SetHBITMAP(WXHBITMAP hBmp)
+      { SetHandle((WXHANDLE)hBmp); }
 
     inline WXHBITMAP GetHBITMAP() const
       { return (WXHBITMAP)GetHandle(); }
 
     inline void  SetSelectedInto(wxDC* pDc)
-      { if (GetBitmapData()) GetBitmapData()->m_selectedInto = pDc; }
+      { if (GetBitmapData()) GetBitmapData()->m_pSelectedInto = pDc; }
 
     inline wxDC* GetSelectedInto() const
-      { return (GetBitmapData() ? GetBitmapData()->m_selectedInto : (wxDC*) NULL); }
+      { return (GetBitmapData() ? GetBitmapData()->m_pSelectedInto : (wxDC*) NULL); }
 
     // An OS/2 version that probably doesn't do anything like the msw version
     wxBitmap GetBitmapForDC(wxDC& rDc) const;
@@ -218,8 +219,6 @@ protected:
 
 private:
     bool CopyFromIconOrCursor(const wxGDIImage& rIcon);
-    HDC                             m_hDc;
-    HPS                             m_hPs;
 
     DECLARE_DYNAMIC_CLASS(wxBitmap)
 };
@@ -271,6 +270,9 @@ public:
 protected:
     WXHBITMAP                       m_hMaskBitmap;
     DECLARE_DYNAMIC_CLASS(wxMask)
+private:
+    HDC                             m_hDc;
+    HPS                             m_hPs;
 };
 
 // ----------------------------------------------------------------------------
@@ -304,6 +306,7 @@ public:
                        );
     virtual bool LoadFile( wxBitmap*       pBitmap
                           ,const wxString& rName
+                          ,HPS             hPs
                           ,long            lFlags
                           ,int             nDesiredWidth
                           ,int             nDesiredHeight
@@ -323,13 +326,14 @@ public:
                        );
     virtual bool Load( wxGDIImage*     pImage
                       ,const wxString& rName
+                      ,HPS             hPs
                       ,long            lFlags
                       ,int             nDesiredWidth
                       ,int             nDesiredHeight
                      );
-    virtual bool Save(wxGDIImage*     pImage
-                      const wxString& rName
-                      int             lType
+    virtual bool Save( wxGDIImage*     pImage
+                      ,const wxString& rName
+                      ,int             lType
                      );
 private:
     DECLARE_DYNAMIC_CLASS(wxBitmapHandler)