correct access for virtuals
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42351 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
132025f344
commit
4c44e0d048
@ -117,14 +117,14 @@ public:
|
|||||||
protected:
|
protected:
|
||||||
bool CreateFromImage(const wxImage& image, int depth);
|
bool CreateFromImage(const wxImage& image, int depth);
|
||||||
|
|
||||||
|
virtual wxObjectRefData* CreateRefData() const;
|
||||||
|
virtual wxObjectRefData* CloneRefData(const wxObjectRefData* data) const;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
// to be called from CreateFromImage only!
|
// to be called from CreateFromImage only!
|
||||||
bool CreateFromImageAsPixmap(const wxImage& image, int depth);
|
bool CreateFromImageAsPixmap(const wxImage& image, int depth);
|
||||||
bool CreateFromImageAsPixbuf(const wxImage& image);
|
bool CreateFromImageAsPixbuf(const wxImage& image);
|
||||||
|
|
||||||
virtual wxObjectRefData* CreateRefData() const;
|
|
||||||
virtual wxObjectRefData* CloneRefData(const wxObjectRefData* data) const;
|
|
||||||
|
|
||||||
enum Representation
|
enum Representation
|
||||||
{
|
{
|
||||||
Pixmap,
|
Pixmap,
|
||||||
|
@ -123,7 +123,6 @@ public:
|
|||||||
void SetUpDC();
|
void SetUpDC();
|
||||||
void Destroy();
|
void Destroy();
|
||||||
|
|
||||||
protected:
|
|
||||||
virtual void ComputeScaleAndOrigin();
|
virtual void ComputeScaleAndOrigin();
|
||||||
|
|
||||||
virtual GdkWindow *GetGDKWindow() const { return m_window; }
|
virtual GdkWindow *GetGDKWindow() const { return m_window; }
|
||||||
|
Loading…
Reference in New Issue
Block a user