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

diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index 61f2bb2708197f40f7bf7648d61be8b7285f9b29..689f30ce9fae6f1421d9759f5f12e2a7e3f520a8 100644 (file)
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -5,7 +5,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 


@@ -119,22 +119,10 @@ class wxBitmap: public wxObject
     wxPalette *GetColourMap() const
       { return GetPalette(); };
 
     wxPalette *GetColourMap() const
       { 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;
     GdkBitmap *GetBitmap() const;
     GdkPixmap *GetPixmap() const;
     GdkBitmap *GetBitmap() const;

-  
+
+  private:

     void DestroyImage();
     void RecreateImage();
     void Render();
     void DestroyImage();
     void RecreateImage();
     void Render();

diff --git a/include/wx/gtk1/bitmap.h b/include/wx/gtk1/bitmap.h
index 61f2bb2708197f40f7bf7648d61be8b7285f9b29..689f30ce9fae6f1421d9759f5f12e2a7e3f520a8 100644 (file)
--- a/include/wx/gtk1/bitmap.h
+++ b/include/wx/gtk1/bitmap.h
@@ -5,7 +5,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 


@@ -119,22 +119,10 @@ class wxBitmap: public wxObject
     wxPalette *GetColourMap() const
       { return GetPalette(); };
 
     wxPalette *GetColourMap() const
       { 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;
     GdkBitmap *GetBitmap() const;
     GdkPixmap *GetPixmap() const;
     GdkBitmap *GetBitmap() const;

-  
+
+  private:

     void DestroyImage();
     void RecreateImage();
     void Render();
     void DestroyImage();
     void RecreateImage();
     void Render();