typo in dcclient.cpp corrected (wxUSE_SPLINE => wxUSE_SPLINES)

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

diff --git a/include/wx/dc.h b/include/wx/dc.h
index ef4e0e331b69025a7ebecd89b948517220d8db97..052ec417d6d3e2f7b0cacd930ed01726fa30b914 100644 (file)
--- a/include/wx/dc.h
+++ b/include/wx/dc.h
@@ -3,6 +3,7 @@
 
 #ifdef __GNUG__
     #pragma interface "dcbase.h"
 
 #ifdef __GNUG__
     #pragma interface "dcbase.h"

+    #pragma implementation "dcbase.h"

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -395,10 +396,10 @@ public:
         if ( x ) *x = m_userScaleX;
         if ( y ) *y = m_userScaleY;
     }
         if ( x ) *x = m_userScaleX;
         if ( y ) *y = m_userScaleY;
     }

+    void SetSystemScale(double x, double y)
+        { SetUserScale(x, y); }

     virtual void SetUserScale(double x, double y) = 0;
 
     virtual void SetUserScale(double x, double y) = 0;
 

-    virtual void SetSystemScale(double x, double y) = 0;
-

     virtual void GetLogicalScale(double *x, double *y)
     {
         if ( x ) *x = m_logicalScaleX;
     virtual void GetLogicalScale(double *x, double *y)
     {
         if ( x ) *x = m_logicalScaleX;


@@ -509,8 +510,11 @@ protected:
     virtual void DoSetClippingRegionAsRegion(const wxRegion& region) = 0;
     virtual void DoSetClippingRegion(long x, long y,
                                      long width, long height) = 0;
     virtual void DoSetClippingRegionAsRegion(const wxRegion& region) = 0;
     virtual void DoSetClippingRegion(long x, long y,
                                      long width, long height) = 0;

+
+    // FIXME are these functions really different?

     virtual void DoGetClippingRegion(long *x, long *y,
     virtual void DoGetClippingRegion(long *x, long *y,

-                                     long *width, long *height) = 0;
+                                     long *w, long *h)
+        { DoGetClippingBox(x, y, w, h); }

     virtual void DoGetClippingBox(long *x, long *y,
                                   long *w, long *h) const
     {
     virtual void DoGetClippingBox(long *x, long *y,
                                   long *w, long *h) const
     {


@@ -539,7 +543,9 @@ protected:
         if ( y ) *y = m_deviceOriginY;
     }
 
         if ( y ) *y = m_deviceOriginY;
     }
 

+#if wxUSE_SPLINES

     virtual void DoDrawSpline(wxList *points) = 0;
     virtual void DoDrawSpline(wxList *points) = 0;

+#endif

 
 protected:
     // flags
 
 protected:
     // flags