fixed recent modeless dialog breakage caused by removing wxDIALOG_MODAL (wxModelessWi...

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

diff --git a/include/wx/gtk/dc.h b/include/wx/gtk/dc.h
index 8b71e9ceb0d76273ffb838ef785e1be11efd60b9..23650e5c0cc7b42014e97593a7235a9982e6057a 100644 (file)
--- a/include/wx/gtk/dc.h
+++ b/include/wx/gtk/dc.h
@@ -11,7 +11,7 @@
 #ifndef __GTKDCH__
 #define __GTKDCH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface
 #endif
 
@@ -40,8 +40,6 @@ class wxDC;
 
 class wxDC : public wxDCBase
 {
-    DECLARE_ABSTRACT_CLASS(wxDC)
-
 public:
     wxDC();
     ~wxDC() { }
@@ -62,81 +60,80 @@ 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:
@@ -150,7 +147,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__