use 6px as the default wxSizer border in wxGTK to be a little bit closer to GNOME HIG

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

diff --git a/include/wx/gtk1/dc.h b/include/wx/gtk1/dc.h
index 8b71e9ceb0d76273ffb838ef785e1be11efd60b9..b057e8512651f09785ca3b01abfc5a47916b43a8 100644 (file)
--- 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$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,150 +7,59 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef __GTKDCH__
 #define __GTKDCH__
 
 #ifndef __GTKDCH__
 #define __GTKDCH__
 

-#ifdef __GNUG__
-#pragma interface
-#endif
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxDC;
-
-//-----------------------------------------------------------------------------
-// constants
-//-----------------------------------------------------------------------------
-
-#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
+#include "wx/dc.h"

 
 //-----------------------------------------------------------------------------
 // wxDC
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxDC
 //-----------------------------------------------------------------------------
 

-class wxDC : public wxDCBase
+class WXDLLIMPEXP_CORE wxGTKDCImpl : public wxDCImpl

 {
 {

-    DECLARE_ABSTRACT_CLASS(wxDC)
-

 public:
 public:

-    wxDC();
-    ~wxDC() { }
+    wxGTKDCImpl(wxDC *owner);
+    virtual ~wxGTKDCImpl() { }

 
 

+#if wxUSE_PALETTE

     void SetColourMap( const wxPalette& palette ) { SetPalette(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;
 
 
     // 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() { }
 
     virtual void EndDoc() { }
     virtual void StartPage() { }
     virtual void EndPage() { }
 

-    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 SetAxisOrientation( bool xLeftRight, bool yBottomUp );
+    virtual GdkWindow* GetGDKWindow() const { return NULL; }

 
 

+public:

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

 
 

-    void ComputeScaleAndOrigin();
-
-    long XDEV2LOG(long x) const
-    {
-        long new_x = x - m_deviceOriginX;
-        if (new_x > 0)
-            return (long)((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;
-    }
-    long XDEV2LOGREL(long x) const
-    {
-        if (x > 0)
-            return (long)((double)(x) / m_scaleX + 0.5);
-        else
-            return (long)((double)(x) / m_scaleX - 0.5);
-    }
-    long YDEV2LOG(long y) const
-    {
-        long new_y = y - m_deviceOriginY;
-        if (new_y > 0)
-            return (long)((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;
-    }
-    long YDEV2LOGREL(long y) const
-    {
-        if (y > 0)
-            return (long)((double)(y) / m_scaleY + 0.5);
-        else
-            return (long)((double)(y) / m_scaleY - 0.5);
-    }
-    long XLOG2DEV(long x) const
-    {
-        long new_x = x - m_logicalOriginX;
-        if (new_x > 0)
-            return (long)((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;
-    }
-    long XLOG2DEVREL(long x) const
-    {
-        if (x > 0)
-            return (long)((double)(x) * m_scaleX + 0.5);
-        else
-            return (long)((double)(x) * m_scaleX - 0.5);
-    }
-    long YLOG2DEV(long y) const
-    {
-        long new_y = y - m_logicalOriginY;
-        if (new_y > 0)
-            return (long)((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;
-    }
-    long YLOG2DEVREL(long y) const
-    {
-        if (y > 0)
-            return (long)((double)(y) * m_scaleY + 0.5);
-        else
-            return (long)((double)(y) * m_scaleY - 0.5);
-    }
-
-protected:

     // base class pure virtuals implemented here
     // 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;
 
     virtual void DoGetSizeMM(int* width, int* height) const;
 

-public:
-    // GTK-specific member variables
-
-    // 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;
-
-    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__
 #endif // __GTKDCH__