Generate clipboard events for wxComboBox in wxGTK too.

[wxWidgets.git] / src / os2 / gdiimage.cpp

diff --git a/src/os2/gdiimage.cpp b/src/os2/gdiimage.cpp
index 12022f2925225f304a3e095dc153cefdce3d5c3d..405d2221f3bf3a580219807e43f3fef4cd46977b 100644 (file)
--- a/src/os2/gdiimage.cpp
+++ b/src/os2/gdiimage.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        msw/gdiimage.cpp
+// Name:        src/os2/gdiimage.cpp

 // Purpose:     wxGDIImage implementation
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     wxGDIImage implementation
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -17,24 +17,20 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

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

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"

+    #include "wx/app.h"

 #endif // WX_PRECOMP
 
 #include "wx/os2/private.h"
 #endif // WX_PRECOMP
 
 #include "wx/os2/private.h"

-#include "wx/app.h"

 #include "wx/os2/gdiimage.h"
 
 #include "wx/listimpl.cpp"
 #include "wx/os2/gdiimage.h"
 
 #include "wx/listimpl.cpp"

-WX_DEFINE_LIST(wxGDIImageHandlerList);
+WX_DEFINE_LIST(wxGDIImageHandlerList)

 
 // ----------------------------------------------------------------------------
 // private classes
 
 // ----------------------------------------------------------------------------
 // private classes


