adding impls to wxBitmap on msw as this doesn't inherit from base - Thanks Vaclav!
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74298 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		@@ -144,6 +144,9 @@ public:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    virtual bool Create(int width, int height, const wxDC& dc);
 | 
					    virtual bool Create(int width, int height, const wxDC& dc);
 | 
				
			||||||
    virtual bool Create(const void* data, wxBitmapType type, int width, int height, int depth = 1);
 | 
					    virtual bool Create(const void* data, wxBitmapType type, int width, int height, int depth = 1);
 | 
				
			||||||
 | 
					    virtual bool CreateScaled(int w, int h, int d, double logicalScale)
 | 
				
			||||||
 | 
					        { return Create(w*logicalScale,h*logicalScale,d); }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    virtual bool LoadFile(const wxString& name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE);
 | 
					    virtual bool LoadFile(const wxString& name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE);
 | 
				
			||||||
    virtual bool SaveFile(const wxString& name, wxBitmapType type, const wxPalette *cmap = NULL) const;
 | 
					    virtual bool SaveFile(const wxString& name, wxBitmapType type, const wxPalette *cmap = NULL) const;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -167,6 +170,13 @@ public:
 | 
				
			|||||||
    bool HasAlpha() const;
 | 
					    bool HasAlpha() const;
 | 
				
			||||||
    void UseAlpha();
 | 
					    void UseAlpha();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // support for scaled bitmaps
 | 
				
			||||||
 | 
					    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()); }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // implementation only from now on
 | 
					    // implementation only from now on
 | 
				
			||||||
    // -------------------------------
 | 
					    // -------------------------------
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user