Applied wxImage -> wxCursor patch, tool window event table fix

[wxWidgets.git] / include / wx / mgl / font.h

diff --git a/include/wx/mgl/font.h b/include/wx/mgl/font.h
index 3929e5f9596fe94709aebe9fdc3ba8c40a5ccb0a..4aed3d6dfb59041a6c4c2039a417c2346b1aa302 100644 (file)
--- a/include/wx/mgl/font.h
+++ b/include/wx/mgl/font.h
@@ -2,7 +2,7 @@
 // Name:        font.h
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Name:        font.h
 // Author:      Vaclav Slavik
 // Id:          $Id$

-// Copyright:   (c) 2001, Vaclav Slavik
+// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -67,7 +67,7 @@ public:
 
     bool Create(const wxNativeFontInfo& fontinfo);
 
 
     bool Create(const wxNativeFontInfo& fontinfo);
 

-    ~wxFont();
+    ~wxFont() {}

 
     // assignment
     wxFont& operator=(const wxFont& font);
 
     // assignment
     wxFont& operator=(const wxFont& font);


@@ -80,6 +80,7 @@ public:
     virtual wxString GetFaceName() const;
     virtual bool GetUnderlined() const;
     virtual wxFontEncoding GetEncoding() const;
     virtual wxString GetFaceName() const;
     virtual bool GetUnderlined() const;
     virtual wxFontEncoding GetEncoding() const;

+    virtual bool IsFixedWidth() const;

 
     virtual void SetPointSize(int pointSize);
     virtual void SetFamily(int family);
 
     virtual void SetPointSize(int pointSize);
     virtual void SetFamily(int family);


@@ -98,7 +99,7 @@ public:
 
 protected:
     // common part of all ctors
 
 protected:
     // common part of all ctors

-    void Init();
+    void Init() {}

 
 private:
     DECLARE_DYNAMIC_CLASS(wxFont)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxFont)