Added SetFont to most controls and controls sample

[wxWidgets.git] / utils / ogl / src / bitmap.h

diff --git a/utils/ogl/src/bitmap.h b/utils/ogl/src/bitmap.h
index 7f6e1b2b10b48505c4467c23342b93cb3990af01..8527c49088bdf496ac0ae4b73ac8737432147eb2 100644 (file)
--- a/utils/ogl/src/bitmap.h
+++ b/utils/ogl/src/bitmap.h
@@ -35,12 +35,9 @@ class wxBitmapShape: public wxRectangleShape
 #endif
 
   // Does the copying for this object
 #endif
 
   // Does the copying for this object

-  void Copy(wxBitmapShape& copy);
+  void Copy(wxShape& copy);

 
 

-  // Returns a new instance, and does the copy for this class. Define for each class.
-  wxShape *PrivateCopy();
-
-  void SetSize(float w, float h, bool recursive = TRUE);
+  void SetSize(double w, double h, bool recursive = TRUE);

   inline wxBitmap& GetBitmap() const { return (wxBitmap&) m_bitmap; }
   void SetBitmap(const wxBitmap& bm);
   inline void SetFilename(const wxString& f) { m_filename = f; };
   inline wxBitmap& GetBitmap() const { return (wxBitmap&) m_bitmap; }
   void SetBitmap(const wxBitmap& bm);
   inline void SetFilename(const wxString& f) { m_filename = f; };