Another "char" occurrence

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

diff --git a/include/wx/msw/dc.h b/include/wx/msw/dc.h
index 9186c620d90c3c8c898bad3b521dadfe3e2f1b75..07d81cb6535ac7bc4b1ab3c35e4ff835d471ee05 100644 (file)
--- a/include/wx/msw/dc.h
+++ b/include/wx/msw/dc.h
@@ -21,6 +21,20 @@
 #include "wx/icon.h"
 #include "wx/font.h"
 #include "wx/gdicmn.h"
+#include "wx/window.h"
+
+// Clash with Windows header files
+#ifdef StartDoc
+#undef StartDoc
+#endif
+
+#ifdef DrawText
+#undef DrawText
+#endif
+
+#ifdef GetCharWidth
+#undef GetCharWidth
+#endif
 
 class WXDLLEXPORT wxDC: public wxObject
 {
@@ -30,8 +44,13 @@ public:
   wxDC(void);
   ~wxDC(void);
 
+#ifdef WX_COMP_INLINE_NO_CLASS
+  inline void BeginDrawing(void) {}
+  inline void EndDrawing(void) {}
+#else
   inline void wxDC::BeginDrawing(void) {}
   inline void wxDC::EndDrawing(void) {}
+#endif
 
   virtual void FloodFill(long x1, long y1, const wxColour& col, int style=wxFLOOD_SURFACE) ;
   inline void FloodFill(const wxPoint& pt, const wxColour& col, int style=wxFLOOD_SURFACE)
@@ -180,10 +199,14 @@ public:
 
   // 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
-  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
@@ -265,7 +288,11 @@ public:
   }
 
   // This should probably be made available on other platforms
+#ifdef WX_COMP_INLINE_NO_CLASS
+  int GetDepth(void) const ;
+#else
   int wxDC::GetDepth(void) const ;
+#endif
 
 // Implementation
   virtual void SetRop(WXHDC cdc);
@@ -328,7 +355,6 @@ protected:
 
   wxWindow *        m_canvas;
   wxBitmap          m_selectedBitmap;
-  wxString          m_filename;
 
   // TRUE => DeleteDC() in dtor, FALSE => only ReleaseDC() it
   bool              m_bOwnsDC;
@@ -397,8 +423,8 @@ protected:
 #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;