mini frame rewrite (titlebar still missing)

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

diff --git a/include/wx/msw/dc.h b/include/wx/msw/dc.h
index bba7bd5f81dd9e4e848dc5b1ec4e81c9fbaa2303..07d81cb6535ac7bc4b1ab3c35e4ff835d471ee05 100644 (file)
--- a/include/wx/msw/dc.h
+++ b/include/wx/msw/dc.h
@@ -199,10 +199,14 @@ public:
 
   // Size in device units
   virtual void GetSize(int* width, int* height) const;
 
   // Size in device units
   virtual void GetSize(int* width, int* height) const;

-  inline wxSize GetSize(void) const { int w, h; GetSize(&w, &h); return wxSize(w, h); }
+  inline wxSize GetSize() const { int w, h; GetSize(&w, &h); return wxSize(w, h); }

 
   // Size in mm
 
   // Size in mm

-  virtual void GetSizeMM(long* width, long* height) const ;
+  virtual void GetSizeMM(int* width, int* height) const ;
+  inline wxSize GetSizeMM() const { int w, h; GetSizeMM(&w, &h); return wxSize(w, h); }
+
+  // Resolution in Pixels per inch
+  virtual wxSize GetPPI(void) const ;

 
   // Compatibility
 #if WXWIN_COMPATIBILITY
 
   // Compatibility
 #if WXWIN_COMPATIBILITY


@@ -351,7 +355,6 @@ protected:
 
   wxWindow *        m_canvas;
   wxBitmap          m_selectedBitmap;
 
   wxWindow *        m_canvas;
   wxBitmap          m_selectedBitmap;

-  wxString          m_filename;

 
   // TRUE => DeleteDC() in dtor, FALSE => only ReleaseDC() it
   bool              m_bOwnsDC;
 
   // TRUE => DeleteDC() in dtor, FALSE => only ReleaseDC() it
   bool              m_bOwnsDC;


@@ -420,8 +423,8 @@ protected:
 #define MS_XDEV2LOGREL(x) DeviceToLogicalXRel(x)
 #define MS_YDEV2LOGREL(y) DeviceToLogicalYRel(y)
 
 #define MS_XDEV2LOGREL(x) DeviceToLogicalXRel(x)
 #define MS_YDEV2LOGREL(y) DeviceToLogicalYRel(y)
 

-#define MM_POINTS      7
-#define MM_METRIC      8
+#define MM_POINTS      9
+#define MM_METRIC     10

 
 extern int wxPageNumber;
 
 
 extern int wxPageNumber;