added wxTE_BESTWRAP style (which is the default now); renamed wxTE_LINEWRAP to wxTE_C...

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

diff --git a/include/wx/os2/bitmap.h b/include/wx/os2/bitmap.h
index 72f44788e6e6077d255dd3c3f650578d88888dd2..ca736176eaf8b1a09e9c5b2a47a721784a3e1e98 100644 (file)
--- a/include/wx/os2/bitmap.h
+++ b/include/wx/os2/bitmap.h
@@ -74,7 +74,7 @@ public:
 
     // Copy constructors
     inline wxBitmap(const wxBitmap& rBitmap)
 
     // Copy constructors
     inline wxBitmap(const wxBitmap& rBitmap)

-      { Init(); Ref(rBitmap); }
+      { Init(); Ref(rBitmap); SetHandle(rBitmap.GetHandle()); }

 
     // Initialize with raw data
     wxBitmap( const char bits[]
 
     // Initialize with raw data
     wxBitmap( const char bits[]


@@ -87,11 +87,16 @@ public:
     wxBitmap(const char** ppData) { CreateFromXpm(ppData); }
     wxBitmap(char** ppData) { CreateFromXpm((const char**)ppData); }
 
     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
             );
 
              ,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
     // New constructor for generalised creation from data
     wxBitmap( void* pData
              ,long  lType


@@ -157,7 +162,7 @@ public:
                         ,int   nHeight
                         ,int   nDepth = 1
                        );
                         ,int   nHeight
                         ,int   nDepth = 1
                        );

-    virtual bool LoadFile( const wxString& rName
+    virtual bool LoadFile( int             nId

                           ,long            lType = wxBITMAP_TYPE_BMP_RESOURCE
                          );
     virtual bool SaveFile( const wxString&  rName
                           ,long            lType = wxBITMAP_TYPE_BMP_RESOURCE
                          );
     virtual bool SaveFile( const wxString&  rName


@@ -189,19 +194,6 @@ public:
     inline bool operator!=(const wxBitmap& rBitmap) const
       { return m_refData != rBitmap.m_refData; }
 
     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)
     // Implementation
 public:
     inline void SetHBITMAP(WXHBITMAP hBmp)


@@ -221,10 +213,6 @@ public:
     // An OS/2 version that probably doesn't do anything like the msw version
     wxBitmap GetBitmapForDC(wxDC& rDc) const;
 
     // 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();
 protected:
     // common part of all ctors
     void Init();


@@ -240,7 +228,6 @@ private:
     bool CopyFromIconOrCursor(const wxGDIImage& rIcon);
 
     bool                            m_bIsMono;
     bool CopyFromIconOrCursor(const wxGDIImage& rIcon);
 
     bool                            m_bIsMono;

-

     DECLARE_DYNAMIC_CLASS(wxBitmap)
 }; // end of CLASS wxBitmap
 
     DECLARE_DYNAMIC_CLASS(wxBitmap)
 }; // end of CLASS wxBitmap
 


@@ -323,8 +310,7 @@ public:
                         ,int       nDepth = 1
                        );
     virtual bool LoadFile( wxBitmap*       pBitmap
                         ,int       nDepth = 1
                        );
     virtual bool LoadFile( wxBitmap*       pBitmap

-                          ,const wxString& rName
-                          ,HPS             hPs
+                          ,int             nId

                           ,long            lFlags
                           ,int             nDesiredWidth
                           ,int             nDesiredHeight
                           ,long            lFlags
                           ,int             nDesiredWidth
                           ,int             nDesiredHeight


@@ -343,8 +329,7 @@ public:
                         ,int         nDepth = 1
                        );
     virtual bool Load( wxGDIImage*     pImage
                         ,int         nDepth = 1
                        );
     virtual bool Load( wxGDIImage*     pImage

-                      ,const wxString& rName
-                      ,HPS             hPs
+                      ,int             nId

                       ,long            lFlags
                       ,int             nDesiredWidth
                       ,int             nDesiredHeight
                       ,long            lFlags
                       ,int             nDesiredWidth
                       ,int             nDesiredHeight


@@ -354,6 +339,14 @@ public:
                       ,int             lType
                      );
 private:
                       ,int             lType
                      );
 private:

+    inline virtual bool Load( wxGDIImage*     pImage
+                             ,const wxString& rName
+                             ,HPS             hPs
+                             ,long            lFlags
+                             ,int             nDesiredWidth
+                             ,int             nDesiredHeight
+                            )
+    { return FALSE; }

     DECLARE_DYNAMIC_CLASS(wxBitmapHandler)
 }; // end of CLASS wxBitmapHandler
 
     DECLARE_DYNAMIC_CLASS(wxBitmapHandler)
 }; // end of CLASS wxBitmapHandler