Fixed remaining int vs. long warnings.

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

diff --git a/src/os2/dc.cpp b/src/os2/dc.cpp
index a5787d1f03ab7e34736bf9e830242d12b19b8973..05dbc01904415c9720eb7cb57e9f11cc6fc86fc1 100644 (file)
--- a/src/os2/dc.cpp
+++ b/src/os2/dc.cpp
@@ -31,9 +31,7 @@
 
 #include "wx/os2/private.h"
 
 
 #include "wx/os2/private.h"
 

-#if !USE_SHARED_LIBRARY

     IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
     IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)

-#endif

 
 // ---------------------------------------------------------------------------
 // constants
 
 // ---------------------------------------------------------------------------
 // constants


@@ -127,8 +125,8 @@ void wxDC::DoSetClippingRegionAsRegion(const wxRegion& region)
    // TODO
 }
 
    // TODO
 }
 

-void wxDC::DoSetClippingRegion( long x, long y
-                               ,long width, long height
+void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y
+                               ,wxCoord width, wxCoord height

                               )
 {
    // TODO
                               )
 {
    // TODO


@@ -182,8 +180,8 @@ void wxDC::Clear()
    // TODO
 }
 
    // TODO
 }
 

-void wxDC::DoFloodFill( long x
-                       ,long y
+void wxDC::DoFloodFill( wxCoord x
+                       ,wxCoord y

                        ,const wxColour& col
                        ,int style
                       )
                        ,const wxColour& col
                        ,int style
                       )


@@ -191,37 +189,37 @@ void wxDC::DoFloodFill( long x
    // TODO
 }
 
    // TODO
 }
 

-bool wxDC::DoGetPixel(long x, long y, wxColour *col) const
+bool wxDC::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const

 {
    // TODO
    return(TRUE);
 }
 
 {
    // TODO
    return(TRUE);
 }
 

-void wxDC::DoCrossHair(long x, long y)
+void wxDC::DoCrossHair(wxCoord x, wxCoord y)

 {
    // TODO
 }
 
 {
    // TODO
 }
 

-void wxDC::DoDrawLine(long x1, long y1, long x2, long y2)
+void wxDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)

 {
    // TODO
 }
 
 {
    // TODO
 }
 

-void wxDC::DoDrawArc( long x1, long y1
-                     ,long x2, long y2
-                     ,long xc, long yc
+void wxDC::DoDrawArc( wxCoord x1, wxCoord y1
+                     ,wxCoord x2, wxCoord y2
+                     ,wxCoord xc, wxCoord yc

                     )
 {
    // TODO
 }
 
                     )
 {
    // TODO
 }
 

-void wxDC::DoDrawPoint(long x, long y)
+void wxDC::DoDrawPoint(wxCoord x, wxCoord y)

 {
    // TODO
 }
 
 void wxDC::DoDrawPolygon(int n, wxPoint points[]
 {
    // TODO
 }
 
 void wxDC::DoDrawPolygon(int n, wxPoint points[]

-                         ,long xoffset, long yoffset
+                         ,wxCoord xoffset, wxCoord yoffset

                          ,int fillStyle
                         )
 {
                          ,int fillStyle
                         )
 {


@@ -229,34 +227,34 @@ void wxDC::DoDrawPolygon(int n, wxPoint points[]
 }
 
 void wxDC::DoDrawLines( int n, wxPoint points[]
 }
 
 void wxDC::DoDrawLines( int n, wxPoint points[]

-                       ,long xoffset, long yoffset
+                       ,wxCoord xoffset, wxCoord yoffset

                       )
 {
    // TODO
 }
 
                       )
 {
    // TODO
 }
 

-void wxDC::DoDrawRectangle(long x, long y, long width, long height)
+void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)

 {
    // TODO
 }
 
 {
    // TODO
 }
 

-void wxDC::DoDrawRoundedRectangle( long x, long y
-                                  ,long width, long height
+void wxDC::DoDrawRoundedRectangle( wxCoord x, wxCoord y
+                                  ,wxCoord width, wxCoord height

                                   ,double radius
                                  )
 {
    // TODO
 }
 
                                   ,double radius
                                  )
 {
    // TODO
 }
 

