use struct timeval and not a long to store socket timeout under Unix too

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

diff --git a/include/wx/dc.h b/include/wx/dc.h
index 10e091b2289f53cbd5c036c06529b27d2eb51257..f780315d50b85e69ce7e0f46ab508dfcb2234e1d 100644 (file)
--- a/include/wx/dc.h
+++ b/include/wx/dc.h
@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/dc.h
 // Purpose:     wxDC class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/dc.h
 // Purpose:     wxDC class

-// Author:      Vadim Zeitlin 
+// Author:      Vadim Zeitlin

 // Modified by:
 // Created:     05/25/99
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     05/25/99
 // RCS-ID:      $Id$


@@ -497,10 +497,10 @@ public:
     // ---------------------------------------------------------
     // wxPrinterDC Impl API
 
     // ---------------------------------------------------------
     // wxPrinterDC Impl API
 

-    virtual wxRect GetPaperRect()
+    virtual wxRect GetPaperRect() const

         { int w = 0; int h = 0; DoGetSize( &w, &h ); return wxRect(0,0,w,h); }
 
         { int w = 0; int h = 0; DoGetSize( &w, &h ); return wxRect(0,0,w,h); }
 

-    virtual int GetResolution()
+    virtual int GetResolution() const

         { return -1; }
 
 private:
         { return -1; }
 
 private:


@@ -562,6 +562,10 @@ protected:
                                   double sa, double ea );
 #endif // __WXWINCE__
 
                                   double sa, double ea );
 #endif // __WXWINCE__
 

+    // returns adjustment factor for converting wxFont "point size"; in wx
+    // it is point size on screen and needs to be multiplied by this value
+    // for rendering on higher-resolution DCs such as printer ones
+    static float GetFontPointSizeAdjustment(float dpi);

 
     // window on which the DC draws or NULL
     wxWindow   *m_window;
 
     // window on which the DC draws or NULL
     wxWindow   *m_window;


@@ -663,7 +667,7 @@ public:
     wxSize GetPPI() const
         { return m_pimpl->GetPPI(); }
 
     wxSize GetPPI() const
         { return m_pimpl->GetPPI(); }
 

-    virtual int GetResolution()
+    virtual int GetResolution() const

         { return m_pimpl->GetResolution(); }
 
     // Right-To-Left (RTL) modes
         { return m_pimpl->GetResolution(); }
 
     // Right-To-Left (RTL) modes


@@ -1117,8 +1121,12 @@ public:
     wxDEPRECATED( void GetLogicalOrigin(long *x, long *y) const );
     wxDEPRECATED( void GetDeviceOrigin(long *x, long *y) const );
     wxDEPRECATED( void GetClippingBox(long *x, long *y, long *w, long *h) const );
     wxDEPRECATED( void GetLogicalOrigin(long *x, long *y) const );
     wxDEPRECATED( void GetDeviceOrigin(long *x, long *y) const );
     wxDEPRECATED( void GetClippingBox(long *x, long *y, long *w, long *h) const );

+

 #endif  // WXWIN_COMPATIBILITY_2_8
 
 #endif  // WXWIN_COMPATIBILITY_2_8
 

+#ifdef __WXMSW__
+    WXHDC GetHDC() const;
+#endif // __WXMSW__

 
 protected:
     // ctor takes ownership of the pointer
 
 protected:
     // ctor takes ownership of the pointer