Commit 936f3101 authored by Evan Stade's avatar Evan Stade Committed by Alexandre Julliard

gdiplus: Added GdipSetStringFormatHotkeyPrefix/GdipGetStringFormatHotkeyPrefix.

parent 551a606a
...@@ -389,7 +389,7 @@ ...@@ -389,7 +389,7 @@
@ stdcall GdipGetStringFormatAlign(ptr ptr) @ stdcall GdipGetStringFormatAlign(ptr ptr)
@ stub GdipGetStringFormatDigitSubstitution @ stub GdipGetStringFormatDigitSubstitution
@ stub GdipGetStringFormatFlags @ stub GdipGetStringFormatFlags
@ stub GdipGetStringFormatHotkeyPrefix @ stdcall GdipGetStringFormatHotkeyPrefix(ptr ptr)
@ stub GdipGetStringFormatLineAlign @ stub GdipGetStringFormatLineAlign
@ stub GdipGetStringFormatMeasurableCharacterRangeCount @ stub GdipGetStringFormatMeasurableCharacterRangeCount
@ stub GdipGetStringFormatTabStopCount @ stub GdipGetStringFormatTabStopCount
...@@ -588,7 +588,7 @@ ...@@ -588,7 +588,7 @@
@ stdcall GdipSetStringFormatAlign(ptr long) @ stdcall GdipSetStringFormatAlign(ptr long)
@ stub GdipSetStringFormatDigitSubstitution @ stub GdipSetStringFormatDigitSubstitution
@ stub GdipSetStringFormatFlags @ stub GdipSetStringFormatFlags
@ stub GdipSetStringFormatHotkeyPrefix @ stdcall GdipSetStringFormatHotkeyPrefix(ptr long)
@ stub GdipSetStringFormatLineAlign @ stub GdipSetStringFormatLineAlign
@ stub GdipSetStringFormatMeasurableCharacterRanges @ stub GdipSetStringFormatMeasurableCharacterRanges
@ stub GdipSetStringFormatTabStops @ stub GdipSetStringFormatTabStops
......
...@@ -180,6 +180,7 @@ struct GpStringFormat{ ...@@ -180,6 +180,7 @@ struct GpStringFormat{
LANGID lang; LANGID lang;
StringAlignment align; StringAlignment align;
StringTrimming trimming; StringTrimming trimming;
HotkeyPrefix hkprefix;
}; };
#endif #endif
...@@ -55,6 +55,17 @@ GpStatus WINGDIPAPI GdipGetStringFormatAlign(GpStringFormat *format, ...@@ -55,6 +55,17 @@ GpStatus WINGDIPAPI GdipGetStringFormatAlign(GpStringFormat *format,
return Ok; return Ok;
} }
GpStatus WINGDIPAPI GdipGetStringFormatHotkeyPrefix(GDIPCONST GpStringFormat
*format, INT *hkpx)
{
if(!format || !hkpx)
return InvalidParameter;
*hkpx = (INT)format->hkprefix;
return Ok;
}
GpStatus WINGDIPAPI GdipGetStringFormatTrimming(GpStringFormat *format, GpStatus WINGDIPAPI GdipGetStringFormatTrimming(GpStringFormat *format,
StringTrimming *trimming) StringTrimming *trimming)
{ {
...@@ -77,6 +88,17 @@ GpStatus WINGDIPAPI GdipSetStringFormatAlign(GpStringFormat *format, ...@@ -77,6 +88,17 @@ GpStatus WINGDIPAPI GdipSetStringFormatAlign(GpStringFormat *format,
return Ok; return Ok;
} }
GpStatus WINGDIPAPI GdipSetStringFormatHotkeyPrefix(GpStringFormat *format,
INT hkpx)
{
if(!format || hkpx < 0 || hkpx > 2)
return InvalidParameter;
format->hkprefix = (HotkeyPrefix) hkpx;
return Ok;
}
GpStatus WINGDIPAPI GdipSetStringFormatTrimming(GpStringFormat *format, GpStatus WINGDIPAPI GdipSetStringFormatTrimming(GpStringFormat *format,
StringTrimming trimming) StringTrimming trimming)
{ {
......
...@@ -244,6 +244,14 @@ enum StringTrimming ...@@ -244,6 +244,14 @@ enum StringTrimming
StringTrimmingEllipsisPath = 5 StringTrimmingEllipsisPath = 5
}; };
enum HotkeyPrefix
{
HotkeyPrefixNone = 0,
HotkeyPrefixShow = 1,
HotkeyPrefixHide = 2
};
#ifndef __cplusplus #ifndef __cplusplus
typedef enum Unit Unit; typedef enum Unit Unit;
...@@ -270,6 +278,7 @@ typedef enum TextRenderingHint TextRenderingHint; ...@@ -270,6 +278,7 @@ typedef enum TextRenderingHint TextRenderingHint;
typedef enum StringAlignment StringAlignment; typedef enum StringAlignment StringAlignment;
typedef enum StringTrimming StringTrimming; typedef enum StringTrimming StringTrimming;
typedef enum StringFormatFlags StringFormatFlags; typedef enum StringFormatFlags StringFormatFlags;
typedef enum HotkeyPrefix HotkeyPrefix;
#endif /* end of c typedefs */ #endif /* end of c typedefs */
......
...@@ -250,8 +250,10 @@ GpStatus WINGDIPAPI GdipGetLogFontW(GpFont*,GpGraphics*,LOGFONTW*); ...@@ -250,8 +250,10 @@ GpStatus WINGDIPAPI GdipGetLogFontW(GpFont*,GpGraphics*,LOGFONTW*);
GpStatus WINGDIPAPI GdipCreateStringFormat(INT,LANGID,GpStringFormat**); GpStatus WINGDIPAPI GdipCreateStringFormat(INT,LANGID,GpStringFormat**);
GpStatus WINGDIPAPI GdipGetStringFormatAlign(GpStringFormat*,StringAlignment*); GpStatus WINGDIPAPI GdipGetStringFormatAlign(GpStringFormat*,StringAlignment*);
GpStatus WINGDIPAPI GdipGetStringFormatHotkeyPrefix(GDIPCONST GpStringFormat*,INT*);
GpStatus WINGDIPAPI GdipGetStringFormatTrimming(GpStringFormat*,StringTrimming*); GpStatus WINGDIPAPI GdipGetStringFormatTrimming(GpStringFormat*,StringTrimming*);
GpStatus WINGDIPAPI GdipSetStringFormatAlign(GpStringFormat*,StringAlignment); GpStatus WINGDIPAPI GdipSetStringFormatAlign(GpStringFormat*,StringAlignment);
GpStatus WINGDIPAPI GdipSetStringFormatHotkeyPrefix(GpStringFormat*,INT);
GpStatus WINGDIPAPI GdipSetStringFormatTrimming(GpStringFormat*,StringTrimming); GpStatus WINGDIPAPI GdipSetStringFormatTrimming(GpStringFormat*,StringTrimming);
#ifdef __cplusplus #ifdef __cplusplus
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment