X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a23fd0e1d1329a4a258b4defb3e0b0001b700c6e..ee0a94cfc2f71e8b770eedda5197a1f4bd62b5cb:/include/wx/gtk1/dc.h

diff --git a/include/wx/gtk1/dc.h b/include/wx/gtk1/dc.h
index 779d6463ef..f7023538ab 100644
--- a/include/wx/gtk1/dc.h
+++ b/include/wx/gtk1/dc.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dc.h
+// Name:        wx/gtk1/dc.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -7,24 +7,20 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef __GTKDCH__
 #define __GTKDCH__
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
-class wxDC;
+class WXDLLIMPEXP_CORE wxDC;
 
 //-----------------------------------------------------------------------------
 // constants
 //-----------------------------------------------------------------------------
 
+#ifndef MM_TEXT
 #define MM_TEXT         0
 #define MM_ISOTROPIC    1
 #define MM_ANISOTROPIC  2
@@ -33,28 +29,26 @@ class wxDC;
 #define MM_TWIPS        5
 #define MM_POINTS       6
 #define MM_METRIC       7
+#endif
 
 //-----------------------------------------------------------------------------
 // wxDC
 //-----------------------------------------------------------------------------
 
-class wxDC : public wxDCBase
+class WXDLLIMPEXP_CORE wxDC : public wxDCBase
 {
-    DECLARE_ABSTRACT_CLASS(wxDC)
-
 public:
     wxDC();
     ~wxDC() { }
 
+#if wxUSE_PALETTE
     void SetColourMap( const wxPalette& palette ) { SetPalette(palette); };
-
-    // the first two must be overridden and called
-    virtual void DestroyClippingRegion();
+#endif // wxUSE_PALETTE
 
     // Resolution in pixels per logical inch
     virtual wxSize GetPPI() const;
 
-    virtual bool StartDoc( const wxString& WXUNUSED(message) ) { return TRUE; }
+    virtual bool StartDoc( const wxString& WXUNUSED(message) ) { return true; }
     virtual void EndDoc() { }
     virtual void StartPage() { }
     virtual void EndPage() { }
@@ -62,88 +56,85 @@ public:
     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 );
 
     // implementation
     // --------------
 
-    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)
-            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
-            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)
-            return (long)((double)(x) / m_scaleX + 0.5);
+            return (wxCoord)((double)(x) / m_scaleX + 0.5);
         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)
-            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
-            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)
-            return (long)((double)(y) / m_scaleY + 0.5);
+            return (wxCoord)((double)(y) / m_scaleY + 0.5);
         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)
-            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
-            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)
-            return (long)((double)(x) * m_scaleX + 0.5);
+            return (wxCoord)((double)(x) * m_scaleX + 0.5);
         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)
-            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
-            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)
-            return (long)((double)(y) * m_scaleY + 0.5);
+            return (wxCoord)((double)(y) * m_scaleY + 0.5);
         else
-            return (long)((double)(y) * m_scaleY - 0.5);
+            return (wxCoord)((double)(y) * m_scaleY - 0.5);
     }
 
 protected:
     // base class pure virtuals implemented here
-    virtual void DoSetClippingRegion(long x, long y, long width, long height);
-    virtual void DoGetSize(int *width, int *height) const;
+    virtual void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
     virtual void DoGetSizeMM(int* width, int* height) const;
 
 public:
     // GTK-specific member variables
 
-    int          m_textAlignment;    // gone in wxWin 2.0 ?
-
     // not sure what for, but what is a mm on a screen you don't know the size
     // of?
     double       m_mm_to_pix_x,
@@ -152,7 +143,16 @@ public:
     bool         m_needComputeScaleX,
                  m_needComputeScaleY; // not yet used
 
-    float        m_scaleFactor;  // wxPSDC wants to have this. Will disappear.
+
+private:
+    DECLARE_ABSTRACT_CLASS(wxDC)
 };
 
+// this must be defined when wxDC::Blit() honours the DC origian and needed to
+// allow wxUniv code in univ/winuniv.cpp to work with versions of wxGTK
+// 2.3.[23]
+#ifndef wxHAS_WORKING_GTK_DC_BLIT
+    #define wxHAS_WORKING_GTK_DC_BLIT
+#endif
+
 #endif // __GTKDCH__