translate "Copy URL" string in the popup menu (feature request 1803958) (should have...

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

diff --git a/include/wx/os2/gdiimage.h b/include/wx/os2/gdiimage.h
index d2fd4121008b36b38970ab2c8d3a0afd734faa3a..98422387cd5634592699ded2c55b7ba29e367d77 100644 (file)
--- a/include/wx/os2/gdiimage.h
+++ b/include/wx/os2/gdiimage.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        include/wx/os2/gdiimage.h
+// Name:        wx/os2/gdiimage.h

 // Purpose:     wxGDIImage class: base class for wxBitmap, wxIcon, wxCursor
 //              under OS/2
 // Author:      David Webster (adapted from msw version by Vadim Zeitlin)
 // Purpose:     wxGDIImage class: base class for wxBitmap, wxIcon, wxCursor
 //              under OS/2
 // Author:      David Webster (adapted from msw version by Vadim Zeitlin)


@@ -7,7 +7,7 @@
 // Created:     20.11.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 David Webster
 // Created:     20.11.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 David Webster

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // NB: this is a private header, it is not intended to be directly included by
 ///////////////////////////////////////////////////////////////////////////////
 
 // NB: this is a private header, it is not intended to be directly included by


@@ -16,17 +16,15 @@
 #ifndef _WX_OS2_GDIIMAGE_H_
 #define _WX_OS2_GDIIMAGE_H_
 
 #ifndef _WX_OS2_GDIIMAGE_H_
 #define _WX_OS2_GDIIMAGE_H_
 

-#ifdef __GNUG__
-    #pragma interface "gdiimage.h"
-#endif
-

 #include "wx/gdiobj.h"          // base class
 #include "wx/gdicmn.h"          // wxBITMAP_TYPE_INVALID
 #include "wx/list.h"
 
 #include "wx/gdiobj.h"          // base class
 #include "wx/gdicmn.h"          // wxBITMAP_TYPE_INVALID
 #include "wx/list.h"
 

-class WXDLLEXPORT wxGDIImageRefData;
-class WXDLLEXPORT wxGDIImageHandler;
-class WXDLLEXPORT wxGDIImage;
+class WXDLLIMPEXP_FWD_CORE wxGDIImageRefData;
+class WXDLLIMPEXP_FWD_CORE wxGDIImageHandler;
+class WXDLLIMPEXP_FWD_CORE wxGDIImage;
+
+WX_DECLARE_EXPORTED_LIST(wxGDIImageHandler, wxGDIImageHandlerList);

 
 // ----------------------------------------------------------------------------
 // wxGDIImageRefData: common data fields for all derived classes
 
 // ----------------------------------------------------------------------------
 // wxGDIImageRefData: common data fields for all derived classes


@@ -40,18 +38,14 @@ public:
         m_nWidth = m_nHeight = m_nDepth = 0;
 
         m_hHandle = 0;
         m_nWidth = m_nHeight = m_nDepth = 0;
 
         m_hHandle = 0;

-
-#if WXWIN_COMPATIBILITY_2
-        m_bOk = FALSE;
-#endif // WXWIN_COMPATIBILITY_2

     }
 
     // accessors
     }
 
     // accessors

-    bool IsOk() const
+    virtual bool IsOk() const

     {
         if (m_hHandle == 0)
     {
         if (m_hHandle == 0)

-            return FALSE;
-        return TRUE;
+            return false;
+        return true;

     }
 
     void SetSize( int nW
     }
 
     void SetSize( int nW


@@ -80,14 +74,7 @@ public:
         WXHCURSOR                   m_hCursor;
     };
 
         WXHCURSOR                   m_hCursor;
     };
 

-    // this filed is redundant and using it is error prone but keep it for
-    // backwards compatibility
-#if WXWIN_COMPATIBILITY_2
-    void SetOk() { m_bOk = m_hHandle != 0; }
-
-    bool                            m_bOk;
-#endif // WXWIN_COMPATIBILITY_2
-    UINT                            m_uId;
+    unsigned int                    m_uId;

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -120,7 +107,7 @@ public:
 
     // real handler operations: to implement in derived classes
     virtual bool Create( wxGDIImage* pImage
 
     // real handler operations: to implement in derived classes
     virtual bool Create( wxGDIImage* pImage

-                        ,void*       pData
+                        ,const void* pData

                         ,long        lFlags
                         ,int         nWidth
                         ,int         nHeight
                         ,long        lFlags
                         ,int         nWidth
                         ,int         nHeight


@@ -160,7 +147,7 @@ class WXDLLEXPORT wxGDIImage : public wxGDIObject
 {
 public:
     // handlers list interface
 {
 public:
     // handlers list interface

-    static wxList& GetHandlers() { return ms_handlers; }
+    static wxGDIImageHandlerList& GetHandlers() { return ms_handlers; }

 
     static void AddHandler(wxGDIImageHandler* hHandler);
     static void InsertHandler(wxGDIImageHandler* hHandler);
 
     static void AddHandler(wxGDIImageHandler* hHandler);
     static void InsertHandler(wxGDIImageHandler* hHandler);


@@ -200,8 +187,6 @@ public:
         pData->m_hHandle = hHandle;
     }
 
         pData->m_hHandle = hHandle;
     }
 

-    bool Ok() const { return GetHandle() != 0; }
-

     int GetWidth() const { return IsNull() ? 0 : GetGDIImageData()->m_nWidth; }
     int GetHeight() const { return IsNull() ? 0 : GetGDIImageData()->m_nHeight; }
     int GetDepth() const { return IsNull() ? 0 : GetGDIImageData()->m_nDepth; }
     int GetWidth() const { return IsNull() ? 0 : GetGDIImageData()->m_nWidth; }
     int GetHeight() const { return IsNull() ? 0 : GetGDIImageData()->m_nHeight; }
     int GetDepth() const { return IsNull() ? 0 : GetGDIImageData()->m_nDepth; }


@@ -219,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;
 


@@ -229,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;
 


@@ -238,14 +223,24 @@ public:
         pData->m_uId = uId;
     }
     // forward some of base class virtuals to wxGDIImageRefData
         pData->m_uId = uId;
     }
     // forward some of base class virtuals to wxGDIImageRefData

-    bool             FreeResource(bool bForce = FALSE);
-    virtual WXHANDLE GetResourceHandle();
+    bool             FreeResource(bool bForce = false);
+    virtual WXHANDLE GetResourceHandle() const;

 
 protected:
     // create the data for the derived class here
     virtual wxGDIImageRefData* CreateData() const = 0;
 
 protected:
     // create the data for the derived class here
     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 wxList                   ms_handlers;
+    static wxGDIImageHandlerList    ms_handlers;

 };
 
 #endif // _WX_MSW_GDIIMAGE_H_
 };
 
 #endif // _WX_MSW_GDIIMAGE_H_