Added missing "const" for operator== and operator!=.

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

diff --git a/include/wx/gtk/font.h b/include/wx/gtk/font.h
index d66fbe1c1c97222377a609dcba549ea5961cacf1..9d66ddc909c259af15d66460d9ce0f2debbd8368 100644 (file)
--- a/include/wx/gtk/font.h
+++ b/include/wx/gtk/font.h
@@ -3,14 +3,14 @@
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$

-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Copyright:   (c) 1998 Robert Roebling

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

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

     #pragma interface
 #endif
 
     #pragma interface
 #endif
 


@@ -84,7 +84,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 wxNativeFontInfo *GetNativeFontInfo() const;
+    virtual const wxNativeFontInfo *GetNativeFontInfo() const;

     virtual bool IsFixedWidth() const;
 
     virtual void SetPointSize( int pointSize );
     virtual bool IsFixedWidth() const;
 
     virtual void SetPointSize( int pointSize );


@@ -94,11 +94,10 @@ public:
     virtual void SetFaceName( const wxString& faceName );
     virtual void SetUnderlined( bool underlined );
     virtual void SetEncoding(wxFontEncoding encoding);
     virtual void SetFaceName( const wxString& faceName );
     virtual void SetUnderlined( bool underlined );
     virtual void SetEncoding(wxFontEncoding encoding);

-    virtual void SetNativeFontInfo( const wxNativeFontInfo& info );

 
     virtual void SetNoAntiAliasing( bool no = TRUE );
     virtual bool GetNoAntiAliasing();
 
     virtual void SetNoAntiAliasing( bool no = TRUE );
     virtual bool GetNoAntiAliasing();

-    
+

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


@@ -109,6 +108,8 @@ public:
     // no data :-)
 
 protected:
     // no data :-)
 
 protected:

+    virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info );
+

     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();