friends declarations removed, GetBitmap/Pixmap functions made public
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@668 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -119,22 +119,10 @@ class wxBitmap: public wxObject
|
|||||||
wxPalette *GetColourMap() const
|
wxPalette *GetColourMap() const
|
||||||
{ return GetPalette(); };
|
{ return GetPalette(); };
|
||||||
|
|
||||||
private:
|
|
||||||
|
|
||||||
friend wxDC;
|
|
||||||
friend wxPaintDC;
|
|
||||||
friend wxMemoryDC;
|
|
||||||
friend wxToolBar;
|
|
||||||
friend wxBitmapButton;
|
|
||||||
friend wxStaticBitmap;
|
|
||||||
friend wxFrame;
|
|
||||||
friend wxDialog;
|
|
||||||
friend wxTreeCtrl;
|
|
||||||
friend wxNotebook;
|
|
||||||
|
|
||||||
GdkPixmap *GetPixmap() const;
|
GdkPixmap *GetPixmap() const;
|
||||||
GdkBitmap *GetBitmap() const;
|
GdkBitmap *GetBitmap() const;
|
||||||
|
|
||||||
|
private:
|
||||||
void DestroyImage();
|
void DestroyImage();
|
||||||
void RecreateImage();
|
void RecreateImage();
|
||||||
void Render();
|
void Render();
|
||||||
|
@@ -119,22 +119,10 @@ class wxBitmap: public wxObject
|
|||||||
wxPalette *GetColourMap() const
|
wxPalette *GetColourMap() const
|
||||||
{ return GetPalette(); };
|
{ return GetPalette(); };
|
||||||
|
|
||||||
private:
|
|
||||||
|
|
||||||
friend wxDC;
|
|
||||||
friend wxPaintDC;
|
|
||||||
friend wxMemoryDC;
|
|
||||||
friend wxToolBar;
|
|
||||||
friend wxBitmapButton;
|
|
||||||
friend wxStaticBitmap;
|
|
||||||
friend wxFrame;
|
|
||||||
friend wxDialog;
|
|
||||||
friend wxTreeCtrl;
|
|
||||||
friend wxNotebook;
|
|
||||||
|
|
||||||
GdkPixmap *GetPixmap() const;
|
GdkPixmap *GetPixmap() const;
|
||||||
GdkBitmap *GetBitmap() const;
|
GdkBitmap *GetBitmap() const;
|
||||||
|
|
||||||
|
private:
|
||||||
void DestroyImage();
|
void DestroyImage();
|
||||||
void RecreateImage();
|
void RecreateImage();
|
||||||
void Render();
|
void Render();
|
||||||
|
Reference in New Issue
Block a user