-void wxDC::DoDrawEllipse(long x, long y, long width, long height)
+void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)

 {
    // TODO
 }
 
 {
    // TODO
 }
 

-void wxDC::DoDrawEllipticArc( long x
-                             ,long y
-                             ,long w
-                             ,long h
+void wxDC::DoDrawEllipticArc( wxCoord x
+                             ,wxCoord y
+                             ,wxCoord w
+                             ,wxCoord h

                              ,double sa
                              ,double ea
                             )
                              ,double sa
                              ,double ea
                             )


@@ -264,24 +262,80 @@ void wxDC::DoDrawEllipticArc( long x
    // TODO
 }
 
    // TODO
 }
 

-void wxDC::DoDrawIcon(const wxIcon& icon, long x, long y)
+void wxDC::DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y)

 {
    // TODO
 }
 
 void wxDC::DoDrawBitmap( const wxBitmap &bmp
 {
    // TODO
 }
 
 void wxDC::DoDrawBitmap( const wxBitmap &bmp

-                        ,long x, long y
+                        ,wxCoord x, wxCoord y

                         ,bool useMask
                        )
 {
    // TODO
 }
 
                         ,bool useMask
                        )
 {
    // TODO
 }
 

-void wxDC::DoDrawText(const wxString& text, long x, long y)
+void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y)

 {
    // TODO
 }
 
 {
    // TODO
 }
 

+void wxDC::DoDrawRotatedText(const wxString& text,
+                             wxCoord x, wxCoord y,
+                             double angle)
+{
+   // TODO:
+   /*
+    if ( angle == 0.0 )
+    {
+        DoDrawText(text, x, y);
+    }
+    else
+    {
+        LOGFONT lf;
+        wxFillLogFont(&lf, &m_font);
+
+        // GDI wants the angle in tenth of degree
+        long angle10 = (long)(angle * 10);
+        lf.lfEscapement = angle10;
+        lf. lfOrientation = angle10;
+
+        HFONT hfont = ::CreateFontIndirect(&lf);
+        if ( !hfont )
+        {
+            wxLogLastError("CreateFont");
+        }
+        else
+        {
+            HFONT hfontOld = ::SelectObject(GetHdc(), hfont);
+
+            DrawAnyText(text, x, y);
+
+            (void)::SelectObject(GetHdc(), hfontOld);
+        }
+
+        // call the bounding box by adding all four vertices of the rectangle
+        // containing the text to it (simpler and probably not slower than
+        // determining which of them is really topmost/leftmost/...)
+        wxCoord w, h;
+        GetTextExtent(text, &w, &h);
+
+        double rad = DegToRad(angle);
+
+        // "upper left" and "upper right"
+        CalcBoundingBox(x, y);
+        CalcBoundingBox(x + w*cos(rad), y - h*sin(rad));
+        CalcBoundingBox(x + h*sin(rad), y + h*cos(rad));
+
+        // "bottom left" and "bottom right"
+        x += (wxCoord)(h*sin(rad));
+        y += (wxCoord)(h*cos(rad));
+        CalcBoundingBox(x, y);
+        CalcBoundingBox(x + h*sin(rad), y + h*cos(rad));
+    }
+*/
+}
+

 // ---------------------------------------------------------------------------
 // set GDI objects
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // set GDI objects
 // ---------------------------------------------------------------------------


@@ -374,25 +428,25 @@ void wxDC::EndPage()
 // text metrics
 // ---------------------------------------------------------------------------
 
 // text metrics
 // ---------------------------------------------------------------------------
 

-long wxDC::GetCharHeight() const
+wxCoord wxDC::GetCharHeight() const

 {
     // TODO
     return(1);
 }
 
 {
     // TODO
     return(1);
 }
 

-long wxDC::GetCharWidth() const
+wxCoord wxDC::GetCharWidth() const

 {
     // TODO
     return(1);
 }
 
 {
     // TODO
     return(1);
 }
 

