no changes, just remove #if'd out code

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

diff --git a/include/wx/gtk1/font.h b/include/wx/gtk1/font.h
index 62250ef33b97ea30d9bf5d774d83e1b58b3d997d..de10438926b4f867f69afc69a25b1fa49fcb6bcc 100644 (file)
--- a/include/wx/gtk1/font.h
+++ b/include/wx/gtk1/font.h
@@ -40,6 +40,7 @@ public:
 
     wxFont(const wxNativeFontInfo& info);
 
 
     wxFont(const wxNativeFontInfo& info);
 

+#if FUTURE_WXWIN_COMPATIBILITY_3_0

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


@@ -48,17 +49,42 @@ public:
            const wxString& face = wxEmptyString,
            wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
     {
            const wxString& face = wxEmptyString,
            wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
     {

-        (void)Create(size, family, style, weight, underlined, face, encoding);
+        (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)
+    {
+        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,
+                wxFontFamily family,
+                wxFontStyle style,
+                wxFontWeight weight,

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

+

     // wxGTK-specific
     bool Create(const wxString& fontname);
 
     // wxGTK-specific
     bool Create(const wxString& fontname);
 


@@ -66,9 +92,9 @@ public:
 
     // 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 wxFontFamily GetFamily() const;
+    virtual wxFontStyle GetStyle() const;
+    virtual wxFontWeight GetWeight() const;

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


@@ -76,13 +102,15 @@ public:
     virtual bool IsFixedWidth() const;
 
     virtual void SetPointSize( int pointSize );
     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 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 SetEncoding(wxFontEncoding encoding);
 
     virtual bool SetFaceName( const wxString& faceName );
     virtual void SetUnderlined( bool underlined );
     virtual void SetEncoding(wxFontEncoding encoding);
 

+    WXDECLARE_COMPAT_SETTERS
+

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