added wxTo/FromString() overloads for wxFont (1st part of patch 1760073)

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

diff --git a/include/wx/dfb/dc.h b/include/wx/dfb/dc.h
index 6eb1bac90224b4f1cfb78183022ef098238ca20e..b96599052e4c3a54790c4a6dd2c578c5260b0050 100644 (file)
--- a/include/wx/dfb/dc.h
+++ b/include/wx/dfb/dc.h
@@ -50,6 +50,8 @@ public:
     virtual void SetPalette(const wxPalette& palette);
 #endif
 
+    virtual void SetLogicalFunction(int function);
+
     virtual void DestroyClippingRegion();
 
     virtual wxCoord GetCharHeight() const;
@@ -58,94 +60,30 @@ public:
                                  wxCoord *x, wxCoord *y,
                                  wxCoord *descent = NULL,
                                  wxCoord *externalLeading = NULL,
-                                 wxFont *theFont = NULL) const;
+                                 const wxFont *theFont = NULL) const;
 
     virtual bool CanDrawBitmap() const { return true; }
     virtual bool CanGetTextExtent() const { return true; }
     virtual int GetDepth() const;
     virtual wxSize GetPPI() const;
 
-    virtual void SetMapMode(int mode);
-    virtual void SetUserScale(double x, double y);
-    virtual void SetLogicalScale(double x, double y);
-    virtual void SetLogicalOrigin(wxCoord x, wxCoord y);
-    virtual void SetDeviceOrigin(wxCoord x, wxCoord y);
-    virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp);
-    virtual void SetLogicalFunction(int function);
-
-    // implementation from now on
-    // --------------------------
-
-    virtual void ComputeScaleAndOrigin();
-
-    wxCoord XDEV2LOG(wxCoord x) const
-    {
-        wxCoord new_x = x - m_deviceOriginX;
-        if (new_x > 0)
-            return (wxCoord)((double)(new_x) / m_scaleX + 0.5) * m_signX + m_logicalOriginX;
-        else
-            return (wxCoord)((double)(new_x) / m_scaleX - 0.5) * m_signX + m_logicalOriginX;
-    }
-    wxCoord XDEV2LOGREL(wxCoord x) const
-    {
-        if (x > 0)
-            return (wxCoord)((double)(x) / m_scaleX + 0.5);
-        else
-            return (wxCoord)((double)(x) / m_scaleX - 0.5);
-    }
-    wxCoord YDEV2LOG(wxCoord y) const
-    {
-        wxCoord new_y = y - m_deviceOriginY;
-        if (new_y > 0)
-            return (wxCoord)((double)(new_y) / m_scaleY + 0.5) * m_signY + m_logicalOriginY;
-        else
-            return (wxCoord)((double)(new_y) / m_scaleY - 0.5) * m_signY + m_logicalOriginY;
-    }
-    wxCoord YDEV2LOGREL(wxCoord y) const
-    {
-        if (y > 0)
-            return (wxCoord)((double)(y) / m_scaleY + 0.5);
-        else
-            return (wxCoord)((double)(y) / m_scaleY - 0.5);
-    }
-    wxCoord XLOG2DEV(wxCoord x) const
-    {
-        wxCoord new_x = x - m_logicalOriginX;
-        if (new_x > 0)
-            return (wxCoord)((double)(new_x) * m_scaleX + 0.5) * m_signX + m_deviceOriginX;
-        else
-            return (wxCoord)((double)(new_x) * m_scaleX - 0.5) * m_signX + m_deviceOriginX;
-    }
-    wxCoord XLOG2DEVREL(wxCoord x) const
-    {
-        if (x > 0)
-            return (wxCoord)((double)(x) * m_scaleX + 0.5);
-        else
-            return (wxCoord)((double)(x) * m_scaleX - 0.5);
-    }
-    wxCoord YLOG2DEV(wxCoord y) const
-    {
-        wxCoord new_y = y - m_logicalOriginY;
-        if (new_y > 0)
-            return (wxCoord)((double)(new_y) * m_scaleY + 0.5) * m_signY + m_deviceOriginY;
-        else
-            return (wxCoord)((double)(new_y) * m_scaleY - 0.5) * m_signY + m_deviceOriginY;
-    }
-    wxCoord YLOG2DEVREL(wxCoord y) const
-    {
-        if (y > 0)
-            return (wxCoord)((double)(y) * m_scaleY + 0.5);
-        else
-            return (wxCoord)((double)(y) * m_scaleY - 0.5);
-    }
-
     // Returns the surface (and increases its ref count)
     wxIDirectFBSurfacePtr GetDirectFBSurface() const { return m_surface; }
 
 protected:
+    // implementation
+    wxCoord XDEV2LOG(wxCoord x) const       { return DeviceToLogicalX(x); }
+    wxCoord XDEV2LOGREL(wxCoord x) const    { return DeviceToLogicalXRel(x); }
+    wxCoord YDEV2LOG(wxCoord y) const       { return DeviceToLogicalY(y); }
+    wxCoord YDEV2LOGREL(wxCoord y) const    { return DeviceToLogicalYRel(y); }
+    wxCoord XLOG2DEV(wxCoord x) const       { return LogicalToDeviceX(x); }
+    wxCoord XLOG2DEVREL(wxCoord x) const    { return LogicalToDeviceXRel(x); }
+    wxCoord YLOG2DEV(wxCoord y) const       { return LogicalToDeviceY(y); }
+    wxCoord YLOG2DEVREL(wxCoord y) const    { return LogicalToDeviceYRel(y); }
+    
     // initializes the DC from a surface, must be called if default ctor
     // was used
-    void Init(const wxIDirectFBSurfacePtr& surface);
+    void DFBInit(const wxIDirectFBSurfacePtr& surface);
 
     virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
                              int style = wxFLOOD_SURFACE);
@@ -197,12 +135,18 @@ protected:
                                int fillStyle = wxODDEVEN_RULE);
 
     // implementation from now on:
+protected:
+    wxIDirectFBFontPtr GetCurrentFont() const;
 
 private:
     // Unified implementation of DrawIcon, DrawBitmap and Blit:
     void DoDrawSubBitmap(const wxBitmap &bmp,
                          wxCoord x, wxCoord y, wxCoord w, wxCoord h,
                          wxCoord destx, wxCoord desty, int rop, bool useMask);
+    bool DoBlitFromSurface(const wxIDirectFBSurfacePtr& src,
+                           wxCoord srcx, wxCoord srcy,
+                           wxCoord w, wxCoord h,
+                           wxCoord dstx, wxCoord dsty);
 
     // selects colour into surface's state
     void SelectColour(const wxColour& clr);
@@ -212,6 +156,8 @@ protected:
 
     double            m_mm_to_pix_x, m_mm_to_pix_y;
 
+    friend class WXDLLIMPEXP_FWD_CORE wxOverlayImpl; // for Init
+
     DECLARE_DYNAMIC_CLASS(wxDC)
 };