1. moved m_majorDim duplicated in many ports to wxRadioBoxBase

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

diff --git a/include/wx/os2/bitmap.h b/include/wx/os2/bitmap.h
index de14c11b1af2cfad96648dc76add43033ae83e21..e1953d303419951e3d594982f3d648fc7e56bee0 100644 (file)
--- a/include/wx/os2/bitmap.h
+++ b/include/wx/os2/bitmap.h
@@ -12,10 +12,6 @@
 #ifndef _WX_BITMAP_H_
 #define _WX_BITMAP_H_
 
-#ifdef __GNUG__
-    #pragma interface "bitmap.h"
-#endif
-
 #include "wx/os2/private.h"
 #include "wx/os2/gdiimage.h"
 #include "wx/gdicmn.h"
@@ -74,7 +70,7 @@ public:
 
     // Copy constructors
     inline wxBitmap(const wxBitmap& rBitmap)
-      { Init(); Ref(rBitmap); }
+      { Init(); Ref(rBitmap); SetHandle(rBitmap.GetHandle()); }
 
     // Initialize with raw data
     wxBitmap( const char bits[]
@@ -87,11 +83,16 @@ public:
     wxBitmap(const char** ppData) { CreateFromXpm(ppData); }
     wxBitmap(char** ppData) { CreateFromXpm((const char**)ppData); }
 
-    // Load a file or resource
-    wxBitmap( const wxString& rName
+    // Load a resource
+    wxBitmap( int             nId
              ,long            lType = wxBITMAP_TYPE_BMP_RESOURCE
             );
 
+    // For compatiability with other ports, under OS/2 does same as default ctor
+    inline wxBitmap( const wxString& WXUNUSED(rFilename)
+                    ,long            WXUNUSED(lType)
+                   )
+    { Init(); }
     // New constructor for generalised creation from data
     wxBitmap( void* pData
              ,long  lType
@@ -101,10 +102,7 @@ public:
             );
 
     // If depth is omitted, will create a bitmap compatible with the display
-    wxBitmap( int nWidth
-             ,int nHeight
-             ,int nDepth = -1
-            );
+    wxBitmap( int nWidth, int nHeight, int nDepth = -1 );
 
     wxBitmap( const wxImage& image, int depth = -1 )
                          { (void)CreateFromImage(image, depth); }
@@ -157,9 +155,12 @@ public:
                         ,int   nHeight
                         ,int   nDepth = 1
                        );
-    virtual bool LoadFile( const wxString& rName
+    virtual bool LoadFile( int             nId
                           ,long            lType = wxBITMAP_TYPE_BMP_RESOURCE
                          );
+    virtual bool LoadFile( const wxString& rName
+                          ,long            lType = wxBITMAP_TYPE_XPM
+                         );
     virtual bool SaveFile( const wxString&  rName
                           ,int              lType
                           ,const wxPalette* pCmap = NULL
@@ -189,19 +190,6 @@ public:
     inline bool operator!=(const wxBitmap& rBitmap) const
       { return m_refData != rBitmap.m_refData; }
 
-#if WXWIN_COMPATIBILITY_2
-    void SetOk(bool bIsOk);
-#endif // WXWIN_COMPATIBILITY_2
-
-#if WXWIN_COMPATIBILITY
-    inline wxPalette* GetColourMap() const
-      { return GetPalette(); }
-
-    inline void       SetColourMap(wxPalette* pCmap)
-      { SetPalette(*pCmap); };
-
-#endif // WXWIN_COMPATIBILITY
-
     // Implementation
 public:
     inline void SetHBITMAP(WXHBITMAP hBmp)
@@ -217,16 +205,10 @@ public:
       { return (GetBitmapData() ? GetBitmapData()->m_pSelectedInto : (wxDC*) NULL); }
 
     inline bool IsMono(void) const { return m_bIsMono; }
-    inline bool Flip(void) const { return m_bFlip; }
-
 
     // 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); }
-
-
 protected:
     // common part of all ctors
     void Init();
@@ -242,7 +224,6 @@ private:
     bool CopyFromIconOrCursor(const wxGDIImage& rIcon);
 
     bool                            m_bIsMono;
-    bool                            m_bFlip;
     DECLARE_DYNAMIC_CLASS(wxBitmap)
 }; // end of CLASS wxBitmap
 
@@ -324,9 +305,14 @@ public:
                         ,int       nHeight
                         ,int       nDepth = 1
                        );
+    virtual bool LoadFile( wxBitmap*       pBitmap
+                          ,int             nId
+                          ,long            lFlags
+                          ,int             nDesiredWidth
+                          ,int             nDesiredHeight
+                         );
     virtual bool LoadFile( wxBitmap*       pBitmap
                           ,const wxString& rName
-                          ,HPS             hPs
                           ,long            lFlags
                           ,int             nDesiredWidth
                           ,int             nDesiredHeight
@@ -345,8 +331,7 @@ public:
                         ,int         nDepth = 1
                        );
     virtual bool Load( wxGDIImage*     pImage
-                      ,const wxString& rName
-                      ,HPS             hPs
+                      ,int             nId
                       ,long            lFlags
                       ,int             nDesiredWidth
                       ,int             nDesiredHeight
@@ -356,6 +341,14 @@ public:
                       ,int             lType
                      );
 private:
+    inline virtual bool Load( wxGDIImage*     WXUNUSED(pImage)
+                             ,const wxString& WXUNUSED(rName)
+                             ,HPS             WXUNUSED(hPs)
+                             ,long            WXUNUSED(lFlags)
+                             ,int             WXUNUSED(nDesiredWidth)
+                             ,int             WXUNUSED(nDesiredHeight)
+                            )
+    { return false; }
     DECLARE_DYNAMIC_CLASS(wxBitmapHandler)
 }; // end of CLASS wxBitmapHandler