-void wxDC::GetTextExtent( const wxString& string
-                         ,long* x
-                         ,long* y
-                         ,long* decent
-                         ,long* externalLeading
-                         ,wxFont* theFont
-                        ) const
+void wxDC::DoGetTextExtent( const wxString& string
+                           ,wxCoord* x
+                           ,wxCoord* y
+                           ,wxCoord* decent
+                           ,wxCoord* externalLeading
+                           ,wxFont* theFont
+                          ) const

 {
    // TODO:
 }
 {
    // TODO:
 }


@@ -426,12 +480,12 @@ void wxDC::SetSystemScale(double x, double y)
     SetMapMode(m_mappingMode);
 }
 
     SetMapMode(m_mappingMode);
 }
 

-void wxDC::SetLogicalOrigin( long x, long y )
+void wxDC::SetLogicalOrigin( wxCoord x, wxCoord y )

 {
     // TODO:
 };
 
 {
     // TODO:
 };
 

-void wxDC::SetDeviceOrigin( long x, long y )
+void wxDC::SetDeviceOrigin( wxCoord x, wxCoord y )

 {
     // TODO:
 };
 {
     // TODO:
 };


@@ -440,85 +494,85 @@ void wxDC::SetDeviceOrigin( long x, long y )
 // coordinates transformations
 // ---------------------------------------------------------------------------
 
 // coordinates transformations
 // ---------------------------------------------------------------------------
 

-long wxDCBase::DeviceToLogicalX(long x) const
+wxCoord wxDCBase::DeviceToLogicalX(wxCoord x) const

 {
 {

-    long new_x = x - m_deviceOriginX;
+    wxCoord new_x = x - m_deviceOriginX;

     if (new_x > 0)
     if (new_x > 0)

-        return (long)((double)(new_x) / m_scaleX + 0.5) * m_signX + m_logicalOriginX;
+        return (wxCoord)((double)(new_x) / m_scaleX + 0.5) * m_signX + m_logicalOriginX;

     else
     else

-        return (long)((double)(new_x) / m_scaleX - 0.5) * m_signX + m_logicalOriginX;
+        return (wxCoord)((double)(new_x) / m_scaleX - 0.5) * m_signX + m_logicalOriginX;

 };
 
 };
 

-long wxDCBase::DeviceToLogicalXRel(long x) const
+wxCoord wxDCBase::DeviceToLogicalXRel(wxCoord x) const

 {
     if (x > 0)
 {
     if (x > 0)

-        return (long)((double)(x) / m_scaleX + 0.5);
+        return (wxCoord)((double)(x) / m_scaleX + 0.5);

     else
     else

-        return (long)((double)(x) / m_scaleX - 0.5);
+        return (wxCoord)((double)(x) / m_scaleX - 0.5);

 };
 
 };
 

-long wxDCBase::DeviceToLogicalY(long y) const
+wxCoord wxDCBase::DeviceToLogicalY(wxCoord y) const

 {
 {

-    long new_y = y - m_deviceOriginY;
+    wxCoord new_y = y - m_deviceOriginY;

     if (new_y > 0)
     if (new_y > 0)

-        return (long)((double)(new_y) / m_scaleY + 0.5) * m_signY + m_logicalOriginY;
+        return (wxCoord)((double)(new_y) / m_scaleY + 0.5) * m_signY + m_logicalOriginY;

     else
     else

-        return (long)((double)(new_y) / m_scaleY - 0.5) * m_signY + m_logicalOriginY;
+        return (wxCoord)((double)(new_y) / m_scaleY - 0.5) * m_signY + m_logicalOriginY;

 };
 
 };
 

-long wxDCBase::DeviceToLogicalYRel(long y) const
+wxCoord wxDCBase::DeviceToLogicalYRel(wxCoord y) const

 {
     if (y > 0)
 {
     if (y > 0)

-        return (long)((double)(y) / m_scaleY + 0.5);
+        return (wxCoord)((double)(y) / m_scaleY + 0.5);

     else
     else

-        return (long)((double)(y) / m_scaleY - 0.5);
+        return (wxCoord)((double)(y) / m_scaleY - 0.5);

 };
 
 };
 

