Corrected/added support for column headers with icon and text

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

diff --git a/include/wx/os2/gdiimage.h b/include/wx/os2/gdiimage.h
index de43fec73a7412fbdfa0e66670d009708b5eabf8..8b5625abdfc1c0f70a1d94ca675419c53d354921 100644 (file)
--- a/include/wx/os2/gdiimage.h
+++ b/include/wx/os2/gdiimage.h
@@ -30,7 +30,7 @@ WX_DECLARE_EXPORTED_LIST(wxGDIImageHandler, wxGDIImageHandlerList);
 // wxGDIImageRefData: common data fields for all derived classes
 // ----------------------------------------------------------------------------
 
 // wxGDIImageRefData: common data fields for all derived classes
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxGDIImageRefData : public wxGDIRefData
+class WXDLLIMPEXP_CORE wxGDIImageRefData : public wxGDIRefData

 {
 public:
     wxGDIImageRefData()
 {
 public:
     wxGDIImageRefData()


@@ -74,21 +74,21 @@ public:
         WXHCURSOR                   m_hCursor;
     };
 
         WXHCURSOR                   m_hCursor;
     };
 

-    UINT                            m_uId;
+    unsigned int                    m_uId;

 };
 
 // ----------------------------------------------------------------------------
 // wxGDIImageHandler: a class which knows how to load/save wxGDIImages.
 // ----------------------------------------------------------------------------
 
 };
 
 // ----------------------------------------------------------------------------
 // wxGDIImageHandler: a class which knows how to load/save wxGDIImages.
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxGDIImageHandler : public wxObject
+class WXDLLIMPEXP_CORE wxGDIImageHandler : public wxObject

 {
 public:
     // ctor
     wxGDIImageHandler() { m_lType = wxBITMAP_TYPE_INVALID; }
     wxGDIImageHandler( const wxString& rName
                       ,const wxString& rExt
 {
 public:
     // ctor
     wxGDIImageHandler() { m_lType = wxBITMAP_TYPE_INVALID; }
     wxGDIImageHandler( const wxString& rName
                       ,const wxString& rExt

-                      ,long            lType
+                      ,wxBitmapType    lType

                      )
                      : m_sName(rName)
                      , m_sExtension(rExt)
                      )
                      : m_sName(rName)
                      , m_sExtension(rExt)


@@ -99,16 +99,16 @@ public:
     // accessors
     void SetName(const wxString& rName) { m_sName = rName; }
     void SetExtension(const wxString& rExt) { m_sExtension = rExt; }
     // accessors
     void SetName(const wxString& rName) { m_sName = rName; }
     void SetExtension(const wxString& rExt) { m_sExtension = rExt; }

-    void SetType(long lType) { m_lType = lType; }
+    void SetType(wxBitmapType lType) { m_lType = lType; }

 
     wxString GetName() const { return m_sName; }
     wxString GetExtension() const { return m_sExtension; }
 
     wxString GetName() const { return m_sName; }
     wxString GetExtension() const { return m_sExtension; }

-    long GetType() const { return m_lType; }
+    wxBitmapType GetType() const { return m_lType; }

 
     // real handler operations: to implement in derived classes
     virtual bool Create( wxGDIImage* pImage
                         ,const void* pData
 
     // real handler operations: to implement in derived classes
     virtual bool Create( wxGDIImage* pImage
                         ,const void* pData

-                        ,long        lFlags
+                        ,wxBitmapType lFlags

                         ,int         nWidth
                         ,int         nHeight
                         ,int         nDepth = 1
                         ,int         nWidth
                         ,int         nHeight
                         ,int         nDepth = 1


@@ -116,25 +116,25 @@ public:
     virtual bool Load( wxGDIImage*     pImage
                       ,const wxString& rName
                       ,HPS             hPs
     virtual bool Load( wxGDIImage*     pImage
                       ,const wxString& rName
                       ,HPS             hPs

-                      ,long            lFlags
+                      ,wxBitmapType    lFlags

                       ,int             nDesiredWidth
                       ,int             nDesiredHeight
                      ) = 0;
     virtual bool Load( wxGDIImage*     pImage
                       ,int             nId
                       ,int             nDesiredWidth
                       ,int             nDesiredHeight
                      ) = 0;
     virtual bool Load( wxGDIImage*     pImage
                       ,int             nId

-                      ,long            lFlags
+                      ,wxBitmapType    lFlags

                       ,int             nDesiredWidth
                       ,int             nDesiredHeight
                      ) = 0;
                       ,int             nDesiredWidth
                       ,int             nDesiredHeight
                      ) = 0;

-    virtual bool Save( wxGDIImage*     pImage
-                      ,const wxString& rName
-                      ,int             lType
-                     ) = 0;
+    virtual bool Save( const wxGDIImage* pImage
+                      ,const wxString&   rName
+                      ,wxBitmapType      lType
+                     ) const = 0;

 
 protected:
     wxString                        m_sName;
     wxString                        m_sExtension;
 
 protected:
     wxString                        m_sName;
     wxString                        m_sExtension;

-    long                            m_lType;
+    wxBitmapType                    m_lType;

 }; // end of wxGDIImageHandler
 
 // ----------------------------------------------------------------------------
 }; // end of wxGDIImageHandler
 
 // ----------------------------------------------------------------------------


@@ -143,7 +143,7 @@ protected:
 // format. It also falls back to wxImage if no appropriate image is found.
 // ----------------------------------------------------------------------------
 
 // format. It also falls back to wxImage if no appropriate image is found.
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxGDIImage : public wxGDIObject
+class WXDLLIMPEXP_CORE wxGDIImage : public wxGDIObject

 {
 public:
     // handlers list interface
 {
 public:
     // handlers list interface


@@ -154,8 +154,8 @@ public:
     static bool RemoveHandler(const wxString& rName);
 
     static wxGDIImageHandler* FindHandler(const wxString& rName);
     static bool RemoveHandler(const wxString& rName);
 
     static wxGDIImageHandler* FindHandler(const wxString& rName);

-    static wxGDIImageHandler* FindHandler(const wxString& rExtension, long lType);
-    static wxGDIImageHandler* FindHandler(long lType);
+    static wxGDIImageHandler* FindHandler(const wxString& rExtension, wxBitmapType lType);
+    static wxGDIImageHandler* FindHandler(wxBitmapType lType);

 
     static void InitStandardHandlers();
     static void CleanUpHandlers();
 
     static void InitStandardHandlers();
     static void CleanUpHandlers();


@@ -204,7 +204,7 @@ public:
     }
     void SetSize(const wxSize& rSize) { SetSize(rSize.x, rSize.y); }
 
     }
     void SetSize(const wxSize& rSize) { SetSize(rSize.x, rSize.y); }
 

-    UINT GetId(void) const
+    unsigned int GetId(void) const

     {
         wxGDIImageRefData*          pData;
 
     {
         wxGDIImageRefData*          pData;
 


@@ -214,7 +214,7 @@ public:
         else
             return pData->m_uId;
     } // end of WxWinGdi_CGDIImage::GetId
         else
             return pData->m_uId;
     } // end of WxWinGdi_CGDIImage::GetId

-    void SetId(UINT uId)
+    void SetId(unsigned int uId)

     {
         wxGDIImageRefData*          pData;
 
     {
         wxGDIImageRefData*          pData;
 


@@ -231,6 +231,15 @@ protected:
     virtual wxGDIImageRefData* CreateData() const = 0;
     virtual wxGDIRefData *CreateGDIRefData() const { return CreateData(); }
 
     virtual wxGDIImageRefData* CreateData() const = 0;
     virtual wxGDIRefData *CreateGDIRefData() const { return CreateData(); }
 

+    // we can't [efficiently] clone objects of this class
+    virtual wxGDIRefData *
+    CloneGDIRefData(const wxGDIRefData *WXUNUSED(data)) const
+    {
+        wxFAIL_MSG( _T("must be implemented if used") );
+
+        return NULL;
+    }
+

     static wxGDIImageHandlerList    ms_handlers;
 };
 
     static wxGDIImageHandlerList    ms_handlers;
 };