recognize schemes other than http and ftp in wxLaunchDefaultBrowser()

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

diff --git a/src/os2/dc.cpp b/src/os2/dc.cpp
index c8fec9f68f9149d60307a3c988b730da12c9cbd5..998873614140df5f08a3f1f2d5fa4888d841a76f 100644 (file)
--- a/src/os2/dc.cpp
+++ b/src/os2/dc.cpp
@@ -444,7 +444,7 @@ void wxPMDCImpl::DoSetClippingRegion(
     DO_SET_CLIPPING_BOX()
 } // end of wxPMDCImpl::DoSetClippingRegion
 
     DO_SET_CLIPPING_BOX()
 } // end of wxPMDCImpl::DoSetClippingRegion
 

-void wxPMDCImpl::DoSetClippingRegionAsRegion(
+void wxPMDCImpl::DoSetDeviceClippingRegion(

   const wxRegion&                   rRegion
 )
 {
   const wxRegion&                   rRegion
 )
 {


@@ -457,7 +457,7 @@ void wxPMDCImpl::DoSetClippingRegionAsRegion(
                         ,&hRgnOld
                        );
     DO_SET_CLIPPING_BOX()
                         ,&hRgnOld
                        );
     DO_SET_CLIPPING_BOX()

-} // end of wxPMDCImpl::DoSetClippingRegionAsRegion
+} // end of wxPMDCImpl::DoSetDeviceClippingRegion

 
 void wxPMDCImpl::DestroyClippingRegion(void)
 {
 
 void wxPMDCImpl::DestroyClippingRegion(void)
 {


@@ -540,7 +540,7 @@ bool wxPMDCImpl::DoFloodFill(
   wxCoord                           vX
 , wxCoord                           vY
 , const wxColour&                   rCol
   wxCoord                           vX
 , wxCoord                           vY
 , const wxColour&                   rCol

-, int                               nStyle
+, wxFloodFillStyle                  nStyle

 )
 {
     POINTL                          vPtlPos;
 )
 {
     POINTL                          vPtlPos;


@@ -839,7 +839,7 @@ void wxPMDCImpl::DoDrawPolygon( int n,
                           wxPoint vPoints[],
                           wxCoord vXoffset,
                           wxCoord vYoffset,
                           wxPoint vPoints[],
                           wxCoord vXoffset,
                           wxCoord vYoffset,

-                          int nFillStyle )
+                          wxPolygonFillMode nFillStyle )

 {
     ULONG     ulCount = 1;    // Number of polygons.
     POLYGON   vPlgn;          // polygon.
 {
     ULONG     ulCount = 1;    // Number of polygons.
     POLYGON   vPlgn;          // polygon.


@@ -2017,7 +2017,7 @@ void wxPMDCImpl::SetBackgroundMode(int nMode)
     m_backgroundMode = nMode;
 } // end of wxPMDCImpl::SetBackgroundMode
 
     m_backgroundMode = nMode;
 } // end of wxPMDCImpl::SetBackgroundMode
 

-void wxPMDCImpl::SetLogicalFunction(int nFunction)
+void wxPMDCImpl::SetLogicalFunction(wxRasterOperationMode nFunction)

 {
     m_logicalFunction = nFunction;
     SetRop((WXHDC)m_hDC);
 {
     m_logicalFunction = nFunction;
     SetRop((WXHDC)m_hDC);


@@ -2165,7 +2165,7 @@ void wxPMDCImpl::DoGetTextExtent(
                            ,wxICON_INFORMATION
                            );
     }
                            ,wxICON_INFORMATION
                            );
     }

-       
+

     bRc = ::GpiQueryTextBox( m_hPS
                             ,l
                             ,rsString.char_str()
     bRc = ::GpiQueryTextBox( m_hPS
                             ,l
                             ,rsString.char_str()


@@ -2211,7 +2211,7 @@ void wxPMDCImpl::DoGetTextExtent(
 }
 
 void wxPMDCImpl::SetMapMode(
 }
 
 void wxPMDCImpl::SetMapMode(

-  int                               nMode
+  wxMappingMode                     nMode

 )
 {
     int                             nPixelWidth = 0;
 )
 {
     int                             nPixelWidth = 0;


@@ -2285,7 +2285,7 @@ void wxPMDCImpl::SetMapMode(
         ::GpiSetPS(m_hPS, &vSize, ulOptions);
     }
     ComputeScaleAndOrigin();
         ::GpiSetPS(m_hPS, &vSize, ulOptions);
     }
     ComputeScaleAndOrigin();

-    
+

 }; // end of wxPMDCImpl::SetMapMode
 
 void wxPMDCImpl::SetUserScale( double dX,
 }; // end of wxPMDCImpl::SetMapMode
 
 void wxPMDCImpl::SetUserScale( double dX,


@@ -2357,7 +2357,7 @@ bool wxPMDCImpl::DoBlit( wxCoord vXdest,
                    wxDC*   pSource,
                    wxCoord vXsrc,
                    wxCoord vYsrc,
                    wxDC*   pSource,
                    wxCoord vXsrc,
                    wxCoord vYsrc,

-                   int     nRop,
+                   wxRasterOperationMode     nRop,

                    bool    bUseMask,
                    wxCoord WXUNUSED(vXsrcMask),
                    wxCoord WXUNUSED(vYsrcMask) )
                    bool    bUseMask,
                    wxCoord WXUNUSED(vXsrcMask),
                    wxCoord WXUNUSED(vYsrcMask) )