Added support for wxTEXT_ATTR_EFFECT_SMALL_CAPITALS.

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

diff --git a/src/os2/dc.cpp b/src/os2/dc.cpp
index 47e40bc3bb3c707703ef273d276807412d810345..b13314253a08739cc580bd976af32dcbd8269941 100644 (file)
--- a/src/os2/dc.cpp
+++ b/src/os2/dc.cpp
@@ -343,7 +343,7 @@ wxPMDCImpl::wxPMDCImpl( wxDC *owner, WXHDC hDC ) :
     m_hDC          = hDC;
 } // end of wxPMDCImpl::wxPMDCImpl
 
     m_hDC          = hDC;
 } // end of wxPMDCImpl::wxPMDCImpl
 

-wxPMDCImpl::~wxPMDCImpl(void)
+wxPMDCImpl::~wxPMDCImpl()

 {
     if ( m_hDC != 0 )
     {
 {
     if ( m_hDC != 0 )
     {


@@ -386,7 +386,7 @@ void wxPMDCImpl::SelectOldObjects(
         if (m_hOldBitmap)
         {
             ::GpiSetBitmap(hPS, (HBITMAP) m_hOldBitmap);
         if (m_hOldBitmap)
         {
             ::GpiSetBitmap(hPS, (HBITMAP) m_hOldBitmap);

-            if (m_vSelectedBitmap.Ok())
+            if (m_vSelectedBitmap.IsOk())

             {
                 m_vSelectedBitmap.SetSelectedInto(NULL);
             }
             {
                 m_vSelectedBitmap.SetSelectedInto(NULL);
             }


@@ -459,7 +459,7 @@ void wxPMDCImpl::DoSetDeviceClippingRegion(
     DO_SET_CLIPPING_BOX()
 } // end of wxPMDCImpl::DoSetDeviceClippingRegion
 
     DO_SET_CLIPPING_BOX()
 } // end of wxPMDCImpl::DoSetDeviceClippingRegion
 

-void wxPMDCImpl::DestroyClippingRegion(void)
+void wxPMDCImpl::DestroyClippingRegion()

 {
     if (m_clipping && m_hPS)
     {
 {
     if (m_clipping && m_hPS)
     {


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


@@ -644,7 +644,7 @@ void wxPMDCImpl::DoDrawLine(
     }
     else
     {
     }
     else
     {

-        if (m_vSelectedBitmap.Ok())
+        if (m_vSelectedBitmap.IsOk())

         {
             m_vRclPaint.yTop = m_vSelectedBitmap.GetHeight();
             m_vRclPaint.xRight = m_vSelectedBitmap.GetWidth();
         {
             m_vRclPaint.yTop = m_vSelectedBitmap.GetHeight();
             m_vRclPaint.xRight = m_vSelectedBitmap.GetWidth();


@@ -656,7 +656,7 @@ void wxPMDCImpl::DoDrawLine(
     vPoint[0].y = vY1;
     vPoint[1].x = vX2;
     vPoint[1].y = vY2;
     vPoint[0].y = vY1;
     vPoint[1].x = vX2;
     vPoint[1].y = vY2;

-    if (m_pen.Ok())
+    if (m_pen.IsOk())

     {
         vColor = m_pen.GetColour().GetPixel();
     }
     {
         vColor = m_pen.GetColour().GetPixel();
     }


@@ -822,7 +822,7 @@ void wxPMDCImpl::DoDrawPoint(
     POINTL                          vPoint;
     COLORREF                        vColor = 0x00ffffff;
 
     POINTL                          vPoint;
     COLORREF                        vColor = 0x00ffffff;
 

-    if (m_pen.Ok())
+    if (m_pen.IsOk())

     {
         vColor = m_pen.GetColour().GetPixel();
     }
     {
         vColor = m_pen.GetColour().GetPixel();
     }


@@ -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.


@@ -910,7 +910,7 @@ void wxPMDCImpl::DoDrawLines(
 {
     POINTL                          vPoint;
 
 {
     POINTL                          vPoint;
 

-    if (vXoffset != 0L || vXoffset != 0L)
+    if (vXoffset != 0L || vYoffset != 0L)

     {
         int                             i;
 
     {
         int                             i;
 


@@ -974,7 +974,7 @@ void wxPMDCImpl::DoDrawRectangle(
         vY = OS2Y(vY,vHeight);
     else
     {
         vY = OS2Y(vY,vHeight);
     else
     {

-        if (m_vSelectedBitmap.Ok())
+        if (m_vSelectedBitmap.IsOk())

         {
             m_vRclPaint.yTop = m_vSelectedBitmap.GetHeight();
             m_vRclPaint.xRight = m_vSelectedBitmap.GetWidth();
         {
             m_vRclPaint.yTop = m_vSelectedBitmap.GetHeight();
             m_vRclPaint.xRight = m_vSelectedBitmap.GetWidth();


@@ -1064,7 +1064,7 @@ void wxPMDCImpl::DoDrawRoundedRectangle(
         vY = OS2Y(vY,vHeight);
     else
     {
         vY = OS2Y(vY,vHeight);
     else
     {

-        if (m_vSelectedBitmap.Ok())
+        if (m_vSelectedBitmap.IsOk())

         {
             m_vRclPaint.yTop = m_vSelectedBitmap.GetHeight();
             m_vRclPaint.xRight = m_vSelectedBitmap.GetWidth();
         {
             m_vRclPaint.yTop = m_vSelectedBitmap.GetHeight();
             m_vRclPaint.xRight = m_vSelectedBitmap.GetWidth();


@@ -1359,7 +1359,7 @@ void wxPMDCImpl::DoDrawBitmap(
 
                     lColor = pWindowDC->m_pCanvas->GetBackgroundColour().GetPixel();
                 }
 
                     lColor = pWindowDC->m_pCanvas->GetBackgroundColour().GetPixel();
                 }

-                else if (GetBrush().Ok())
+                else if (GetBrush().IsOk())

                     lColor = GetBrush().GetColour().GetPixel();
                 else
                     lColor = m_textBackgroundColour.GetPixel();
                     lColor = GetBrush().GetColour().GetPixel();
                 else
                     lColor = m_textBackgroundColour.GetPixel();


@@ -1526,13 +1526,13 @@ void wxPMDCImpl::DoDrawBitmap(
             ULONG                       lOldForeGround = ::GpiQueryColor((HPS)GetHPS());
             ULONG                       lOldBackGround = ::GpiQueryBackColor((HPS)GetHPS());
 
             ULONG                       lOldForeGround = ::GpiQueryColor((HPS)GetHPS());
             ULONG                       lOldBackGround = ::GpiQueryBackColor((HPS)GetHPS());
 

-            if (m_textForegroundColour.Ok())
+            if (m_textForegroundColour.IsOk())

             {
                 ::GpiSetColor( (HPS)GetHPS()
                                ,m_textForegroundColour.GetPixel()
                               );
             }
             {
                 ::GpiSetColor( (HPS)GetHPS()
                                ,m_textForegroundColour.GetPixel()
                               );
             }

-            if (m_textBackgroundColour.Ok())
+            if (m_textBackgroundColour.IsOk())

             {
                 ::GpiSetBackColor( (HPS)GetHPS()
                                   ,m_textBackgroundColour.GetPixel()
             {
                 ::GpiSetBackColor( (HPS)GetHPS()
                                   ,m_textBackgroundColour.GetPixel()


@@ -1579,6 +1579,7 @@ void wxPMDCImpl::DoDrawBitmap(
                 {
                     vError = ::WinGetLastError(vHabmain);
                     sError = wxPMErrorToStr(vError);
                 {
                     vError = ::WinGetLastError(vHabmain);
                     sError = wxPMErrorToStr(vError);

+                    delete [] pucBits;

                     return;
                 }
                 if ((lScans = ::GpiQueryBitmapBits( hPS
                     return;
                 }
                 if ((lScans = ::GpiQueryBitmapBits( hPS


@@ -1590,6 +1591,7 @@ void wxPMDCImpl::DoDrawBitmap(
                 {
                     vError = ::WinGetLastError(vHabmain);
                     sError = wxPMErrorToStr(vError);
                 {
                     vError = ::WinGetLastError(vHabmain);
                     sError = wxPMErrorToStr(vError);

+                    delete [] pucBits;

                     return;
                 }
                 unsigned char           cOldRedFore   = (unsigned char)(lOldForeGround >> 16);
                     return;
                 }
                 unsigned char           cOldRedFore   = (unsigned char)(lOldForeGround >> 16);


@@ -1701,14 +1703,14 @@ void wxPMDCImpl::DrawAnyText( const wxString& rsText,
     //
     // Set text color attributes
     //
     //
     // Set text color attributes
     //

-    if (m_textForegroundColour.Ok())
+    if (m_textForegroundColour.IsOk())

     {
         SetTextColor( m_hPS
                      ,(int)m_textForegroundColour.GetPixel()
                     );
     }
 
     {
         SetTextColor( m_hPS
                      ,(int)m_textForegroundColour.GetPixel()
                     );
     }
 

-    if (m_textBackgroundColour.Ok())
+    if (m_textBackgroundColour.IsOk())

     {
         nOldBackground = SetTextBkColor( m_hPS
                                         ,(int)m_textBackgroundColour.GetPixel()
     {
         nOldBackground = SetTextBkColor( m_hPS
                                         ,(int)m_textBackgroundColour.GetPixel()


@@ -1731,7 +1733,7 @@ void wxPMDCImpl::DrawAnyText( const wxString& rsText,
     }
     else
     {
     }
     else
     {

-        if (m_vSelectedBitmap.Ok())
+        if (m_vSelectedBitmap.IsOk())

         {
             m_vRclPaint.yTop = m_vSelectedBitmap.GetHeight();
             m_vRclPaint.xRight = m_vSelectedBitmap.GetWidth();
         {
             m_vRclPaint.yTop = m_vSelectedBitmap.GetHeight();
             m_vRclPaint.xRight = m_vSelectedBitmap.GetWidth();


@@ -1756,7 +1758,7 @@ void wxPMDCImpl::DrawAnyText( const wxString& rsText,
     // it never is set to anything else, but background should remain
     // transparent even if we just drew an opaque string)
     //
     // it never is set to anything else, but background should remain
     // transparent even if we just drew an opaque string)
     //

-    if (m_textBackgroundColour.Ok())
+    if (m_textBackgroundColour.IsOk())

             SetTextBkColor( m_hPS
                            ,nOldBackground
                           );
             SetTextBkColor( m_hPS
                            ,nOldBackground
                           );


@@ -1847,7 +1849,7 @@ void wxPMDCImpl::DoSelectPalette( bool WXUNUSED(bRealize) )
         m_hOldPalette = 0;
     }
 
         m_hOldPalette = 0;
     }
 

-    if (m_palette.Ok())
+    if (m_palette.IsOk())

     {
         HPALETTE                    hOldPal;
 
     {
         HPALETTE                    hOldPal;
 


@@ -1889,7 +1891,7 @@ void wxPMDCImpl::SetPalette(
         m_hOldFont = 0;
     }
     m_palette = rPalette;
         m_hOldFont = 0;
     }
     m_palette = rPalette;

-    if (!rPalette.Ok())
+    if (!rPalette.IsOk())

     {
         if (m_hOldFont)
         {
     {
         if (m_hOldFont)
         {


@@ -1914,14 +1916,14 @@ void wxPMDCImpl::SetFont(
         m_hOldFont = 0;
     }
     m_font = rFont;
         m_hOldFont = 0;
     }
     m_font = rFont;

-    if (!rFont.Ok())
+    if (!rFont.IsOk())

     {
         m_hOldFont = 0;
     }
 
     m_font.SetPS(m_hPS); // this will realize the font
 
     {
         m_hOldFont = 0;
     }
 
     m_font.SetPS(m_hPS); // this will realize the font
 

-    if (m_font.Ok())
+    if (m_font.IsOk())

     {
         HFONT                       hFont = m_font.GetResourceHandle();
         if (hFont == (HFONT) NULL)
     {
         HFONT                       hFont = m_font.GetResourceHandle();
         if (hFont == (HFONT) NULL)


@@ -1940,14 +1942,14 @@ void wxPMDCImpl::SetPen(
     if (m_pen == rPen)
         return;
     m_pen = rPen;
     if (m_pen == rPen)
         return;
     m_pen = rPen;

-    if (!m_pen.Ok())
+    if (!m_pen.IsOk())

         return;
 
     if (m_hOldPen)
         m_hOldPen = 0L;
     m_pen = rPen;
 
         return;
 
     if (m_hOldPen)
         m_hOldPen = 0L;
     m_pen = rPen;
 

-    if (!m_pen.Ok())
+    if (!m_pen.IsOk())

     {
         if (m_hOldPen)
         {
     {
         if (m_hOldPen)
         {


@@ -1956,7 +1958,7 @@ void wxPMDCImpl::SetPen(
         m_hOldPen = 0L;
     }
 
         m_hOldPen = 0L;
     }
 

-    if (m_pen.Ok())
+    if (m_pen.IsOk())

     {
         if (m_pen.GetResourceHandle())
         {
     {
         if (m_pen.GetResourceHandle())
         {


@@ -1975,14 +1977,14 @@ void wxPMDCImpl::SetBrush(
     if (m_hOldBrush)
         m_hOldBrush = 0L;
     m_brush = rBrush;
     if (m_hOldBrush)
         m_hOldBrush = 0L;
     m_brush = rBrush;

-    if (!m_brush.Ok())
+    if (!m_brush.IsOk())

     if (m_brush == rBrush)
         return;
     if (m_brush == rBrush)
         return;

-    if (!m_brush.Ok())
+    if (!m_brush.IsOk())

         if (m_hOldBrush)
             m_hOldBrush = 0L;
 
         if (m_hOldBrush)
             m_hOldBrush = 0L;
 

-    if (!m_brush.Ok())
+    if (!m_brush.IsOk())

     {
         if (m_hOldBrush)
         {
     {
         if (m_hOldBrush)
         {


@@ -1991,7 +1993,7 @@ void wxPMDCImpl::SetBrush(
         m_hOldBrush = 0L;
     }
 
         m_hOldBrush = 0L;
     }
 

-    if (m_brush.Ok())
+    if (m_brush.IsOk())

     {
         if (m_brush.GetResourceHandle())
         {
     {
         if (m_brush.GetResourceHandle())
         {


@@ -2006,7 +2008,7 @@ void wxPMDCImpl::SetBackground(const wxBrush& rBrush)
 {
     m_backgroundBrush = rBrush;
 
 {
     m_backgroundBrush = rBrush;
 

-    if (m_backgroundBrush.Ok())
+    if (m_backgroundBrush.IsOk())

     {
         (void)::GpiSetBackColor((HPS)m_hPS, m_backgroundBrush.GetColour().GetPixel());
     }
     {
         (void)::GpiSetBackColor((HPS)m_hPS, m_backgroundBrush.GetColour().GetPixel());
     }


@@ -2017,7 +2019,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);


@@ -2160,12 +2162,12 @@ void wxPMDCImpl::DoGetTextExtent(
     //
     if (!m_hPS)
     {
     //
     if (!m_hPS)
     {

-       (void)wxMessageBox( _T("wxWidgets core library")
-                           ,"Using uninitialized DC for measuring text!\n"
-                           ,wxICON_INFORMATION
-                           );
+    (void)wxMessageBox( wxT("wxWidgets core library")
+                ,"Using uninitialized DC for measuring text!\n"
+                ,wxICON_INFORMATION
+                );

     }
     }

-       
+

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


@@ -2177,8 +2179,8 @@ void wxPMDCImpl::DoGetTextExtent(
        vErrorCode = ::WinGetLastError(wxGetInstance());
        sError = wxPMErrorToStr(vErrorCode);
        // DEBUG
        vErrorCode = ::WinGetLastError(wxGetInstance());
        sError = wxPMErrorToStr(vErrorCode);
        // DEBUG

-       wxSprintf(zMsg, _T("GpiQueryTextBox for %s: failed with Error: %lx - %s"), rsString.c_str(), vErrorCode, sError.c_str());
-       (void)wxMessageBox( _T("wxWidgets core library")
+       wxSprintf(zMsg, wxT("GpiQueryTextBox for %s: failed with Error: %lx - %s"), rsString.c_str(), vErrorCode, sError.c_str());
+       (void)wxMessageBox( wxT("wxWidgets core library")

                           ,zMsg
                           ,wxICON_INFORMATION
                          );
                           ,zMsg
                           ,wxICON_INFORMATION
                          );


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

-  int                               nMode
+  wxMappingMode                     nMode

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


@@ -2285,7 +2287,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 +2359,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) )


@@ -2381,7 +2383,7 @@ bool wxPMDCImpl::DoBlit( wxCoord vXdest,
         const wxBitmap&             rBmp = pm_impl->GetSelectedBitmap();
 
         pMask = rBmp.GetMask();
         const wxBitmap&             rBmp = pm_impl->GetSelectedBitmap();
 
         pMask = rBmp.GetMask();

-        if (!(rBmp.Ok() && pMask && pMask->GetMaskBitmap()))
+        if (!(rBmp.IsOk() && pMask && pMask->GetMaskBitmap()))

         {
             bUseMask = false;
         }
         {
             bUseMask = false;
         }


@@ -2394,7 +2396,7 @@ bool wxPMDCImpl::DoBlit( wxCoord vXdest,
                    );
     vOldTextColor = (COLORREF)vCbnd.lColor;
 
                    );
     vOldTextColor = (COLORREF)vCbnd.lColor;
 

-    if (m_textForegroundColour.Ok())
+    if (m_textForegroundColour.IsOk())

     {
         vCbnd.lColor = (LONG)m_textForegroundColour.GetPixel();
         ::GpiSetAttrs( m_hPS           // presentation-space handle
     {
         vCbnd.lColor = (LONG)m_textForegroundColour.GetPixel();
         ::GpiSetAttrs( m_hPS           // presentation-space handle


@@ -2404,7 +2406,7 @@ bool wxPMDCImpl::DoBlit( wxCoord vXdest,
                       ,&vCbnd          // buffer for attributes.
                      );
     }
                       ,&vCbnd          // buffer for attributes.
                      );
     }

-    if (m_textBackgroundColour.Ok())
+    if (m_textBackgroundColour.IsOk())

     {
         ::GpiSetBackColor(m_hPS, (LONG)m_textBackgroundColour.GetPixel());
     }
     {
         ::GpiSetBackColor(m_hPS, (LONG)m_textBackgroundColour.GetPixel());
     }