adding OS level Window Menu by default

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

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

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

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_FONT_H__
 #define __WX_FONT_H__
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_FONT_H__
 #define __WX_FONT_H__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "font.h"
 #endif
 
     #pragma interface "font.h"
 #endif
 


@@ -81,6 +81,7 @@ public:
     virtual bool GetUnderlined() const;
     virtual wxFontEncoding GetEncoding() const;
     virtual bool IsFixedWidth() const;
     virtual bool GetUnderlined() const;
     virtual wxFontEncoding GetEncoding() const;
     virtual bool IsFixedWidth() const;

+    virtual const wxNativeFontInfo *GetNativeFontInfo() const;

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


@@ -90,17 +91,16 @@ public:
     virtual void SetUnderlined(bool underlined);
     virtual void SetEncoding(wxFontEncoding encoding);
 
     virtual void SetUnderlined(bool underlined);
     virtual void SetEncoding(wxFontEncoding encoding);
 

-    // implementation from now on
-    void Unshare();
-

     struct font_t *GetMGLfont_t(float scale, bool antialiased);
 
     struct font_t *GetMGLfont_t(float scale, bool antialiased);
 

-    // no data :-)
-

 protected:
     // common part of all ctors
     void Init() {}
 
 protected:
     // common part of all ctors
     void Init() {}
 

+    // ref counting code
+    virtual wxObjectRefData *CreateRefData() const;
+    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
+

 private:
     DECLARE_DYNAMIC_CLASS(wxFont)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxFont)
 };