depth for masks added

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

diff --git a/include/wx/dc.h b/include/wx/dc.h
index 11e282d8af73329f8722693d5548f0a14935aba0..75f3dc348ad6d9c5b76424d68befe261c7c4ffe1 100644 (file)
--- a/include/wx/dc.h
+++ b/include/wx/dc.h
@@ -602,7 +602,7 @@ public:
             float *descent = NULL, float *externalLeading = NULL,
             wxFont *theFont = NULL, bool use16bit = FALSE) const ;
     void GetSize(float* width, float* height) const { int w, h; GetSize(& w, & h); *width = w; *height = h; }
             float *descent = NULL, float *externalLeading = NULL,
             wxFont *theFont = NULL, bool use16bit = FALSE) const ;
     void GetSize(float* width, float* height) const { int w, h; GetSize(& w, & h); *width = w; *height = h; }

-    void GetSizeMM(float *width, float *height) const { long w, h; GetSizeMM(& w, & h); *width = (float) w; *height = (float) h; }
+    void GetSizeMM(float *width, float *height) const { int w, h; GetSizeMM(& w, & h); *width = (float) w; *height = (float) h; }

 
 #endif // WXWIN_COMPATIBILITY
 
 
 #endif // WXWIN_COMPATIBILITY
 


@@ -770,8 +770,6 @@ private:
     #include "wx/mac/dc.h"
 #elif defined(__WXPM__)
     #include "wx/os2/dc.h"
     #include "wx/mac/dc.h"
 #elif defined(__WXPM__)
     #include "wx/os2/dc.h"

-#elif defined(__WXSTUBS__)
-    #include "wx/stubs/dc.h"

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------