projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
made wxStringInputStream::GetSize() public instead of protected
[wxWidgets.git]
/
include
/
wx
/
mgl
/
fontutil.h
diff --git
a/include/wx/mgl/fontutil.h
b/include/wx/mgl/fontutil.h
index 6f353a4d4a5f569928b4fd8815efe955b8e43585..dd286a712c524a8eb7bdeb51b18a2b2476711512 100644
(file)
--- a/
include/wx/mgl/fontutil.h
+++ b/
include/wx/mgl/fontutil.h
@@
-4,8
+4,8
@@
// Author: Vaclav Slavik
// Created: 2001/05/01
// RCS-ID: $Id$
// Author: Vaclav Slavik
// Created: 2001/05/01
// RCS-ID: $Id$
-// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence: wxWindows licen
s
e
+// Copyright: (c) 2001
-2002
SciTech Software, Inc. (www.scitechsoft.com)
+// Licence: wxWindows licen
c
e
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_MGL_FONTUTIL_H_
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_MGL_FONTUTIL_H_
@@
-57,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();
@@
-73,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