Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h
index 791b721d226194b8ab45a4678f729ae8aeb755a9..6d9ffe71b75192a32cc34862c5e70c6d440dc3e7 100644 (file)
--- a/include/wx/bitmap.h
+++ b/include/wx/bitmap.h
@@ -4,7 +4,6 @@
 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     22.04.01
 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     22.04.01

-// RCS-ID:      $Id$

 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -26,6 +25,7 @@ class WXDLLIMPEXP_FWD_CORE wxBitmapHandler;
 class WXDLLIMPEXP_FWD_CORE wxIcon;
 class WXDLLIMPEXP_FWD_CORE wxMask;
 class WXDLLIMPEXP_FWD_CORE wxPalette;
 class WXDLLIMPEXP_FWD_CORE wxIcon;
 class WXDLLIMPEXP_FWD_CORE wxMask;
 class WXDLLIMPEXP_FWD_CORE wxPalette;

+class WXDLLIMPEXP_FWD_CORE wxDC;

 
 // ----------------------------------------------------------------------------
 // wxVariant support
 
 // ----------------------------------------------------------------------------
 // wxVariant support


@@ -174,6 +174,8 @@ public:
 
     virtual bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH) = 0;
     virtual bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH) = 0;
 
     virtual bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH) = 0;
     virtual bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH) = 0;

+    virtual bool CreateScaled(int w, int h, int d, double logicalScale)
+        { return Create(w*logicalScale,h*logicalScale,d); }

 
     virtual int GetHeight() const = 0;
     virtual int GetWidth() const = 0;
 
     virtual int GetHeight() const = 0;
     virtual int GetWidth() const = 0;


@@ -183,9 +185,9 @@ public:
         { return wxSize(GetWidth(), GetHeight()); }
 
     // support for scaled bitmaps
         { return wxSize(GetWidth(), GetHeight()); }
 
     // support for scaled bitmaps

-    virtual double GetScale() const { return 1.0; }
-    virtual double GetScaledWidth() const { return GetWidth() / GetScale(); }
-    virtual double GetScaledHeight() const { return GetHeight() / GetScale(); }
+    virtual double GetScaleFactor() const { return 1.0; }
+    virtual double GetScaledWidth() const { return GetWidth() / GetScaleFactor(); }
+    virtual double GetScaledHeight() const { return GetHeight() / GetScaleFactor(); }

     virtual wxSize GetScaledSize() const
     { return wxSize(GetScaledWidth(), GetScaledHeight()); }
 
     virtual wxSize GetScaledSize() const
     { return wxSize(GetScaledWidth(), GetScaledHeight()); }