From b59ca6cdba153e5a4ace0280c9879da5eacd21e3 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Mon, 4 Apr 2005 18:50:50 +0000 Subject: [PATCH] * pango/Scale.cs: rename the size constants to not have underscores in their names (and add obsolete aliases for the old names). * sample/GtkDemo/DemoTextView.cs: use the new names svn path=/trunk/gtk-sharp/; revision=42532 --- ChangeLog | 8 +++++ doc/ChangeLog | 4 +++ doc/en/Pango/Scale.xml | 64 +++++++++++++++++++++++++++++----- pango/Scale.cs | 19 +++++++--- sample/GtkDemo/DemoTextView.cs | 4 +-- 5 files changed, 85 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index acdb5a439..65070cf04 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-04-04 Dan Winship + + * pango/Scale.cs: rename the size constants to not have + underscores in their names (and add obsolete aliases for the old + names). + + * sample/GtkDemo/DemoTextView.cs: use the new names + 2005-04-04 Mike Kestner * gtk/Gtk.metadata : mark all the call scope callback params to quiet diff --git a/doc/ChangeLog b/doc/ChangeLog index 412a32984..548c42d9b 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,7 @@ +2005-04-04 Dan Winship + + * en/Pango/Scale.xml: update + 2005-04-01 Dan Winship * en/Gdk/Pixbuf.xml: diff --git a/doc/en/Pango/Scale.xml b/doc/en/Pango/Scale.xml index 5feb4bac1..a7d7884a2 100644 --- a/doc/en/Pango/Scale.xml +++ b/doc/en/Pango/Scale.xml @@ -31,8 +31,8 @@ The definition of device units is dependent on the output device; it will typically be pixels for a screen, and points for a printer. This is currently 1024, but this may be changed in the future. When setting font sizes, device units are always considered to be points (as in "12 point font"), rather than pixels. - - + + Field System.Double @@ -43,8 +43,8 @@ - - + + Field System.Double @@ -91,8 +91,8 @@ - - + + Field System.Double @@ -103,8 +103,8 @@ - - + + Field System.Double @@ -126,5 +126,53 @@ + + + Field + + System.Double + + + + Obsolete alias for . + + + + + + Field + + System.Double + + + + Obsolete alias for . + + + + + + Field + + System.Double + + + + Obsolete alias for . + + + + + + Field + + System.Double + + + + Obsolete alias for . + + + \ No newline at end of file diff --git a/pango/Scale.cs b/pango/Scale.cs index 52568acf0..a7c003d39 100755 --- a/pango/Scale.cs +++ b/pango/Scale.cs @@ -18,17 +18,28 @@ // Free Software Foundation, Inc., 59 Temple Place - Suite 330, // Boston, MA 02111-1307, USA. +using System; + namespace Pango { public sealed class Scale { public static readonly double PangoScale = 1024.0; - public static readonly double XX_Small = 0.5787037037037; - public static readonly double X_Small = 0.6444444444444; + public static readonly double XXSmall = 0.5787037037037; + public static readonly double XSmall = 0.6444444444444; public static readonly double Small = 0.8333333333333; public static readonly double Medium = 1.0; public static readonly double Large = 1.2; - public static readonly double X_Large = 1.4399999999999; - public static readonly double XX_Large = 1.728; + public static readonly double XLarge = 1.4399999999999; + public static readonly double XXLarge = 1.728; + + [Obsolete ("Replaced by XXSmall")] + public static readonly double XX_Small = XXSmall; + [Obsolete ("Replaced by XSmall")] + public static readonly double X_Small = XSmall; + [Obsolete ("Replaced by XLarge")] + public static readonly double X_Large = XLarge; + [Obsolete ("Replaced by XXLarge")] + public static readonly double XX_Large = XXLarge; } } diff --git a/sample/GtkDemo/DemoTextView.cs b/sample/GtkDemo/DemoTextView.cs index b6afb851b..7873dc0b8 100644 --- a/sample/GtkDemo/DemoTextView.cs +++ b/sample/GtkDemo/DemoTextView.cs @@ -135,11 +135,11 @@ namespace GtkDemo buffer.TagTable.Add (tag); tag = new TextTag ("xx-small"); - tag.Scale = Pango.Scale.XX_Small; + tag.Scale = Pango.Scale.XXSmall; buffer.TagTable.Add (tag); tag = new TextTag ("x-large"); - tag.Scale = Pango.Scale.X_Large; + tag.Scale = Pango.Scale.XLarge; buffer.TagTable.Add (tag); tag = new TextTag ("monospace");