Applied patch [ 832096 ] Final separation for GUI and console for Open Watcom

[wxWidgets.git] / include / wx / dc.h

diff --git a/include/wx/dc.h b/include/wx/dc.h
index 39d9c5563b6b758140a496054fc3abbcb1fa10e1..b536b75d9e692f5509b0074e387efdbcde1de1e1 100644 (file)
--- a/include/wx/dc.h
+++ b/include/wx/dc.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DC_H_BASE_
 #define _WX_DC_H_BASE_
 
 #ifndef _WX_DC_H_BASE_
 #define _WX_DC_H_BASE_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "dcbase.h"
 #endif
 
     #pragma interface "dcbase.h"
 #endif
 


@@ -301,6 +301,54 @@ public:
     void DrawSpline(wxList *points) { DoDrawSpline(points); }
 #endif // wxUSE_SPLINES
 
     void DrawSpline(wxList *points) { DoDrawSpline(points); }
 #endif // wxUSE_SPLINES
 

+    // Eventually we will have wxUSE_GENERIC_DRAWELLIPSE
+#ifdef __WXWINCE__
+    //! Generic method to draw ellipses, circles and arcs with current pen and brush.
+    /*! \param x Upper left corner of bounding box.
+     *  \param y Upper left corner of bounding box.
+     *  \param w Width of bounding box.
+     *  \param h Height of bounding box.
+     *  \param sa Starting angle of arc 
+     *            (counterclockwise, start at 3 o'clock, 360 is full circle).
+     *  \param ea Ending angle of arc.
+     *  \param angle Rotation angle, the Arc will be rotated after 
+     *               calculating begin and end.
+     */
+    void DrawEllipticArcRot( wxCoord x, wxCoord y, 
+                             wxCoord width, wxCoord height, 
+                             double sa = 0, double ea = 0, double angle = 0 )
+    { DoDrawEllipticArcRot( x, y, width, height, sa, ea, angle ); }
+    
+    void DrawEllipticArcRot( const wxPoint& pt, 
+                             const wxSize& sz,
+                             double sa = 0, double ea = 0, double angle = 0 )
+    { DoDrawEllipticArcRot( pt.x, pt.y, sz.x, sz.y, sa, ea, angle ); }
+
+    void DrawEllipticArcRot( const wxRect& rect,
+                             double sa = 0, double ea = 0, double angle = 0 )
+    { DoDrawEllipticArcRot( rect.x, rect.y, rect.width, rect.height, sa, ea, angle ); }
+
+    virtual void DoDrawEllipticArcRot( wxCoord x, wxCoord y, 
+                                       wxCoord w, wxCoord h, 
+                                       double sa = 0, double ea = 0, double angle = 0 );
+    
+    //! Rotates points around center.
+    /*! This is a quite straight method, it calculates in pixels
+     *  and so it produces rounding errors.
+     *  \param points The points inside will be rotated.
+     *  \param angle Rotating angle (counterclockwise, start at 3 o'clock, 360 is full circle).
+     *  \param center Center of rotation.
+     */ 
+    void Rotate( wxList* points, double angle, wxPoint center = wxPoint() );
+
+    // used by DrawEllipticArcRot
+    // Careful: wxList gets filled with points you have to delete later.
+    void CalculateEllipticPoints( wxList* points, 
+                                  wxCoord xStart, wxCoord yStart, 
+                                  wxCoord w, wxCoord h, 
+                                  double sa, double ea );
+#endif
+    

     // global DC operations
     // --------------------
 
     // global DC operations
     // --------------------
 


@@ -588,16 +636,6 @@ public:
     }
 #endif // !Win16
 
     }
 #endif // !Win16
 

-#if WXWIN_COMPATIBILITY
-
-    void GetTextExtent(const wxString& string, float *x, float *y,
-            float *descent = NULL, float *externalLeading = NULL,
-            wxFont *theFont = NULL, bool use16bit = FALSE) const ;
-    void GetSize(float* width, float* height) const { int w, h; GetSize(& w, & h); *width = w; *height = h; }
-    void GetSizeMM(float *width, float *height) const { int w, h; GetSizeMM(& w, & h); *width = (float) w; *height = (float) h; }
-
-#endif // WXWIN_COMPATIBILITY
-

 protected:
     // the pure virtual functions which should be implemented by wxDC
     virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
 protected:
     // the pure virtual functions which should be implemented by wxDC
     virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,


@@ -790,6 +828,8 @@ private:
     wxDC& m_dc;
 
     wxColour m_colFgOld;
     wxDC& m_dc;
 
     wxColour m_colFgOld;

+
+    DECLARE_NO_COPY_CLASS(wxDCTextColourChanger)

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -809,6 +849,8 @@ public:
 
 private:
     wxDC& m_dc;
 
 private:
     wxDC& m_dc;

+
+    DECLARE_NO_COPY_CLASS(wxDCClipper)

 };
 
 #endif
 };
 
 #endif