fix WinCE compilation after tbar95.h ->t oolbar.h renaming (#10197)

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

diff --git a/include/wx/motif/dc.h b/include/wx/motif/dc.h
index f456f8d57f28d5a379415850025fa8bdfd44edf3..1163f9c1adb0c5020246b75834314935678d12bc 100644 (file)
--- a/include/wx/motif/dc.h
+++ b/include/wx/motif/dc.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dc.h
-// Purpose:     wxDC class
+// Name:        wx/motif/dc.h
+// Purpose:     wxMotifDCImpl class

 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98


@@ -12,157 +12,51 @@
 #ifndef _WX_DC_H_
 #define _WX_DC_H_
 
 #ifndef _WX_DC_H_
 #define _WX_DC_H_
 

-#ifdef __GNUG__
-#pragma interface "dc.h"
-#endif
+#include "wx/dc.h"

 
 

-#include "wx/pen.h"
-#include "wx/brush.h"
-#include "wx/icon.h"
-#include "wx/font.h"
-#include "wx/gdicmn.h"
+// ----------------------------------------------------------------------------
+// wxMotifDCImpl
+// ----------------------------------------------------------------------------

 
 

-//-----------------------------------------------------------------------------
-// constants
-//-----------------------------------------------------------------------------
-
-#ifndef MM_TEXT
-#define MM_TEXT         0
-#define MM_ISOTROPIC    1
-#define MM_ANISOTROPIC  2
-#define MM_LOMETRIC     3
-#define MM_HIMETRIC     4
-#define MM_TWIPS        5
-#define MM_POINTS       6
-#define MM_METRIC       7
-#endif
-
-//-----------------------------------------------------------------------------
-// wxDC
-//-----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxDC : public wxDCBase
+class WXDLLIMPEXP_CORE wxMotifDCImpl : public wxDCImpl

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxDC)
-        

 public:
 public:

-    wxDC();
-    ~wxDC() { }
-    
-    // implement base class pure virtuals
-    // ----------------------------------
-    
-    virtual void DestroyClippingRegion();
-    
+    wxMotifDCImpl(wxDC *owner);
+

     virtual wxSize GetPPI() 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);
-    
+

 protected:
     virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y);
     virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,
 protected:
     virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y);
     virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,

-        bool useMask = FALSE);
-    
+                              bool useMask = false);
+

     virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
     virtual void DoSetClippingRegion(wxCoord x, wxCoord y,

-        wxCoord width, wxCoord height);
+                                     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;

-    
+

 public:
 public:

-    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;
-    }
+    // 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); }
+

     // Without device translation, for backing pixmap purposes
     wxCoord XLOG2DEV_2(wxCoord x) const
     {
     // Without device translation, for backing pixmap purposes
     wxCoord XLOG2DEV_2(wxCoord x) const
     {

-        wxCoord new_x = x - m_logicalOriginX;
-        if (new_x > 0)
-            return (wxCoord)((double)(new_x) * m_scaleX + 0.5) * m_signX;
-        else
-            return (wxCoord)((double)(new_x) * m_scaleX - 0.5) * m_signX;
+        return wxRound((double)(x - m_logicalOriginX) * m_scaleX) * m_signX;

     }
     }

-    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;
-    }
-    // Without device translation, for backing pixmap purposes

     wxCoord YLOG2DEV_2(wxCoord y) const
     {
     wxCoord YLOG2DEV_2(wxCoord y) const
     {

-        wxCoord new_y = y - m_logicalOriginY;
-        if (new_y > 0)
-            return (wxCoord)((double)(new_y) * m_scaleY + 0.5) * m_signY;
-        else
-            return (wxCoord)((double)(new_y) * m_scaleY - 0.5) * m_signY;
-    }
-    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);
+        return wxRound((double)(y - m_logicalOriginY) * m_scaleY) * m_signY;

     }
     }

-    
-public:
-    // 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,m_mm_to_pix_y;
-    
-    // recompute scale?
-    bool         m_needComputeScaleX, m_needComputeScaleY;
-    
+
+    DECLARE_DYNAMIC_CLASS(wxMotifDCImpl)

 };
 
 };
 

-#endif
-// _WX_DC_H_
+#endif // _WX_DC_H_