1. wxMotif::wxFrame derives from wxFrameBase now

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

diff --git a/include/wx/gtk/dc.h b/include/wx/gtk/dc.h
index acc56d3bcd1bdc0efb5ebef8c09ccd6774f88405..2ce4f8de26d51ae9da03f01e9da2b8eae05bf8be 100644 (file)
--- a/include/wx/gtk/dc.h
+++ b/include/wx/gtk/dc.h
@@ -40,8 +40,6 @@ class wxDC;
 
 class wxDC : public wxDCBase
 {
 
 class wxDC : public wxDCBase
 {

-    DECLARE_ABSTRACT_CLASS(wxDC)
-

 public:
     wxDC();
     ~wxDC() { }
 public:
     wxDC();
     ~wxDC() { }


@@ -62,8 +60,8 @@ public:
     virtual void SetMapMode( int mode );
     virtual void SetUserScale( double x, double y );
     virtual void SetLogicalScale( double x, double y );
     virtual void SetMapMode( int mode );
     virtual void SetUserScale( double x, double y );
     virtual void SetLogicalScale( double x, double y );

-    virtual void SetLogicalOrigin( long x, long y );
-    virtual void SetDeviceOrigin( long x, long y );
+    virtual void SetLogicalOrigin( wxCoord x, wxCoord y );
+    virtual void SetDeviceOrigin( wxCoord x, wxCoord y );

 
     virtual void SetAxisOrientation( bool xLeftRight, bool yBottomUp );
 
 
     virtual void SetAxisOrientation( bool xLeftRight, bool yBottomUp );
 


@@ -72,70 +70,70 @@ public:
 
     virtual void ComputeScaleAndOrigin();
 
 
     virtual void ComputeScaleAndOrigin();
 

-    long XDEV2LOG(long x) const
+    wxCoord XDEV2LOG(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 XDEV2LOGREL(long x) const
+    wxCoord XDEV2LOGREL(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 YDEV2LOG(long y) const
+    wxCoord YDEV2LOG(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 YDEV2LOGREL(long y) const
+    wxCoord YDEV2LOGREL(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 XLOG2DEV(long x) const
+    wxCoord XLOG2DEV(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 XLOG2DEVREL(long x) const
+    wxCoord XLOG2DEVREL(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 YLOG2DEV(long y) const
+    wxCoord YLOG2DEV(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 YLOG2DEVREL(long y) const
+    wxCoord YLOG2DEVREL(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);

     }
 
 protected:
     // base class pure virtuals implemented here
     }
 
 protected:
     // base class pure virtuals implemented here

-    virtual void DoSetClippingRegion(long x, long y, long width, long height);
+    virtual void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height);

     virtual void DoGetSize(int *width, int *height) const;
     virtual void DoGetSizeMM(int* width, int* height) const;
 
     virtual void DoGetSize(int *width, int *height) const;
     virtual void DoGetSizeMM(int* width, int* height) const;
 


@@ -151,6 +149,9 @@ public:
                  m_needComputeScaleY; // not yet used
 
     float        m_scaleFactor;  // wxPSDC wants to have this. Will disappear.
                  m_needComputeScaleY; // not yet used
 
     float        m_scaleFactor;  // wxPSDC wants to have this. Will disappear.

+    
+private:
+    DECLARE_ABSTRACT_CLASS(wxDC)

 };
 
 #endif // __GTKDCH__
 };
 
 #endif // __GTKDCH__