Update OpenVMS make files

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

diff --git a/include/wx/mgl/fontutil.h b/include/wx/mgl/fontutil.h
index e1d622518e81159f78e7f604e61329bfe0a49f58..dd286a712c524a8eb7bdeb51b18a2b2476711512 100644 (file)
--- a/include/wx/mgl/fontutil.h
+++ b/include/wx/mgl/fontutil.h
@@ -1,18 +1,16 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wx/nix/fontutil.h
+// Name:        wx/mgl/fontutil.h

 // Purpose:     font-related helper functions for MGL
 // Author:      Vaclav Slavik
 // Created:     2001/05/01
 // RCS-ID:      $Id$
 // Purpose:     font-related helper functions for MGL
 // Author:      Vaclav Slavik
 // Created:     2001/05/01
 // RCS-ID:      $Id$

-// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows license
+// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MGL_FONTUTIL_H_
 #define _WX_MGL_FONTUTIL_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MGL_FONTUTIL_H_
 #define _WX_MGL_FONTUTIL_H_
 

-#ifdef __WXMGL__
-

 #include "wx/list.h"
 
 struct font_info_t;
 #include "wx/list.h"
 
 struct font_info_t;


@@ -59,10 +57,11 @@ private:
 class wxMGLFontLibrary
 {
 public:
 class wxMGLFontLibrary
 {
 public:

-    wxMGLFontLibrary(const wxString& filename, int type);
+    wxMGLFontLibrary(const wxString& filename, int type, wxMGLFontFamily *parentFamily);

     ~wxMGLFontLibrary();
     
     wxMGLFontInstance *GetFontInstance(wxFont *font, float scale, bool aa);
     ~wxMGLFontLibrary();
     
     wxMGLFontInstance *GetFontInstance(wxFont *font, float scale, bool aa);

+    wxMGLFontFamily *GetFamily() const { return m_family; }

     
     void IncRef();
     void DecRef();
     
     void IncRef();
     void DecRef();


@@ -75,6 +74,7 @@ private:
     wxString m_fileName;
     size_t m_refs;
     wxMGLFontInstanceList *m_instances;
     wxString m_fileName;
     size_t m_refs;
     wxMGLFontInstanceList *m_instances;

+    wxMGLFontFamily *m_family;

 };
 
 // structure representing native MGL font family
 };
 
 // structure representing native MGL font family


@@ -121,6 +121,4 @@ class wxFontsManager
 
 extern wxFontsManager *wxTheFontsManager;
 
 
 extern wxFontsManager *wxTheFontsManager;
 

-#endif
-

 #endif // _WX_MGL_FONTUTIL_H_
 #endif // _WX_MGL_FONTUTIL_H_