updated to generate ZIP files with DOS line endings

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

diff --git a/include/wx/gtk/font.h b/include/wx/gtk/font.h
index 9f23bd9017ecdba066d5048830b19266b2a86944..1502d7bf6dea4b010bc0923bc336402a442b57f5 100644 (file)
--- a/include/wx/gtk/font.h
+++ b/include/wx/gtk/font.h
@@ -10,7 +10,7 @@
 #ifndef __GTKFONTH__
 #define __GTKFONTH__
 
 #ifndef __GTKFONTH__
 #define __GTKFONTH__
 

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

     #pragma interface
 #endif
 
     #pragma interface
 #endif
 


@@ -51,7 +51,7 @@ public:
            int family,
            int style,
            int weight,
            int family,
            int style,
            int weight,

-           bool underlined = FALSE,
+           bool underlined = false,

            const wxString& face = wxEmptyString,
            wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
     {
            const wxString& face = wxEmptyString,
            wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
     {


@@ -64,7 +64,7 @@ public:
                 int family,
                 int style,
                 int weight,
                 int family,
                 int style,
                 int weight,

-                bool underlined = FALSE,
+                bool underlined = false,

                 const wxString& face = wxEmptyString,
                 wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 
                 const wxString& face = wxEmptyString,
                 wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 


@@ -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 );


@@ -95,8 +95,8 @@ public:
     virtual void SetUnderlined( bool underlined );
     virtual void SetEncoding(wxFontEncoding encoding);
 
     virtual void SetUnderlined( bool underlined );
     virtual void SetEncoding(wxFontEncoding encoding);
 

-    virtual void SetNoAntiAliasing( bool no = TRUE );
-    virtual bool GetNoAntiAliasing();
+    virtual void SetNoAntiAliasing( bool no = true );
+    virtual bool GetNoAntiAliasing() const ;

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