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

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

diff --git a/include/wx/mgl/fontutil.h b/include/wx/mgl/fontutil.h
index 6f353a4d4a5f569928b4fd8815efe955b8e43585..f83849b133e6b42a84c7c9de734087da1675de2d 100644 (file)
--- a/include/wx/mgl/fontutil.h
+++ b/include/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