@@ -46,7 +42,7 @@ WX_DEFINE_LIST(wxGDIImageHandlerList);
 class WXDLLEXPORT wxBMPFileHandler : public wxBitmapHandler
 {
 public:
 class WXDLLEXPORT wxBMPFileHandler : public wxBitmapHandler
 {
 public:

-    wxBMPFileHandler() : wxBitmapHandler(_T("Windows bitmap file"), _T("bmp"),
+    wxBMPFileHandler() : wxBitmapHandler(wxT("Windows bitmap file"), wxT("bmp"),

                                          wxBITMAP_TYPE_BMP)
     {
     }
                                          wxBITMAP_TYPE_BMP)
     {
     }


@@ -54,20 +50,20 @@ public:
     virtual bool LoadFile( wxBitmap*       pBitmap
                           ,const wxString& rName
                           ,HPS             hPs
     virtual bool LoadFile( wxBitmap*       pBitmap
                           ,const wxString& rName
                           ,HPS             hPs

-                          ,long            lFlags
+                          ,wxBitmapType    lFlags

                           ,int             nDesiredWidth
                           ,int             nDesiredHeight
                          );
     virtual bool SaveFile( wxBitmap*        pBitmap
                           ,const wxString&  rName
                           ,int             nDesiredWidth
                           ,int             nDesiredHeight
                          );
     virtual bool SaveFile( wxBitmap*        pBitmap
                           ,const wxString&  rName

-                          ,int              lType
+                          ,wxBitmapType     lType

                           ,const wxPalette* pPalette = NULL
                          );
 
 private:
     inline virtual bool LoadFile( wxBitmap*       pBitmap
                                  ,int             nId
                           ,const wxPalette* pPalette = NULL
                          );
 
 private:
     inline virtual bool LoadFile( wxBitmap*       pBitmap
                                  ,int             nId

-                                 ,long            lFlags
+                                 ,wxBitmapType    lFlags

                                  ,int             nDesiredWidth
                                  ,int             nDesiredHeight
                                 )
                                  ,int             nDesiredWidth
                                  ,int             nDesiredHeight
                                 )


@@ -85,7 +81,7 @@ private:
 class WXDLLEXPORT wxBMPResourceHandler: public wxBitmapHandler
 {
 public:
 class WXDLLEXPORT wxBMPResourceHandler: public wxBitmapHandler
 {
 public:

-    wxBMPResourceHandler() : wxBitmapHandler(_T("Windows bitmap resource"),
+    wxBMPResourceHandler() : wxBitmapHandler(wxT("Windows bitmap resource"),

                                              wxEmptyString,
                                              wxBITMAP_TYPE_BMP_RESOURCE)
     {
                                              wxEmptyString,
                                              wxBITMAP_TYPE_BMP_RESOURCE)
     {


@@ -93,7 +89,7 @@ public:
 
     virtual bool LoadFile( wxBitmap*       pBitmap
                           ,int             nId
 
     virtual bool LoadFile( wxBitmap*       pBitmap
                           ,int             nId

-                          ,long            lFlags
+                          ,wxBitmapType    lFlags

                           ,int             nDesiredWidth
                           ,int             nDesiredHeight
                          );
                           ,int             nDesiredWidth
                           ,int             nDesiredHeight
                          );


@@ -107,7 +103,7 @@ class WXDLLEXPORT wxIconHandler : public wxGDIImageHandler
 public:
     wxIconHandler( const wxString& rName
                   ,const wxString& rExt
 public:
     wxIconHandler( const wxString& rName
                   ,const wxString& rExt

-                  ,long            lType
+                  ,wxBitmapType    lType

                  ) : wxGDIImageHandler( rName
                                        ,rExt
                                        ,lType
                  ) : wxGDIImageHandler( rName
                                        ,rExt
                                        ,lType


@@ -117,33 +113,33 @@ public:
 
     // creating and saving icons is not supported
     virtual bool Create( wxGDIImage* WXUNUSED(pImage)
 
     // creating and saving icons is not supported
     virtual bool Create( wxGDIImage* WXUNUSED(pImage)

-                        ,void*       WXUNUSED(pData)
-                        ,long        WXUNUSED(lFlags)
+                        ,const void* WXUNUSED(pData)
+                        ,wxBitmapType WXUNUSED(lFlags)

                         ,int         WXUNUSED(nWidth)
                         ,int         WXUNUSED(nHeight)
                         ,int         WXUNUSED(nDepth) = 1
                        )
     {
                         ,int         WXUNUSED(nWidth)
                         ,int         WXUNUSED(nHeight)
                         ,int         WXUNUSED(nDepth) = 1
                        )
     {

-        return(FALSE);
+        return false;

     }
 
     }
 

-    virtual bool Save( wxGDIImage*     WXUNUSED(pImage)
-                      ,const wxString& WXUNUSED(rName)
-                      ,int             WXUNUSED(nType)
-                     )
+    virtual bool Save( const wxGDIImage* WXUNUSED(pImage)
+                      ,const wxString&   WXUNUSED(rName)
+                      ,wxBitmapType      WXUNUSED(nType)
+                     ) const

     {
     {

-        return(FALSE);
+        return false;

     }
     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
                      )
     {
         wxIcon*                     pIcon = wxDynamicCast(pImage, wxIcon);
                       ,int             nDesiredWidth
                       ,int             nDesiredHeight
                      )
     {
         wxIcon*                     pIcon = wxDynamicCast(pImage, wxIcon);

-        wxCHECK_MSG(pIcon, FALSE, _T("wxIconHandler only works with icons"));
+        wxCHECK_MSG(pIcon, false, wxT("wxIconHandler only works with icons"));

 
         return LoadIcon( pIcon
                         ,rName
 
         return LoadIcon( pIcon
                         ,rName


@@ -158,14 +154,14 @@ protected:
     virtual bool LoadIcon( wxIcon*         pIcon
                           ,const wxString& rName
                           ,HPS             hPs
     virtual bool LoadIcon( wxIcon*         pIcon
                           ,const wxString& rName
                           ,HPS             hPs

-                          ,long            lFlags
+                          ,wxBitmapType    lFlags

                           ,int             nDesiredWidth = -1
                           ,int             nDesiredHeight = -1
                          ) = 0;
 private:
     inline virtual bool Load( wxGDIImage* WXUNUSED(pImage),
                               int         WXUNUSED(nId),
                           ,int             nDesiredWidth = -1
                           ,int             nDesiredHeight = -1
                          ) = 0;
 private:
     inline virtual bool Load( wxGDIImage* WXUNUSED(pImage),
                               int         WXUNUSED(nId),

-                              long        WXUNUSED(lFlags),
+                              wxBitmapType WXUNUSED(lFlags),

                               int         WXUNUSED(nDesiredWidth),
                               int         WXUNUSED(nDesiredHeight) )
     {
                               int         WXUNUSED(nDesiredWidth),
                               int         WXUNUSED(nDesiredHeight) )
     {


@@ -176,8 +172,8 @@ private:
 class WXDLLEXPORT wxICOFileHandler : public wxIconHandler
 {
 public:
 class WXDLLEXPORT wxICOFileHandler : public wxIconHandler
 {
 public:

-    wxICOFileHandler() : wxIconHandler(_T("ICO icon file"),
-                                       _T("ico"),
+    wxICOFileHandler() : wxIconHandler(wxT("ICO icon file"),
+                                       wxT("ico"),

                                        wxBITMAP_TYPE_ICO)
     {
     }
                                        wxBITMAP_TYPE_ICO)
     {
     }


@@ -185,7 +181,7 @@ public:
     virtual bool LoadIcon( wxIcon *        pIcon
                           ,const wxString& rName
                           ,HPS             hPs
     virtual bool LoadIcon( wxIcon *        pIcon
                           ,const wxString& rName
                           ,HPS             hPs

-                          ,long            lFlags
+                          ,wxBitmapType    lFlags

                           ,int             nDesiredWidth = -1
                           ,int             nDesiredHeight = -1
                          );
                           ,int             nDesiredWidth = -1
                           ,int             nDesiredHeight = -1
                          );


@@ -197,8 +193,8 @@ private:
 class WXDLLEXPORT wxICOResourceHandler: public wxIconHandler
 {
 public:
 class WXDLLEXPORT wxICOResourceHandler: public wxIconHandler
 {
 public:

-    wxICOResourceHandler() : wxIconHandler(_T("ICO resource"),
-                                           _T("ico"),
+    wxICOResourceHandler() : wxIconHandler(wxT("ICO resource"),
+                                           wxT("ico"),

                                            wxBITMAP_TYPE_ICO_RESOURCE)
     {
     }
                                            wxBITMAP_TYPE_ICO_RESOURCE)
     {
     }


@@ -206,7 +202,7 @@ public:
     virtual bool LoadIcon( wxIcon*         pIcon
                           ,const wxString& rName
                           ,HPS             hPs
     virtual bool LoadIcon( wxIcon*         pIcon
                           ,const wxString& rName
                           ,HPS             hPs

-                          ,long            lFlags
+                          ,wxBitmapType    lFlags

                           ,int             nDesiredWidth = -1
                           ,int             nDesiredHeight = -1
                          );
                           ,int             nDesiredWidth = -1
                           ,int             nDesiredHeight = -1
                          );


@@ -245,7 +241,7 @@ bool wxGDIImage::FreeResource( bool WXUNUSED(bForce) )
     return true;
 }
 
     return true;
 }
 

-WXHANDLE wxGDIImage::GetResourceHandle()
+WXHANDLE wxGDIImage::GetResourceHandle() const

 {
     return GetHandle();
 }
 {
     return GetHandle();
 }


@@ -291,12 +287,12 @@ wxGDIImageHandler* wxGDIImage::FindHandler(
             return pHandler;
         pNode = pNode->GetNext();
     }
             return pHandler;
         pNode = pNode->GetNext();
     }

-    return((wxGDIImageHandler*)NULL);
+    return(NULL);

 }
 
 wxGDIImageHandler* wxGDIImage::FindHandler(
   const wxString&                   rExtension
 }
 
 wxGDIImageHandler* wxGDIImage::FindHandler(
   const wxString&                   rExtension

-, long                              lType
+, wxBitmapType                      lType

 )
 {
     wxGDIImageHandlerList::compatibility_iterator   pNode = ms_handlers.GetFirst();
 )
 {
     wxGDIImageHandlerList::compatibility_iterator   pNode = ms_handlers.GetFirst();


@@ -304,18 +300,18 @@ wxGDIImageHandler* wxGDIImage::FindHandler(
     {
         wxGDIImageHandler*          pHandler = pNode->GetData();
 
     {
         wxGDIImageHandler*          pHandler = pNode->GetData();
 

-        if ( (pHandler->GetExtension() = rExtension) &&
+        if ( (pHandler->GetExtension() == rExtension) &&

              (lType == -1 || pHandler->GetType() == lType) )
         {
             return pHandler;
         }
         pNode = pNode->GetNext();
     }
              (lType == -1 || pHandler->GetType() == lType) )
         {
             return pHandler;
         }
         pNode = pNode->GetNext();
     }

-    return((wxGDIImageHandler*)NULL);
+    return(NULL);

 }
 
 wxGDIImageHandler* wxGDIImage::FindHandler(
 }
 
 wxGDIImageHandler* wxGDIImage::FindHandler(

-  long                              lType
+  wxBitmapType                           lType

 )
 {
     wxGDIImageHandlerList::compatibility_iterator   pNode = ms_handlers.GetFirst();
 )
 {
     wxGDIImageHandlerList::compatibility_iterator   pNode = ms_handlers.GetFirst();


@@ -328,7 +324,7 @@ wxGDIImageHandler* wxGDIImage::FindHandler(
             return pHandler;
         pNode = pNode->GetNext();
     }
             return pHandler;
         pNode = pNode->GetNext();
     }

-    return((wxGDIImageHandler*)NULL);
+    return(NULL);

 }
 
 void wxGDIImage::CleanUpHandlers()
 }
 
 void wxGDIImage::CleanUpHandlers()


@@ -360,7 +356,7 @@ void wxGDIImage::InitStandardHandlers()
 
 bool wxBMPResourceHandler::LoadFile( wxBitmap* pBitmap,
                                      int       nId,
 
 bool wxBMPResourceHandler::LoadFile( wxBitmap* pBitmap,
                                      int       nId,

-                                     long      WXUNUSED(lFlags),
+                                     wxBitmapType WXUNUSED(lFlags),

                                      int       WXUNUSED(nDesiredWidth),
                                      int       WXUNUSED(nDesiredHeight) )
 {
                                      int       WXUNUSED(nDesiredWidth),
                                      int       WXUNUSED(nDesiredHeight) )
 {


@@ -380,7 +376,7 @@ bool wxBMPResourceHandler::LoadFile( wxBitmap* pBitmap,
 
     wxBitmapRefData*                pData = pBitmap->GetBitmapData();
 
 
     wxBitmapRefData*                pData = pBitmap->GetBitmapData();
 

-    if ( pBitmap->Ok() )
+    if ( pBitmap->IsOk() )

     {
         BITMAPINFOHEADER            vBmph;
 
     {
         BITMAPINFOHEADER            vBmph;
 


@@ -389,17 +385,17 @@ bool wxBMPResourceHandler::LoadFile( wxBitmap* pBitmap,
         pData->m_nHeight = vBmph.cy;
         pData->m_nDepth  = vBmph.cBitCount;
     }
         pData->m_nHeight = vBmph.cy;
         pData->m_nDepth  = vBmph.cBitCount;
     }

-    return(pBitmap->Ok());
+    return(pBitmap->IsOk());

 } // end of wxBMPResourceHandler::LoadFile
 
 bool wxBMPFileHandler::LoadFile( wxBitmap*       pBitmap,
                                  const wxString& WXUNUSED(rName),
                                  HPS             WXUNUSED(hPs),
 } // end of wxBMPResourceHandler::LoadFile
 
 bool wxBMPFileHandler::LoadFile( wxBitmap*       pBitmap,
                                  const wxString& WXUNUSED(rName),
                                  HPS             WXUNUSED(hPs),

-                                 long            WXUNUSED(lFlags),
+                                 wxBitmapType    WXUNUSED(lFlags),

                                  int             WXUNUSED(nDesiredWidth),
                                  int             WXUNUSED(nDesiredHeight) )
 {
                                  int             WXUNUSED(nDesiredWidth),
                                  int             WXUNUSED(nDesiredHeight) )
 {

-#if wxUSE_IMAGE_LOADING_IN_OS2
+#if defined(wxUSE_IMAGE_LOADING_IN_OS2) && wxUSE_IMAGE_LOADING_IN_OS2

     wxPalette* pPalette = NULL;
 
     bool bSuccess = false; /* wxLoadIntoBitmap( WXSTRINGCAST rName
     wxPalette* pPalette = NULL;
 
     bool bSuccess = false; /* wxLoadIntoBitmap( WXSTRINGCAST rName


@@ -423,10 +419,10 @@ bool wxBMPFileHandler::LoadFile( wxBitmap*       pBitmap,
 
 bool wxBMPFileHandler::SaveFile( wxBitmap*        pBitmap,
                                  const wxString&  WXUNUSED(rName),
 
 bool wxBMPFileHandler::SaveFile( wxBitmap*        pBitmap,
                                  const wxString&  WXUNUSED(rName),

-                                 int              WXUNUSED(nType),
+                                 wxBitmapType     WXUNUSED(nType),

                                  const wxPalette* pPal )
 {
                                  const wxPalette* pPal )
 {

-#if wxUSE_IMAGE_LOADING_IN_OS2
+#if defined(wxUSE_IMAGE_LOADING_IN_OS2) && wxUSE_IMAGE_LOADING_IN_OS2

     wxPalette* pActualPalette = (wxPalette *)pPal;
 
     if (!pActualPalette)
     wxPalette* pActualPalette = (wxPalette *)pPal;
 
     if (!pActualPalette)


@@ -450,11 +446,11 @@ bool wxBMPFileHandler::SaveFile( wxBitmap*        pBitmap,
 bool wxICOFileHandler::LoadIcon( wxIcon*         pIcon,
                                  const wxString& WXUNUSED(rName),
                                  HPS             WXUNUSED(hPs),
 bool wxICOFileHandler::LoadIcon( wxIcon*         pIcon,
                                  const wxString& WXUNUSED(rName),
                                  HPS             WXUNUSED(hPs),

-                                 long            WXUNUSED(lFlags),
+                                 wxBitmapType    WXUNUSED(lFlags),

                                  int             WXUNUSED(nDesiredWidth),
                                  int             WXUNUSED(nDesiredHeight) )
 {
                                  int             WXUNUSED(nDesiredWidth),
                                  int             WXUNUSED(nDesiredHeight) )
 {

-#if wxUSE_RESOURCE_LOADING_IN_OS2
+#if defined(wxUSE_RESOURCE_LOADING_IN_OS2) && wxUSE_RESOURCE_LOADING_IN_OS2

     pIcon->UnRef();
 
     return false;
     pIcon->UnRef();
 
     return false;


@@ -467,13 +463,13 @@ bool wxICOFileHandler::LoadIcon( wxIcon*         pIcon,
 bool wxICOResourceHandler::LoadIcon( wxIcon*         pIcon,
                                      const wxString& rName,
                                      HPS             WXUNUSED(hPs),
 bool wxICOResourceHandler::LoadIcon( wxIcon*         pIcon,
                                      const wxString& rName,
                                      HPS             WXUNUSED(hPs),

-                                     long            WXUNUSED(lFlags),
+                                     wxBitmapType    WXUNUSED(lFlags),

                                      int             WXUNUSED(nDesiredWidth),
                                      int             WXUNUSED(nDesiredHeight) )
 {
     HPOINTER                        hIcon;
 
                                      int             WXUNUSED(nDesiredWidth),
                                      int             WXUNUSED(nDesiredHeight) )
 {
     HPOINTER                        hIcon;
 

-    hIcon = ::WinLoadFileIcon( (PSZ)rName.c_str()
+    hIcon = ::WinLoadFileIcon( rName.c_str()

                               ,TRUE // load for private use
                              );
 
                               ,TRUE // load for private use
                              );
 


@@ -481,5 +477,5 @@ bool wxICOResourceHandler::LoadIcon( wxIcon*         pIcon,
 
     pIcon->SetHICON((WXHICON)hIcon);
 
 
     pIcon->SetHICON((WXHICON)hIcon);
 

-    return pIcon->Ok();
+    return pIcon->IsOk();

 } // end of wxICOResourceHandler::LoadIcon
 } // end of wxICOResourceHandler::LoadIcon