removed virtual GetSelectedBitmap() from the base wxDC class, it only makes sense for wxMemoryDC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45146 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -95,7 +95,6 @@ public:
|
||||
virtual void ComputeScaleAndOrigin();
|
||||
|
||||
virtual GdkWindow* GetGDKWindow() const { return NULL; }
|
||||
virtual wxBitmap GetSelectedBitmap() const { return wxNullBitmap; }
|
||||
|
||||
protected:
|
||||
// implementation
|
||||
|
@@ -35,14 +35,17 @@ public:
|
||||
virtual void SetTextBackground( const wxColour &col );
|
||||
|
||||
// implementation
|
||||
virtual wxBitmap GetSelectedBitmap() const { return m_selected; }
|
||||
wxBitmap GetSelectedBitmap() const { return m_selected; }
|
||||
wxBitmap m_selected;
|
||||
|
||||
protected:
|
||||
void DoGetSize( int *width, int *height ) const;
|
||||
virtual void DoSelect(const wxBitmap& bitmap);
|
||||
virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const
|
||||
{ return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmap(*subrect); }
|
||||
virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const
|
||||
{
|
||||
wxBitmap bmp = GetSelectedBitmap();
|
||||
return subrect ? bmp.GetSubBitmap(*subrect) : bmp;
|
||||
}
|
||||
|
||||
private:
|
||||
void Init();
|
||||
|
Reference in New Issue
Block a user