Add new definitions required by MinGW for webview. Re-enable custom schemes as a...

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

diff --git a/src/os2/gdiimage.cpp b/src/os2/gdiimage.cpp
index 94d7e4fb896d2e7ce2e84cfe5e3d630c0a5dfacd..405d2221f3bf3a580219807e43f3fef4cd46977b 100644 (file)
--- a/src/os2/gdiimage.cpp
+++ b/src/os2/gdiimage.cpp
@@ -42,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)
     {
     }


@@ -81,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)
     {


@@ -139,7 +139,7 @@ public:
                      )
     {
         wxIcon*                     pIcon = wxDynamicCast(pImage, wxIcon);
                      )
     {
         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


@@ -172,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)
     {
     }


@@ -193,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)
     {
     }


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

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

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


@@ -307,7 +307,7 @@ wxGDIImageHandler* wxGDIImage::FindHandler(
         }
         pNode = pNode->GetNext();
     }
         }
         pNode = pNode->GetNext();
     }

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

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


@@ -324,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()


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


@@ -385,7 +385,7 @@ 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,
 } // end of wxBMPResourceHandler::LoadFile
 
 bool wxBMPFileHandler::LoadFile( wxBitmap*       pBitmap,


@@ -477,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