No real changes, just make wxWindow::CanScroll() virtual.

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

diff --git a/include/wx/gtk/font.h b/include/wx/gtk/font.h
index afc557fe9becbbd344b9e1f69f8bb0ce58f66cc7..a218a29dfecccb27a1d2f7956b3edce1649a72b2 100644 (file)
--- a/include/wx/gtk/font.h
+++ b/include/wx/gtk/font.h
@@ -1,120 +1,127 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        font.h
+// Name:        wx/gtk/font.h

 // Purpose:
 // Author:      Robert Roebling
 // Purpose:
 // Author:      Robert Roebling

-// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __GTKFONTH__
-#define __GTKFONTH__
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface
-#endif
-
-#include "wx/hash.h"
-
-// ----------------------------------------------------------------------------
-// classes
-// ----------------------------------------------------------------------------
-
-class wxDC;
-class wxPaintDC;
-class wxWindow;
-
-class wxFont;
+#ifndef _WX_GTK_FONT_H_
+#define _WX_GTK_FONT_H_

 
 // ----------------------------------------------------------------------------
 // wxFont
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxFont
 // ----------------------------------------------------------------------------
 

-class wxFont : public wxFontBase
+class WXDLLIMPEXP_CORE wxFont : public wxFontBase

 {
 public:
 {
 public:

-    // ctors and such
-    wxFont() { Init(); }
-    wxFont(const wxFont& font) : wxFontBase() { Init(); Ref(font); }
+    wxFont() { }

 
 

-    // wxGTK-specific
-    wxFont(const wxString& fontname)
-    {
-        Init();
+    wxFont(const wxFontInfo& info);

 
 

-        Create(fontname);
+    wxFont(const wxString& nativeFontInfoString)
+    {
+        Create(nativeFontInfoString);

     }
 
     wxFont(const wxNativeFontInfo& info);
 
     }
 
     wxFont(const wxNativeFontInfo& info);
 

+#if FUTURE_WXWIN_COMPATIBILITY_3_0

     wxFont(int size,
            int family,
            int style,
            int weight,
     wxFont(int size,
            int family,
            int style,
            int weight,

-           bool underlined = FALSE,
+           bool underlined = false,
+           const wxString& face = wxEmptyString,
+           wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
+    {
+        (void)Create(size, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, underlined, face, encoding);
+    }
+#endif
+
+    wxFont(int size,
+           wxFontFamily family,
+           wxFontStyle style,
+           wxFontWeight weight,
+           bool underlined = false,

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

-        Init();
+        Create(size, family, style, weight, underlined, face, encoding);
+    }

 
 

-        (void)Create(size, family, style, weight, underlined, face, encoding);
+    wxFont(const wxSize& pixelSize,
+           wxFontFamily family,
+           wxFontStyle style,
+           wxFontWeight weight,
+           bool underlined = false,
+           const wxString& face = wxEmptyString,
+           wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
+    {
+        Create(10, family, style, weight, underlined, face, encoding);
+        SetPixelSize(pixelSize);

     }
 
     bool Create(int size,
     }
 
     bool Create(int size,

-                int family,
-                int style,
-                int weight,
-                bool underlined = FALSE,
+                wxFontFamily family,
+                wxFontStyle style,
+                wxFontWeight weight,
+                bool underlined = false,

                 const wxString& face = wxEmptyString,
                 wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 
     // wxGTK-specific
     bool Create(const wxString& fontname);
 
                 const wxString& face = wxEmptyString,
                 wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 
     // wxGTK-specific
     bool Create(const wxString& fontname);
 

-    ~wxFont();
-
-    // assignment
-    wxFont& operator=(const wxFont& font);
+    virtual ~wxFont();

 
     // implement base class pure virtuals
     virtual int GetPointSize() const;
 
     // implement base class pure virtuals
     virtual int GetPointSize() const;

-    virtual int GetFamily() const;
-    virtual int GetStyle() const;
-    virtual int GetWeight() const;
+    virtual wxFontStyle GetStyle() const;
+    virtual wxFontWeight GetWeight() const;

     virtual wxString GetFaceName() const;
     virtual bool GetUnderlined() const;
     virtual wxString GetFaceName() const;
     virtual bool GetUnderlined() const;

+    virtual bool GetStrikethrough() const;

     virtual wxFontEncoding GetEncoding() const;
     virtual const wxNativeFontInfo *GetNativeFontInfo() const;
     virtual bool IsFixedWidth() const;
 
     virtual void SetPointSize( int pointSize );
     virtual wxFontEncoding GetEncoding() const;
     virtual const wxNativeFontInfo *GetNativeFontInfo() const;
     virtual bool IsFixedWidth() const;
 
     virtual void SetPointSize( int pointSize );

-    virtual void SetFamily( int family );
-    virtual void SetStyle( int style );
-    virtual void SetWeight( int weight );
-    virtual void SetFaceName( const wxString& faceName );
+    virtual void SetFamily(wxFontFamily family);
+    virtual void SetStyle(wxFontStyle style);
+    virtual void SetWeight(wxFontWeight weight);
+    virtual bool SetFaceName( const wxString& faceName );

     virtual void SetUnderlined( bool underlined );
     virtual void SetUnderlined( bool underlined );

+    virtual void SetStrikethrough(bool strikethrough);

     virtual void SetEncoding(wxFontEncoding encoding);
 
     virtual void SetEncoding(wxFontEncoding encoding);
 

-    virtual void SetNoAntiAliasing( bool no = TRUE );
-    virtual bool GetNoAntiAliasing();
+    wxDECLARE_COMMON_FONT_METHODS();
+
+    // Set Pango attributes in the specified layout. Currently only
+    // underlined and strike-through attributes are handled by this function.
+    //
+    // If neither of them is specified, returns false, otherwise sets up the
+    // attributes and returns true.
+    bool GTKSetPangoAttrs(PangoLayout* layout) const;

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

-#ifndef __WXGTK20__
-    GdkFont* GetInternalFont(float scale = 1.0) const;
-#endif
-

     // no data :-)
 
 protected:
     virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info );
 
     // no data :-)
 
 protected:
     virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info );
 

-    // common part of all ctors
-    void Init();
+    virtual wxGDIRefData* CreateGDIRefData() const;
+    virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const;
+
+    virtual wxFontFamily DoGetFamily() const;

 
 private:
 
 private:

+    void Init();
+

     DECLARE_DYNAMIC_CLASS(wxFont)
 };
 
     DECLARE_DYNAMIC_CLASS(wxFont)
 };
 

-#endif // __GTKFONTH__
+#endif // _WX_GTK_FONT_H_