-long wxDCBase::LogicalToDeviceX(long x) const
+wxCoord wxDCBase::LogicalToDeviceX(wxCoord x) const

 {
 {

-    long new_x = x - m_logicalOriginX;
+    wxCoord new_x = x - m_logicalOriginX;

     if (new_x > 0)
     if (new_x > 0)

-        return (long)((double)(new_x) * m_scaleX + 0.5) * m_signX + m_deviceOriginX;
+        return (wxCoord)((double)(new_x) * m_scaleX + 0.5) * m_signX + m_deviceOriginX;

     else
     else

-    return (long)((double)(new_x) * m_scaleX - 0.5) * m_signX + m_deviceOriginX;
+    return (wxCoord)((double)(new_x) * m_scaleX - 0.5) * m_signX + m_deviceOriginX;

 };
 
 };
 

-long wxDCBase::LogicalToDeviceXRel(long x) const
+wxCoord wxDCBase::LogicalToDeviceXRel(wxCoord x) const

 {
     if (x > 0)
 {
     if (x > 0)

-        return (long)((double)(x) * m_scaleX + 0.5);
+        return (wxCoord)((double)(x) * m_scaleX + 0.5);

     else
     else

-        return (long)((double)(x) * m_scaleX - 0.5);
+        return (wxCoord)((double)(x) * m_scaleX - 0.5);

 };
 
 };
 

-long wxDCBase::LogicalToDeviceY(long y) const
+wxCoord wxDCBase::LogicalToDeviceY(wxCoord y) const

 {
 {

-    long new_y = y - m_logicalOriginY;
+    wxCoord new_y = y - m_logicalOriginY;

     if (new_y > 0)
     if (new_y > 0)

-        return (long)((double)(new_y) * m_scaleY + 0.5) * m_signY + m_deviceOriginY;
+        return (wxCoord)((double)(new_y) * m_scaleY + 0.5) * m_signY + m_deviceOriginY;

     else
     else

-        return (long)((double)(new_y) * m_scaleY - 0.5) * m_signY + m_deviceOriginY;
+        return (wxCoord)((double)(new_y) * m_scaleY - 0.5) * m_signY + m_deviceOriginY;

 };
 
 };
 

-long wxDCBase::LogicalToDeviceYRel(long y) const
+wxCoord wxDCBase::LogicalToDeviceYRel(wxCoord y) const

 {
     if (y > 0)
 {
     if (y > 0)

-        return (long)((double)(y) * m_scaleY + 0.5);
+        return (wxCoord)((double)(y) * m_scaleY + 0.5);

     else
     else

-        return (long)((double)(y) * m_scaleY - 0.5);
+        return (wxCoord)((double)(y) * m_scaleY - 0.5);

 };
 
 // ---------------------------------------------------------------------------
 // bit blit
 // ---------------------------------------------------------------------------
 
 };
 
 // ---------------------------------------------------------------------------
 // bit blit
 // ---------------------------------------------------------------------------
 

-bool wxDC::DoBlit( long xdest
-                  ,long ydest
-                  ,long width
-                  ,long height
+bool wxDC::DoBlit( wxCoord xdest
+                  ,wxCoord ydest
+                  ,wxCoord width
+                  ,wxCoord height

                   ,wxDC *source
                   ,wxDC *source

-                  ,long xsrc
-                  ,long ysrc
+                  ,wxCoord xsrc
+                  ,wxCoord ysrc

                   ,int  rop
                   ,bool useMask
                  )
                   ,int  rop
                   ,bool useMask
                  )


@@ -555,7 +609,7 @@ void wxDC::DoGetTextExtent(const wxString& string, float *x, float *y,
                          float *descent, float *externalLeading,
                          wxFont *theFont, bool use16bit) const
 {
                          float *descent, float *externalLeading,
                          wxFont *theFont, bool use16bit) const
 {

-    long x1, y1, descent1, externalLeading1;
+    wxCoord x1, y1, descent1, externalLeading1;

     GetTextExtent(string, & x1, & y1, & descent1, & externalLeading1, theFont, use16bit);
     *x = x1; *y = y1;
     if (descent)
     GetTextExtent(string, & x1, & y1, & descent1, & externalLeading1, theFont, use16bit);
     *x = x1; *y = y1;
     if (descent)