* 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
This commit is contained in:
Dan Winship 2005-04-04 18:50:50 +00:00
parent a0519cac4d
commit b59ca6cdba
5 changed files with 85 additions and 14 deletions

View file

@ -1,3 +1,11 @@
2005-04-04 Dan Winship <danw@novell.com>
* 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 <mkestner@novell.com> 2005-04-04 Mike Kestner <mkestner@novell.com>
* gtk/Gtk.metadata : mark all the call scope callback params to quiet * gtk/Gtk.metadata : mark all the call scope callback params to quiet

View file

@ -1,3 +1,7 @@
2005-04-04 Dan Winship <danw@novell.com>
* en/Pango/Scale.xml: update
2005-04-01 Dan Winship <danw@novell.com> 2005-04-01 Dan Winship <danw@novell.com>
* en/Gdk/Pixbuf.xml: * en/Gdk/Pixbuf.xml:

View file

@ -31,8 +31,8 @@
<remarks>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.</remarks> <remarks>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.</remarks>
</Docs> </Docs>
</Member> </Member>
<Member MemberName="XX_Small"> <Member MemberName="XXSmall">
<MemberSignature Language="C#" Value="public static double XX_Small;" /> <MemberSignature Language="C#" Value="public static double XXSmall;" />
<MemberType>Field</MemberType> <MemberType>Field</MemberType>
<ReturnValue> <ReturnValue>
<ReturnType>System.Double</ReturnType> <ReturnType>System.Double</ReturnType>
@ -43,8 +43,8 @@
<remarks /> <remarks />
</Docs> </Docs>
</Member> </Member>
<Member MemberName="X_Small"> <Member MemberName="XSmall">
<MemberSignature Language="C#" Value="public static double X_Small;" /> <MemberSignature Language="C#" Value="public static double XSmall;" />
<MemberType>Field</MemberType> <MemberType>Field</MemberType>
<ReturnValue> <ReturnValue>
<ReturnType>System.Double</ReturnType> <ReturnType>System.Double</ReturnType>
@ -91,8 +91,8 @@
<remarks /> <remarks />
</Docs> </Docs>
</Member> </Member>
<Member MemberName="X_Large"> <Member MemberName="XLarge">
<MemberSignature Language="C#" Value="public static double X_Large;" /> <MemberSignature Language="C#" Value="public static double XLarge;" />
<MemberType>Field</MemberType> <MemberType>Field</MemberType>
<ReturnValue> <ReturnValue>
<ReturnType>System.Double</ReturnType> <ReturnType>System.Double</ReturnType>
@ -103,8 +103,8 @@
<remarks /> <remarks />
</Docs> </Docs>
</Member> </Member>
<Member MemberName="XX_Large"> <Member MemberName="XXLarge">
<MemberSignature Language="C#" Value="public static double XX_Large;" /> <MemberSignature Language="C#" Value="public static double XXLarge;" />
<MemberType>Field</MemberType> <MemberType>Field</MemberType>
<ReturnValue> <ReturnValue>
<ReturnType>System.Double</ReturnType> <ReturnType>System.Double</ReturnType>
@ -126,5 +126,53 @@
<remarks /> <remarks />
</Docs> </Docs>
</Member> </Member>
<Member MemberName="XX_Small" Deprecated="true">
<MemberSignature Language="C#" Value="public static double XX_Small;" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>System.Double</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>Obsolete alias for <see cref="F:Pango.Scale.XXSmall" />.</summary>
<remarks />
</Docs>
</Member>
<Member MemberName="X_Small" Deprecated="true">
<MemberSignature Language="C#" Value="public static double X_Small;" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>System.Double</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>Obsolete alias for <see cref="F:Pango.Scale.XSmall" />.</summary>
<remarks />
</Docs>
</Member>
<Member MemberName="X_Large" Deprecated="true">
<MemberSignature Language="C#" Value="public static double X_Large;" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>System.Double</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>Obsolete alias for <see cref="F:Pango.Scale.XLarge" />.</summary>
<remarks />
</Docs>
</Member>
<Member MemberName="XX_Large" Deprecated="true">
<MemberSignature Language="C#" Value="public static double XX_Large;" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>System.Double</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>Obsolete alias for <see cref="F:Pango.Scale.XXLarge" />.</summary>
<remarks />
</Docs>
</Member>
</Members> </Members>
</Type> </Type>

View file

@ -18,17 +18,28 @@
// Free Software Foundation, Inc., 59 Temple Place - Suite 330, // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
// Boston, MA 02111-1307, USA. // Boston, MA 02111-1307, USA.
using System;
namespace Pango { namespace Pango {
public sealed class Scale { public sealed class Scale {
public static readonly double PangoScale = 1024.0; public static readonly double PangoScale = 1024.0;
public static readonly double XX_Small = 0.5787037037037; public static readonly double XXSmall = 0.5787037037037;
public static readonly double X_Small = 0.6444444444444; public static readonly double XSmall = 0.6444444444444;
public static readonly double Small = 0.8333333333333; public static readonly double Small = 0.8333333333333;
public static readonly double Medium = 1.0; public static readonly double Medium = 1.0;
public static readonly double Large = 1.2; public static readonly double Large = 1.2;
public static readonly double X_Large = 1.4399999999999; public static readonly double XLarge = 1.4399999999999;
public static readonly double XX_Large = 1.728; 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;
} }
} }

View file

@ -135,11 +135,11 @@ namespace GtkDemo
buffer.TagTable.Add (tag); buffer.TagTable.Add (tag);
tag = new TextTag ("xx-small"); tag = new TextTag ("xx-small");
tag.Scale = Pango.Scale.XX_Small; tag.Scale = Pango.Scale.XXSmall;
buffer.TagTable.Add (tag); buffer.TagTable.Add (tag);
tag = new TextTag ("x-large"); tag = new TextTag ("x-large");
tag.Scale = Pango.Scale.X_Large; tag.Scale = Pango.Scale.XLarge;
buffer.TagTable.Add (tag); buffer.TagTable.Add (tag);
tag = new TextTag ("monospace"); tag = new TextTag ("monospace");