Skip to content

Commit a24101e

Browse files
committed
Change drawable function order.
1 parent d0c3ba6 commit a24101e

3 files changed

Lines changed: 8 additions & 11 deletions

File tree

DrawableObject.ixx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,16 +99,16 @@ static_assert(DrawableObjectAttributeTotal == 53, "A new attribute enum has been
9999
const Attribute::PredefinedValue DrawableObject::functions[] = {
100100
{ DrawableObjectFunctionNop, u"Nop"},
101101
{ DrawableObjectFunctionDWriteBitmapRenderTargetLayoutDraw, u"IDWriteBitmapRenderTarget IDWriteTextLayout"},
102+
{ DrawableObjectFunctionDWriteBitmapRenderTargetDrawGlyphRun, u"IDWriteBitmapRenderTarget DrawGlyphRun" },
102103
{ DrawableObjectFunctionDirect2DDrawTextLayout, u"D2D DrawTextLayout"},
103104
{ DrawableObjectFunctionDirect2DDrawText, u"D2D DrawText"},
105+
{ DrawableObjectFunctionDirect2DDrawGlyphRun, u"D2D DrawGlyphRun" },
106+
{ DrawableObjectFunctionDrawColorBitmapGlyphRun, u"D2D DrawColorBitmapGlyphRun" },
107+
{ DrawableObjectFunctionDrawSvgGlyphRun, u"D2D DrawSvgGlyphRun" },
104108
{ DrawableObjectFunctionUser32DrawText, u"User32 DrawText" },
105-
{ DrawableObjectFunctionGdiPlusDrawString, u"GDIPlus DrawString" },
106-
{ DrawableObjectFunctionDWriteBitmapRenderTargetDrawGlyphRun, u"IDWriteBitmapRenderTarget DrawGlyphRun" },
107-
{ DrawableObjectFunctionDirect2DDrawGlyphRun, u"D2D DrawGlyphRun"},
108109
{ DrawableObjectFunctionGdiTextOut, u"GDI ExtTextOut" },
110+
{ DrawableObjectFunctionGdiPlusDrawString, u"GDIPlus DrawString" },
109111
{ DrawableObjectFunctionGdiPlusDrawDriverString, u"GDIPlus DrawDriverString"},
110-
{ DrawableObjectFunctionDrawColorBitmapGlyphRun, u"D2D DrawColorBitmapGlyphRun"},
111-
{ DrawableObjectFunctionDrawSvgGlyphRun, u"D2D DrawSvgGlyphRun"},
112112
#if 0
113113
{ , u"Uniscribe ScriptStringOut"},
114114
{ , u"GDI GetCharacterPlacement"},

DrawableObjectAndValues.ixx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,6 @@ void StoreDrawableObject(
518518
continue; // Skip this attribute since it's identical to the shared object.
519519
}
520520

521-
522521
Attribute const& attribute = DrawableObject::attributeList[attributeId];
523522
objectNode.SetKeyValue(
524523
attribute.name,

MainWindow.ixx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ import DrawableObject;
5050
import Application;
5151

5252
#if CPP_MODULES_ARE_FIXED
53-
import DrawableObjectAndValues; // Causes internal
53+
import DrawableObjectAndValues; // Causes internal compiler error crash.
5454
#else
5555
import TextTreeParser; // for DrawableObjectAndValues
5656
#include "DrawableObjectAndValues.h"
@@ -59,10 +59,8 @@ import TextTreeParser; // for DrawableObjectAndValues
5959
#pragma comment(lib, "ComCtl32.lib")
6060

6161
module MainWindow;
62-
export
63-
{
64-
#include "MainWindow.h"
65-
}
62+
63+
#include "MainWindow.h"
6664

6765
////////////////////////////////////////
6866

0 commit comments

Comments
 (0)