From f05df5a85aa0162124d52384c2ef87de64df2131 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 4 Sep 1998 12:45:34 +0000
Subject: [PATCH] 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
---
 include/wx/gtk/bitmap.h  | 18 +++---------------
 include/wx/gtk1/bitmap.h | 18 +++---------------
 2 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index 61f2bb2708..689f30ce9f 100644
--- 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
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -119,22 +119,10 @@ class wxBitmap: public wxObject
     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;
-  
+
+  private:
     void DestroyImage();
     void RecreateImage();
     void Render();
diff --git a/include/wx/gtk1/bitmap.h b/include/wx/gtk1/bitmap.h
index 61f2bb2708..689f30ce9f 100644
--- 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
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -119,22 +119,10 @@ class wxBitmap: public wxObject
     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;
-  
+
+  private:
     void DestroyImage();
     void RecreateImage();
     void Render();
-- 
2.47.2