[slimdx] r2173 committed - Removed extraneous MeasuringMethod enum from DWrite.

[sli...@googlecode.com]

Revision: 2173
Author: mike.popoloski
Date: Fri Mar 2 13:11:16 2012
Log: Removed extraneous MeasuringMethod enum from DWrite.
http://code.google.com/p/slimdx/source/detail?r=2173

Deleted:
/trunk/build/SlimDXDocs.sln
Modified:
/trunk/build/ReleaseNotes.txt
/trunk/source/direct2d/RenderTarget.cpp
/trunk/source/direct2d/RenderTarget.h
/trunk/source/directwrite/Enums.h

=======================================
--- /trunk/build/SlimDXDocs.sln Sat Feb 26 22:36:05 2011
+++ /dev/null
@@ -1,17 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}")
= "DocSite", "..\docs\DocSite\DocSite.csproj", "{39CED32B-8B35-4099-B167-F3B228BFE6B4}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {39CED32B-8B35-4099-B167-F3B228BFE6B4}.Release|Win32.ActiveCfg = Release|
Any CPU
- {39CED32B-8B35-4099-B167-F3B228BFE6B4}.Release|Win32.Build.0 = Release|
Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
=======================================
--- /trunk/build/ReleaseNotes.txt Fri Mar 2 11:05:32 2012
+++ /trunk/build/ReleaseNotes.txt Fri Mar 2 13:11:16 2012
@@ -1,3 +1,4 @@
DirectWrite
* Changed TextRenderer into ITextRenderer to allow user implementation.
* Added Strikethrough and Underline classes
+ * Removed extraneous MeasuringMethod enum.
=======================================
--- /trunk/source/direct2d/RenderTarget.cpp Sat Jan 28 10:03:11 2012
+++ /trunk/source/direct2d/RenderTarget.cpp Fri Mar 2 13:11:16 2012
@@ -340,7 +340,7 @@
DrawText( text, textFormat, rect, defaultBrush );
}

- void RenderTarget::DrawText( String^ text,
SlimDX::DirectWrite::TextFormat^ textFormat, System::Drawing::Rectangle
layoutRectangle, Brush^ defaultBrush, DrawTextOptions options,
SlimDX::DirectWrite::MeasuringMethod measuringMethod )
+ void RenderTarget::DrawText( String^ text,
SlimDX::DirectWrite::TextFormat^ textFormat, System::Drawing::Rectangle
layoutRectangle, Brush^ defaultBrush, DrawTextOptions options,
SlimDX::DirectWrite::MeasuringMode measuringMethod )
{
RectangleF rect = CastRectangle( layoutRectangle );

@@ -355,7 +355,7 @@
InternalPointer->DrawTextW( pinnedText, text->Length,
textFormat->InternalPointer, rect, defaultBrush->InternalPointer );
}

- void RenderTarget::DrawText( String^ text,
SlimDX::DirectWrite::TextFormat^ textFormat, System::Drawing::RectangleF
layoutRectangle, Brush^ defaultBrush, DrawTextOptions options,
SlimDX::DirectWrite::MeasuringMethod measuringMethod )
+ void RenderTarget::DrawText( String^ text,
SlimDX::DirectWrite::TextFormat^ textFormat, System::Drawing::RectangleF
layoutRectangle, Brush^ defaultBrush, DrawTextOptions options,
SlimDX::DirectWrite::MeasuringMode measuringMethod )
{
D2D1_RECT_F rect = D2D1::RectF( layoutRectangle.Left,
layoutRectangle.Top, layoutRectangle.Right, layoutRectangle.Bottom );
pin_ptr<const wchar_t> pinnedText = PtrToStringChars( text );
=======================================
--- /trunk/source/direct2d/RenderTarget.h Sat Jan 28 10:03:11 2012
+++ /trunk/source/direct2d/RenderTarget.h Fri Mar 2 13:11:16 2012
@@ -115,8 +115,8 @@
#undef DrawText
void DrawText( System::String^ text, SlimDX::DirectWrite::TextFormat^
textFormat, System::Drawing::Rectangle layoutRectangle, Brush^ defaultBrush
);
void DrawText( System::String^ text, SlimDX::DirectWrite::TextFormat^
textFormat, System::Drawing::RectangleF layoutRectangle, Brush^
defaultBrush );
- void DrawText( System::String^ text, SlimDX::DirectWrite::TextFormat^
textFormat, System::Drawing::Rectangle layoutRectangle, Brush^
defaultBrush, DrawTextOptions options, SlimDX::DirectWrite::MeasuringMethod
measuringMethod );
- void DrawText( System::String^ text, SlimDX::DirectWrite::TextFormat^
textFormat, System::Drawing::RectangleF layoutRectangle, Brush^
defaultBrush, DrawTextOptions options, SlimDX::DirectWrite::MeasuringMethod
measuringMethod );
+ void DrawText( System::String^ text, SlimDX::DirectWrite::TextFormat^
textFormat, System::Drawing::Rectangle layoutRectangle, Brush^
defaultBrush, DrawTextOptions options, SlimDX::DirectWrite::MeasuringMode
measuringMethod );
+ void DrawText( System::String^ text, SlimDX::DirectWrite::TextFormat^
textFormat, System::Drawing::RectangleF layoutRectangle, Brush^
defaultBrush, DrawTextOptions options, SlimDX::DirectWrite::MeasuringMode
measuringMethod );
#pragma pop_macro("DrawText")

void DrawBitmap( Bitmap^ bitmap );
=======================================
--- /trunk/source/directwrite/Enums.h Sat Jan 28 10:03:11 2012
+++ /trunk/source/directwrite/Enums.h Fri Mar 2 13:11:16 2012
@@ -268,6 +268,9 @@
Uniform = DWRITE_LINE_SPACING_METHOD_UNIFORM
};

+ /// <summary>
+ /// Specifies the measuring method used for text layout.
+ /// </summary>
public enum class MeasuringMode : System::Int32
{
Natural = DWRITE_MEASURING_MODE_NATURAL,
@@ -356,16 +359,6 @@
ClearType3x1 = DWRITE_TEXTURE_CLEARTYPE_3x1
};

- /// <summary>
- /// Specifies the measuring method used for text layout.
- /// </summary>
- public enum class MeasuringMethod : System::Int32
- {
- Natural = DWRITE_MEASURING_MODE_NATURAL,
- GdiClassic = DWRITE_MEASURING_MODE_GDI_CLASSIC,
- GdiNatural = DWRITE_MEASURING_MODE_GDI_NATURAL,
- };
-
/// <summary>
/// Specifies the text granularity used to trim text overflowing the
layout box.
/// </summary>