From 8aa40dc9f618b202aa486ca5ff8c5e12ceaa0ffe Mon Sep 17 00:00:00 2001 From: haru-s Date: Fri, 29 Dec 2023 20:13:02 +0900 Subject: [PATCH] New alias style. --- source/dfl/application.d | 38 ++--- source/dfl/base.d | 20 +-- source/dfl/button.d | 4 +- source/dfl/collections.d | 14 +- source/dfl/control.d | 12 +- source/dfl/drawing.d | 34 ++--- source/dfl/environment.d | 12 +- source/dfl/event.d | 16 +- source/dfl/form.d | 29 ++-- source/dfl/groupbox.d | 2 +- source/dfl/imagelist.d | 12 +- source/dfl/internal/clib.d | 2 +- source/dfl/internal/d1.d | 2 +- source/dfl/internal/d2.d | 2 +- source/dfl/internal/dlib.d | 84 +++++----- source/dfl/internal/utf.d | 213 +++++++++++++------------- source/dfl/internal/winapi.d | 289 ++++++++++++++++++----------------- source/dfl/internal/wincom.d | 54 +++---- source/dfl/label.d | 6 +- source/dfl/listbox.d | 12 +- source/dfl/listview.d | 8 +- source/dfl/messagebox.d | 12 +- source/dfl/progressbar.d | 1 - source/dfl/registry.d | 14 +- source/dfl/resources.d | 8 +- source/dfl/sharedcontrol.d | 8 +- source/dfl/socket.d | 14 +- source/dfl/splitter.d | 8 +- source/dfl/statusbar.d | 2 +- source/dfl/tabcontrol.d | 6 +- source/dfl/tooltip.d | 1 - source/dfl/trackbar.d | 1 - source/dfl/treeview.d | 4 +- 33 files changed, 470 insertions(+), 474 deletions(-) diff --git a/source/dfl/application.d b/source/dfl/application.d index ab0214e..6ebb453 100644 --- a/source/dfl/application.d +++ b/source/dfl/application.d @@ -119,11 +119,11 @@ class ApplicationContext // docmain private extern(Windows) nothrow { - alias UINT function(LPCWSTR lpPathName, LPCWSTR lpPrefixString, UINT uUnique, - LPWSTR lpTempFileName) GetTempFileNameWProc; - alias DWORD function(DWORD nBufferLength, LPWSTR lpBuffer) GetTempPathWProc; - alias HANDLE function(PACTCTXW pActCtx) CreateActCtxWProc; - alias BOOL function(HANDLE hActCtx, ULONG_PTR* lpCookie) ActivateActCtxProc; + alias GetTempFileNameWProc = UINT function(LPCWSTR lpPathName, LPCWSTR lpPrefixString, UINT uUnique, + LPWSTR lpTempFileName); + alias GetTempPathWProc = DWORD function(DWORD nBufferLength, LPWSTR lpBuffer); + alias CreateActCtxWProc = HANDLE function(PACTCTXW pActCtx); + alias ActivateActCtxProc = BOOL function(HANDLE hActCtx, ULONG_PTR* lpCookie); } @@ -361,11 +361,11 @@ final class Application // docmain if(mf is filters[i]) { if(!i) - filters = filters[1 .. filters.length]; + filters = filters[1 .. $]; else if(i == filters.length - 1) filters = filters[0 .. i]; else - filters = filters[0 .. i] ~ filters[i + 1 .. filters.length]; + filters = filters[0 .. i] ~ filters[i + 1 .. $]; break; } } @@ -1020,7 +1020,7 @@ final class Application // docmain { static: /// - alias void delegate(Object c, KeyEventArgs e) Handler; + alias Handler = void delegate(Object c, KeyEventArgs e); /// @@ -1359,7 +1359,7 @@ final class Application // docmain WaitMessage(); } - package deprecated alias _waitMsg waitMsg; + package deprecated alias waitMsg = _waitMsg; /// @@ -1532,7 +1532,7 @@ final class Application // docmain } - private struct TlsFilterValue + struct TlsFilterValue { IMessageFilter[] filters; } @@ -2008,7 +2008,7 @@ extern(Windows) LRESULT dflWndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp version(CUSTOM_MSG_HOOK) { - alias CWPRETSTRUCT CustomMsg; + alias CustomMsg = CWPRETSTRUCT; // Needs to be re-entrant. @@ -2090,13 +2090,13 @@ else extern(Windows) { - alias BOOL function(LPTRACKMOUSEEVENT lpEventTrack) TrackMouseEventProc; - alias BOOL function(HWND, COLORREF, BYTE, DWORD) SetLayeredWindowAttributesProc; + alias TrackMouseEventProc = BOOL function(LPTRACKMOUSEEVENT lpEventTrack); + alias SetLayeredWindowAttributesProc = BOOL function(HWND, COLORREF, BYTE, DWORD); - alias HTHEME function(HWND) GetWindowThemeProc; - alias BOOL function(HTHEME hTheme, int iPartId, int iStateId) IsThemeBackgroundPartiallyTransparentProc; - alias HRESULT function(HWND hwnd, HDC hdc, RECT* prc) DrawThemeParentBackgroundProc; - alias void function(DWORD dwFlags) SetThemeAppPropertiesProc; + alias GetWindowThemeProc = HTHEME function(HWND); + alias IsThemeBackgroundPartiallyTransparentProc = BOOL function(HTHEME hTheme, int iPartId, int iStateId); + alias DrawThemeParentBackgroundProc = HRESULT function(HWND hwnd, HDC hdc, RECT* prc); + alias SetThemeAppPropertiesProc = void function(DWORD dwFlags); } @@ -2171,7 +2171,7 @@ enum UINT WNDCLASS_STYLE = 0x0008; extern(Windows) { - alias BOOL function(LPINITCOMMONCONTROLSEX lpInitCtrls) InitCommonControlsExProc; + alias InitCommonControlsExProc = BOOL function(LPINITCOMMONCONTROLSEX lpInitCtrls); } @@ -2182,7 +2182,7 @@ void _initCommonControls(DWORD dwControls) { pragma(msg, "DFL: extended common controls supported at compile time"); - alias InitCommonControlsEx initProc; + alias initProc = InitCommonControlsEx; } else { diff --git a/source/dfl/base.d b/source/dfl/base.d index 6184987..db4830c 100644 --- a/source/dfl/base.d +++ b/source/dfl/base.d @@ -10,7 +10,7 @@ private import dfl.internal.dlib, dfl.internal.clib; private import dfl.internal.winapi, dfl.drawing, dfl.event; -alias HWND HWindow; +alias HWindow = HWND; /// @@ -20,7 +20,7 @@ interface IWindow // docmain @property HWindow handle(); // getter } -alias IWindow IWin32Window; // deprecated +alias IWin32Window = IWindow; // deprecated /// @@ -35,7 +35,7 @@ class DflException: Exception // docmain /// -alias DThrowable DflThrowable; +alias DflThrowable = DThrowable; /// @@ -52,31 +52,31 @@ class StringObject: DObject } - override Dstring toString() + override Dstring toString() const { return value; } - override Dequ opEquals(Object o) + override Dequ opEquals(Object o) const { return value == getObjectString(o); // ? } - Dequ opEquals(StringObject s) + Dequ opEquals(StringObject s) const { return value == s.value; } - override int opCmp(Object o) + override int opCmp(Object o) const { return stringICmp(value, getObjectString(o)); // ? } - int opCmp(StringObject s) + int opCmp(StringObject s) const { return stringICmp(value, s.value); } @@ -1450,7 +1450,7 @@ class Cursor // docmain } - override Dequ opEquals(Object o) + override Dequ opEquals(Object o) const { Cursor cur = cast(Cursor)o; if(!cur) @@ -1459,7 +1459,7 @@ class Cursor // docmain } - Dequ opEquals(Cursor cur) + Dequ opEquals(Cursor cur) const { return hcur == cur.hcur; } diff --git a/source/dfl/button.d b/source/dfl/button.d index 1c1502b..b67bc2e 100644 --- a/source/dfl/button.d +++ b/source/dfl/button.d @@ -224,7 +224,7 @@ abstract class ButtonBase: ControlSuperClass // docmain } - protected override bool processMnemonic(dchar charCode) + override bool processMnemonic(dchar charCode) { if(canSelect) { @@ -388,7 +388,7 @@ class Button: ButtonBase, IButtonControl // docmain super.text = txt; } - alias Control.text text; // Overload. + alias text = Control.text; // Overload. /// diff --git a/source/dfl/collections.d b/source/dfl/collections.d index c4c236b..6182ee4 100644 --- a/source/dfl/collections.d +++ b/source/dfl/collections.d @@ -49,9 +49,9 @@ template ListWrapArray(TValue, alias Array, static assert(!is(TValue == Dstring)); static if(is(TValue == Object)) - alias StringObject TValueString; + alias TValueString = StringObject; else - alias TValue TValueString; + alias TValueString = TValue; } @@ -403,16 +403,16 @@ template ListWrapArray(TValue, alias Array, TValue oldval = Array[index]; ItemRemovingCallback(index, oldval); // Removing. if(!index) - Array = Array[1 .. Array.length]; + Array = Array[1 .. $]; else if(index == Array.length - 1) Array = Array[0 .. index]; else if(index > 0 && index < cast(int)Array.length) - Array = Array[0 .. index] ~ Array[index + 1 .. Array.length]; + Array = Array[0 .. index] ~ Array[index + 1 .. $]; ItemRemovedCallback(index, oldval); // Removed. } - deprecated alias length count; + deprecated alias count = length; /// @property size_t length() // getter @@ -421,7 +421,7 @@ template ListWrapArray(TValue, alias Array, } - deprecated alias dup clone; + deprecated alias clone = dup; /// TValue[] dup() @@ -541,7 +541,7 @@ template removeIndex(T) // package else if(index == array.length - 1) array = array[0 .. index]; else - array = array[0 .. index] ~ array[index + 1 .. array.length]; + array = array[0 .. index] ~ array[index + 1 .. $]; return array; } } diff --git a/source/dfl/control.d b/source/dfl/control.d index eab7bf1..cd3e8e1 100644 --- a/source/dfl/control.d +++ b/source/dfl/control.d @@ -840,11 +840,11 @@ class Control: DObject, IWindow // docmain package void _removeNotCreated(int i) { if(!i) - children = children[1 .. children.length]; + children = children[1 .. $]; else if(i == children.length - 1) children = children[0 .. i]; else - children = children[0 .. i] ~ children[i + 1 .. children.length]; + children = children[0 .. i] ~ children[i + 1 .. $]; } @@ -952,7 +952,7 @@ class Control: DObject, IWindow // docmain if(i < 0 || i >= length - 1) return; - children = children[0 .. i] ~ children[i + 1 .. i + 2] ~ children[i .. i + 1] ~ children[i + 2 .. children.length]; + children = children[0 .. i] ~ children[i + 1 .. i + 2] ~ children[i .. i + 1] ~ children[i + 2 .. $]; } @@ -967,7 +967,7 @@ class Control: DObject, IWindow // docmain if(i <= 0 || i >= length) return; - children = children[0 .. i - 1] ~ children[i + 1 .. i + 2] ~ children[i .. i + 1] ~ children[i + 2 .. children.length]; + children = children[0 .. i - 1] ~ children[i + 1 .. i + 2] ~ children[i .. i + 1] ~ children[i + 2 .. $]; } @@ -982,7 +982,7 @@ class Control: DObject, IWindow // docmain if(i <= 0 || i >= length) return; - children = children[i .. i + 1] ~ children[0 .. i] ~ children[i + 1 .. children.length]; + children = children[i .. i + 1] ~ children[0 .. i] ~ children[i + 1 .. $]; } @@ -997,7 +997,7 @@ class Control: DObject, IWindow // docmain if(i < 0 || i >= length - 1) return; - children = children[0 .. i] ~ children[i + 1 .. children.length] ~ children[i .. i + 1]; + children = children[0 .. i] ~ children[i + 1 .. $] ~ children[i .. i + 1]; } diff --git a/source/dfl/drawing.d b/source/dfl/drawing.d index a4030e4..2b32b97 100644 --- a/source/dfl/drawing.d +++ b/source/dfl/drawing.d @@ -68,13 +68,13 @@ struct Point // docmain version(DFL_D2_AND_ABOVE) { /// - const Dequ opEquals(ref ConstType!(Point) pt) + Dequ opEquals(ref ConstType!(Point) pt) const { return x == pt.x && y == pt.y; } /// ditto - const Dequ opEquals(Point pt) + Dequ opEquals(Point pt) const { return x == pt.x && y == pt.y; } @@ -175,13 +175,13 @@ struct Size // docmain version(DFL_D2_AND_ABOVE) { /// - const Dequ opEquals(ref ConstType!(Size) sz) + Dequ opEquals(ref ConstType!(Size) sz) const { return width == sz.width && height == sz.height; } /// ditto - const Dequ opEquals(Size sz) + Dequ opEquals(Size sz) const { return width == sz.width && height == sz.height; } @@ -189,7 +189,7 @@ struct Size // docmain else { /// - Dequ opEquals(Size sz) + Dequ opEquals(Size sz) const { return width == sz.width && height == sz.height; } @@ -334,14 +334,14 @@ struct Rect // docmain version(DFL_D2_AND_ABOVE) { /// - const Dequ opEquals(ref ConstType!(Rect) r) + Dequ opEquals(ref ConstType!(Rect) r) const { return x == r.x && y == r.y && width == r.width && height == r.height; } /// ditto - const Dequ opEquals(Rect r) + Dequ opEquals(Rect r) const { return x == r.x && y == r.y && width == r.width && height == r.height; @@ -350,7 +350,7 @@ struct Rect // docmain else { /// - Dequ opEquals(Rect r) + Dequ opEquals(Rect r) const { return x == r.x && y == r.y && width == r.width && height == r.height; @@ -600,7 +600,7 @@ struct Color // docmain } - deprecated alias blendColor blend; + deprecated alias blend = blendColor; /// Blend colors; alpha channels are ignored. @@ -1811,7 +1811,7 @@ class Picture: Image // docmain static dfl.internal.wincom.IPicture _fromFileName(Dstring fileName) { - alias dfl.internal.winapi.HANDLE HANDLE; // Otherwise, odd conflict with wine. + alias HANDLE = dfl.internal.winapi.HANDLE; // Otherwise, odd conflict with wine. HANDLE hf; HANDLE hg; @@ -2174,7 +2174,7 @@ class Screen { version(SUPPORTS_MULTIPLE_SCREENS) { - alias MonitorFromWindow fromWindow; + alias fromWindow = MonitorFromWindow; } else { @@ -2222,7 +2222,7 @@ class Screen { version(SUPPORTS_MULTIPLE_SCREENS) { - alias MonitorFromPoint fromPoint; + alias fromPoint = MonitorFromPoint; } else { @@ -2259,7 +2259,7 @@ class Screen { version(SUPPORTS_MULTIPLE_SCREENS) { - alias MonitorFromRect fromRect; + alias fromRect = MonitorFromRect; } else { @@ -2355,7 +2355,7 @@ class Screen { pragma(msg, "DFL: multiple screens supported at compile time"); - alias EnumDisplayMonitors enumScreens; + alias enumScreens = EnumDisplayMonitors; } else { @@ -2427,7 +2427,7 @@ class Screen { version(SUPPORTS_MULTIPLE_SCREENS) { - alias GetMonitorInfoA getMI; + alias getMI = GetMonitorInfoA; } else { @@ -4466,7 +4466,7 @@ class Region // docmain } - override Dequ opEquals(Object o) + override Dequ opEquals(Object o) const { Region rgn = cast(Region)o; if(!rgn) @@ -4475,7 +4475,7 @@ class Region // docmain } - Dequ opEquals(Region rgn) + Dequ opEquals(Region rgn) const { return hrgn == rgn.hrgn; } diff --git a/source/dfl/environment.d b/source/dfl/environment.d index ac8867b..6750c45 100644 --- a/source/dfl/environment.d +++ b/source/dfl/environment.d @@ -527,7 +527,7 @@ package Dstring[] parseArgs(Dstring args) if(!inQuote) //matched quotes { result.length = result.length + 1; - result[result.length - 1] = args[startIndex .. i]; + result[$ - 1] = args[startIndex .. i]; findStart = true; } else //starting quote @@ -535,7 +535,7 @@ package Dstring[] parseArgs(Dstring args) if(startIndex != i) //must be a quote stuck to another word, separate them { result.length = result.length + 1; - result[result.length - 1] = args[startIndex .. i]; + result[$ - 1] = args[startIndex .. i]; startIndex = i + 1; } else @@ -549,7 +549,7 @@ package Dstring[] parseArgs(Dstring args) if(args[i] == ' ' || args[i] == '\t') { result.length = result.length + 1; - result[result.length - 1] = args[startIndex .. i]; + result[$ - 1] = args[startIndex .. i]; findStart = true; } } @@ -558,7 +558,7 @@ package Dstring[] parseArgs(Dstring args) if(startIndex != i) { result.length = result.length + 1; - result[result.length - 1] = args[startIndex .. i]; + result[$ - 1] = args[startIndex .. i]; } return result; @@ -668,7 +668,7 @@ class Version // docmain ? /// - override Dstring toString() + override Dstring toString() const { Dstring result; @@ -734,7 +734,7 @@ final class OperatingSystem // docmain /// - override Dstring toString() + override Dstring toString() const { Dstring result; diff --git a/source/dfl/event.d b/source/dfl/event.d index 664dd05..5daaf46 100644 --- a/source/dfl/event.d +++ b/source/dfl/event.d @@ -11,7 +11,7 @@ import std.functional; // Create an event handler; old style. deprecated template Event(TArgs : EventArgs = EventArgs) { - alias Event!(Object, TArgs) Event; + alias Event = Event!(Object, TArgs); } @@ -25,7 +25,7 @@ template Event(T1, T2) // docmain /// Managing event handlers. struct Event // docmain { - alias void delegate(T1, T2) Handler; /// Event handler type. + alias Handler = void delegate(T1, T2); /// Event handler type. /// Add an event handler with the exact type. @@ -104,13 +104,13 @@ template Event(T1, T2) // docmain if(!isHot()) { - _array[iw] = _array[_array.length - 1]; - _array[_array.length - 1] = null; - _array = _array[0 .. _array.length - 1]; + _array[iw] = _array[$ - 1]; + _array[$ - 1] = null; + _array = _array[0 .. $ - 1]; } else // Hot. { - _array = _array[0 .. iw] ~ _array[iw + 1 .. _array.length]; // Force duplicate. + _array = _array[0 .. iw] ~ _array[iw + 1 .. $]; // Force duplicate. unsetHot(); } break; @@ -226,7 +226,7 @@ template Event(T1, T2) // docmain { static assert(is(typeof(toDelegate(TDG.init))), "DFL: Event handler must be a callable"); - alias ParameterTypeTuple!(TDG) TDGParams; + alias TDGParams = ParameterTypeTuple!(TDG); static assert(TDGParams.length == 2, "DFL: Event handler needs exactly 2 parameters"); static if(is(TDGParams[0] : Object)) @@ -305,7 +305,7 @@ class EventArgs // docmain // Simple event handler. -alias Event!(Object, EventArgs) EventHandler; // deprecated +alias EventHandler = Event!(Object, EventArgs); // deprecated /// diff --git a/source/dfl/form.d b/source/dfl/form.d index c848e6c..e6c9090 100644 --- a/source/dfl/form.d +++ b/source/dfl/form.d @@ -11,7 +11,6 @@ private import dfl.collections; private import dfl.internal.dlib; private import dfl.internal.utf; -//private import dfl.internal.winapi; private import core.sys.windows.windows; private import core.sys.windows.commctrl; @@ -506,7 +505,7 @@ class Form: ContainerControl, IDialogResult // docmain Application.onThreadException(e); } - alayout(this, false); // ? + alayout(this, false); // TODO: ? if(!recreatingHandle) // This stuff already happened if recreating... { @@ -689,7 +688,7 @@ class Form: ContainerControl, IDialogResult // docmain return backc; } - alias Control.backColor backColor; // Overload. + alias backColor = Control.backColor; // Overload. /// @@ -957,7 +956,7 @@ class Form: ContainerControl, IDialogResult // docmain version(NO_MDI) { - private alias Control MdiClient; // ? + private alias MdiClient = Control; // TODO: ? } /// @@ -1081,7 +1080,7 @@ class Form: ContainerControl, IDialogResult // docmain { if(isHandleCreated) { - frm.createControl(); // ? + frm.createControl(); // TODO: ? frm.mdiClient.createControl(); // Should already be done from frm.createControl(). } @@ -1538,7 +1537,7 @@ class Form: ContainerControl, IDialogResult // docmain { if(isHandleCreated) { - frm.createControl(); // ? + frm.createControl(); // TODO: ? } // Copy so that old ownedForms arrays won't get overwritten. @@ -1669,7 +1668,7 @@ class Form: ContainerControl, IDialogResult // docmain return grip; } - deprecated alias sizingGrip sizeGrip; + deprecated alias sizeGrip = sizingGrip; /// @@ -1844,8 +1843,8 @@ class Form: ContainerControl, IDialogResult // docmain if(wstyle & WS_MAXIMIZE) { ShowWindow(hwnd, SW_MAXIMIZE); - cbits |= CBits.VISIBLE; // ? - wstyle |= WS_VISIBLE; // ? + cbits |= CBits.VISIBLE; // TODO: ? + wstyle |= WS_VISIBLE; // TODO: ? onVisibleChanged(EventArgs.empty); return; } @@ -2948,7 +2947,7 @@ class Form: ContainerControl, IDialogResult // docmain { if(isMdiChild) { - // ? + // TODO: ? //msg.result = DefMDIChildProcA(msg.hWnd, msg.msg, msg.wParam, msg.lParam); msg.result = dfl.internal.utf.defMDIChildProc(msg.hWnd, msg.msg, msg.wParam, msg.lParam); return; @@ -3099,7 +3098,7 @@ class Form: ContainerControl, IDialogResult // docmain } - protected override void setBoundsCore(int x, int y, int width, int height, BoundsSpecified specified) + override void setBoundsCore(int x, int y, int width, int height, BoundsSpecified specified) { if(isHandleCreated) { @@ -3132,7 +3131,7 @@ class Form: ContainerControl, IDialogResult // docmain // Must be called before handle creation. - protected final void noMessageFilter() // package + final void noMessageFilter() // package { nofilter = true; } @@ -3190,7 +3189,7 @@ class Form: ContainerControl, IDialogResult // docmain } - private static class FormMessageFilter: IMessageFilter + static class FormMessageFilter: IMessageFilter { /// Filters out a message before it is dispatched. // Returns: true when filter the message and stop it from being dispatched; @@ -3212,7 +3211,7 @@ class Form: ContainerControl, IDialogResult // docmain HWND hwfocus = GetFocus(); // Don't need _isNonMdiChild here; mdistuff excludes MDI stuff. if(hwfocus != form._lastSel && IsChild(form.handle, hwfocus)) - form._lastSel = hwfocus; // ? + form._lastSel = hwfocus; // TODO: ? } switch(m.msg) @@ -3650,7 +3649,7 @@ version(NO_MDI) {} else return backc; } - alias Control.backColor backColor; // Overload. + alias backColor = Control.backColor; // Overload. /+ diff --git a/source/dfl/groupbox.d b/source/dfl/groupbox.d index 51dc049..ec3cd4e 100644 --- a/source/dfl/groupbox.d +++ b/source/dfl/groupbox.d @@ -46,7 +46,7 @@ class GroupBox: ControlSuperClass // docmain assert(!dyes, "Cannot drop on a group box"); } - alias Control.allowDrop allowDrop; // Overload. + alias allowDrop = Control.allowDrop; // Overload. } diff --git a/source/dfl/imagelist.d b/source/dfl/imagelist.d index d0f6d3d..f6e0f51 100644 --- a/source/dfl/imagelist.d +++ b/source/dfl/imagelist.d @@ -335,7 +335,7 @@ else return HIMAGELIST.init != _hil; } - deprecated alias isHandleCreated handleCreated; + deprecated alias handleCreated = isHandleCreated; /// @@ -471,7 +471,7 @@ else HIMAGELIST imageListCreate( int cx, int cy, UINT flags, int cInitial, int cGrow) { - alias typeof(&ImageList_Create) TProc; + alias TProc = typeof(&ImageList_Create); static TProc proc = null; if(!proc) proc = cast(typeof(proc))GetProcAddress(GetModuleHandleA("comctl32.dll"), "ImageList_Create"); @@ -481,7 +481,7 @@ else int imageListAddIcon( HIMAGELIST himl, HICON hicon) { - alias typeof(&ImageList_AddIcon) TProc; + alias TProc = typeof(&ImageList_AddIcon); static TProc proc = null; if(!proc) proc = cast(typeof(proc))GetProcAddress(GetModuleHandleA("comctl32.dll"), "ImageList_AddIcon"); @@ -491,7 +491,7 @@ else int imageListAddMasked( HIMAGELIST himl, HBITMAP hbmImage, COLORREF crMask) { - alias typeof(&ImageList_AddMasked) TProc; + alias TProc = typeof(&ImageList_AddMasked); static TProc proc = null; if(!proc) proc = cast(typeof(proc))GetProcAddress(GetModuleHandleA("comctl32.dll"), "ImageList_AddMasked"); @@ -501,7 +501,7 @@ else BOOL imageListRemove( HIMAGELIST himl, int i) { - alias typeof(&ImageList_Remove) TProc; + alias TProc = typeof(&ImageList_Remove); static TProc proc = null; if(!proc) proc = cast(typeof(proc))GetProcAddress(GetModuleHandleA("comctl32.dll"), "ImageList_Remove"); @@ -511,7 +511,7 @@ else BOOL imageListDestroy( HIMAGELIST himl) { - alias typeof(&ImageList_Destroy) TProc; + alias TProc = typeof(&ImageList_Destroy); static TProc proc = null; if(!proc) proc = cast(typeof(proc))GetProcAddress(GetModuleHandleA("comctl32.dll"), "ImageList_Destroy"); diff --git a/source/dfl/internal/clib.d b/source/dfl/internal/clib.d index f69e16c..2826ec3 100644 --- a/source/dfl/internal/clib.d +++ b/source/dfl/internal/clib.d @@ -9,4 +9,4 @@ public import core.stdc.stdlib, core.stdc.stdint, // Mostly the same as the C interface. core.stdc.stdio; -alias core.stdc.stdio.printf cprintf; +alias cprintf = core.stdc.stdio.printf; diff --git a/source/dfl/internal/d1.d b/source/dfl/internal/d1.d index 9d9e35e..d1b9373 100644 --- a/source/dfl/internal/d1.d +++ b/source/dfl/internal/d1.d @@ -8,6 +8,6 @@ module dfl.internal.d1; /// Gets the const type of a type, or the type itself if not supported. template ConstType(T) { - alias T ConstType; + alias ConstType = T; } diff --git a/source/dfl/internal/d2.d b/source/dfl/internal/d2.d index 5770413..f45355e 100644 --- a/source/dfl/internal/d2.d +++ b/source/dfl/internal/d2.d @@ -8,6 +8,6 @@ module dfl.internal.d2; /// Gets the const type of a type, or the type itself if not supported. template ConstType(T) { - alias const(T) ConstType; + alias ConstType = const(T); } diff --git a/source/dfl/internal/dlib.d b/source/dfl/internal/dlib.d index 7e0781a..9d161af 100644 --- a/source/dfl/internal/dlib.d +++ b/source/dfl/internal/dlib.d @@ -22,15 +22,15 @@ module dfl.internal.dlib; -alias typeof(""c[]) Dstring; -alias typeof(""c.ptr) Dstringz; -alias typeof(" "c[0]) Dchar; -alias typeof(""w[]) Dwstring; -alias typeof(""w.ptr) Dwstringz; -alias typeof(" "w[0]) Dwchar; -alias typeof(""d[]) Ddstring; -alias typeof(""d.ptr) Ddstringz; -alias typeof(" "d[0]) Ddchar; +alias Dstring = typeof(""c[]); +alias Dstringz = typeof(""c.ptr); +alias Dchar = typeof(" "c[0]); +alias Dwstring = typeof(""w[]); +alias Dwstringz = typeof(""w.ptr); +alias Dwchar = typeof(" "w[0]); +alias Ddstring = typeof(""d[]); +alias Ddstringz = typeof(""d.ptr); +alias Ddchar = typeof(" "d[0]); uint toI32(size_t val) @property @safe pure nothrow { @@ -134,7 +134,7 @@ version(DFL_NO_USE_CORE_MEMORY) public import std.traits; -alias ReturnType!(Object.opEquals) Dequ; // Since D2 changes mid-stream. +alias Dequ = ReturnType!(Object.opEquals); // Since D2 changes mid-stream. Dstring getObjectString(Object o) @@ -150,9 +150,9 @@ version(DFL_NO_USE_CORE_MEMORY) void gcPin(void* p) { } void gcUnpin(void* p) { } - deprecated alias std.gc.genCollect gcGenCollect; + deprecated alias gcGenCollect = std.gc.genCollect; - alias std.gc.fullCollect gcFullCollect; + alias gcFullCollect = std.gc.fullCollect; } else { @@ -181,11 +181,11 @@ else private import std.string; -alias std.string.icmp stringICmp; +alias stringICmp = std.string.icmp; version(DFL_NO_CONV_TO_TEMPLATE) { - alias std.string.toString stringFromStringz; + alias stringFromStringz = std.string.toString; } else { @@ -213,11 +213,11 @@ else } } -alias std.string.split stringSplit; +alias stringSplit = std.string.split; version(DFL_NO_CONV_TO_TEMPLATE) { - alias std.string.toString intToString; + alias intToString = std.string.toString; } else { @@ -229,37 +229,37 @@ else private import std.algorithm.searching; -alias std.algorithm.searching.find charFindInString; +alias charFindInString = std.algorithm.searching.find; -alias std.string.toStringz stringToStringz; +alias stringToStringz = std.string.toStringz; Dstring uintToHexString(uint num) { return std.string.format("%X", num); } -alias std.string.splitLines stringSplitLines; +alias stringSplitLines = std.string.splitLines; private import std.path; -alias std.path.dirName pathGetDirName; +alias pathGetDirName = std.path.dirName; version(D_Version2) - alias std.ascii.newline nativeLineSeparatorString; + alias nativeLineSeparatorString = std.ascii.newline; else - alias std.path.linesep nativeLineSeparatorString; + alias nativeLineSeparatorString = std.path.linesep; -alias std.path.buildPath pathJoin; +alias pathJoin = std.path.buildPath; -alias std.path.pathSeparator nativePathSeparatorString; +alias nativePathSeparatorString = std.path.pathSeparator; version(_DFL_NO_USE_CORE_EXCEPTION_OUTOFMEMORY_EXCEPTION) { private import std.outofmemory; - alias std.outofmemory.OutOfMemoryException OomException; + alias OomException = std.outofmemory.OutOfMemoryException; } else { @@ -290,35 +290,35 @@ else private import std.utf; -alias std.utf.decode utf8stringGetUtf32char; +alias utf8stringGetUtf32char = std.utf.decode; -alias std.utf.toUTF8 utf16stringtoUtf8string; +alias utf16stringtoUtf8string = std.utf.toUTF8; -alias std.utf.toUTF16 utf8stringtoUtf16string; +alias utf8stringtoUtf16string = std.utf.toUTF16; -alias std.utf.toUTFz!(typeof(Dwstring.init.ptr)) utf8stringToUtf16stringz; +alias utf8stringToUtf16stringz = std.utf.toUTFz!(typeof(Dwstring.init.ptr)); -alias std.utf.toUTF8 utf32stringtoUtf8string; +alias utf32stringtoUtf8string = std.utf.toUTF8; -alias std.utf.toUTF32 utf8stringtoUtf32string; +alias utf8stringtoUtf32string = std.utf.toUTF32; private import std.uni; -alias std.uni.toLower utf32charToLower; +alias utf32charToLower = std.uni.toLower; private import std.conv; version(DFL_NO_CONV_TO_TEMPLATE) { - alias std.conv.toInt stringToInt; + alias stringToInt = std.conv.toInt; } else { version(DFL_DMD2029) { - alias std.conv.to!(int, Dstring) stringToInt; // D 2.029 + alias stringToInt = std.conv.to!(int, Dstring); // D 2.029 } else { @@ -332,33 +332,33 @@ else private import std.ascii; -alias std.ascii.isHexDigit charIsHexDigit; +alias charIsHexDigit = std.ascii.isHexDigit; private import undead.stream;// dfl.internal.stream is deprecated. -alias undead.stream.Stream DStream;// dfl.internal.stream.Stream is deprecated. +alias DStream = undead.stream.Stream;// dfl.internal.stream.Stream is deprecated. -alias undead.stream.OutputStream DOutputStream;//dfl.internal.stream.OutputStream is deprecated. +alias DOutputStream = undead.stream.OutputStream;//dfl.internal.stream.OutputStream is deprecated. -alias undead.stream.StreamException DStreamException;//dfl.internal.stream.StreamException is deprecated. +alias DStreamException = undead.stream.StreamException;//dfl.internal.stream.StreamException is deprecated. -alias Object DObject; +alias DObject = Object; version(DFL_D2_AND_ABOVE) { version(DFL_CanThrowObject) { - alias Object DThrowable; + alias DThrowable = Object; } else { - alias Throwable DThrowable; + alias DThrowable = Throwable; } } else { - alias Object DThrowable; + alias DThrowable = Object; } diff --git a/source/dfl/internal/utf.d b/source/dfl/internal/utf.d index d959f6c..f27541b 100644 --- a/source/dfl/internal/utf.d +++ b/source/dfl/internal/utf.d @@ -63,19 +63,19 @@ package: version(DFL_LOAD_INTERNAL_LIBS) { - alias LoadLibraryA initInternalLib; + alias initInternalLib = LoadLibraryA; } else { version = DFL_GET_INTERNAL_LIBS; - alias GetModuleHandleA initInternalLib; + alias initInternalLib = GetModuleHandleA; } HMODULE _user32, _kernel32, _advapi32, _gdi32; -package @property HMODULE advapi32() nothrow // getter +@property HMODULE advapi32() nothrow // getter { // advapi32 generally always delay loads. if(!_advapi32) @@ -83,7 +83,7 @@ package @property HMODULE advapi32() nothrow // getter return _advapi32; } -package @property HMODULE gdi32() nothrow // getter +@property HMODULE gdi32() nothrow // getter { // gdi32 sometimes delay loads. version(DFL_GET_INTERNAL_LIBS) @@ -94,7 +94,7 @@ package @property HMODULE gdi32() nothrow // getter return _gdi32; } -package @property HMODULE user32() nothrow // getter +@property HMODULE user32() nothrow // getter { version(DFL_GET_INTERNAL_LIBS) { @@ -104,7 +104,7 @@ package @property HMODULE user32() nothrow // getter return _user32; } -package @property HMODULE kernel32() nothrow // getter +@property HMODULE kernel32() nothrow // getter { version(DFL_GET_INTERNAL_LIBS) { @@ -385,63 +385,62 @@ size_t toUnicodeLength(Dstring utf8) pure extern(Windows) { - alias HWND function(DWORD dwExStyle, LPCWSTR lpClassName, LPCWSTR lpWindowName, DWORD dwStyle, + alias CreateWindowExWProc = HWND function(DWORD dwExStyle, LPCWSTR lpClassName, LPCWSTR lpWindowName, DWORD dwStyle, int x, int y, int nWidth, int nHeight, HWND hWndParent, HMENU hMenu, HINSTANCE hInstance, - LPVOID lpParam) CreateWindowExWProc; - alias int function(HWND hWnd) GetWindowTextLengthWProc; - alias int function(HWND hWnd, LPCWSTR lpString, int nMaxCount) GetWindowTextWProc; - alias BOOL function(HWND hWnd, LPCWSTR lpString) SetWindowTextWProc; - alias LRESULT function(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) SendMessageWProc; - alias LRESULT function(WNDPROC lpPrevWndFunc, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) - CallWindowProcWProc; - alias UINT function(LPCWSTR lpszFormat) RegisterClipboardFormatWProc; - alias int function (UINT format, LPWSTR lpszFormatName, int cchMaxCount) - GetClipboardFormatNameWProc; - alias int function(HDC hdc, LPWSTR lpchText, int cchText, LPRECT lprc, UINT dwDTFormat, - LPDRAWTEXTPARAMS lpDTParams) DrawTextExWProc; - alias BOOL function(LPCWSTR lpPathName) SetCurrentDirectoryWProc; - alias DWORD function(DWORD nBufferLength, LPWSTR lpBuffer) GetCurrentDirectoryWProc; - alias BOOL function(LPWSTR lpBuffer, LPDWORD nSize) GetComputerNameWProc; - alias UINT function(LPWSTR lpBuffer, UINT uSize) GetSystemDirectoryWProc; - alias BOOL function(LPWSTR lpBuffer, LPDWORD nSize) GetUserNameWProc; - alias DWORD function(LPCWSTR lpSrc, LPWSTR lpDst, DWORD nSize) ExpandEnvironmentStringsWProc; - alias DWORD function(LPCWSTR lpName, LPWSTR lpBuffer, DWORD nSize) GetEnvironmentVariableWProc; - alias LONG function(HKEY hKey, LPCWSTR lpValueName, DWORD Reserved, DWORD dwType, BYTE* lpData, - DWORD cbData) RegSetValueExWProc; - alias LONG function(HKEY hKey, LPCWSTR lpSubKey, DWORD Reserved, LPWSTR lpClass, DWORD dwOptions, - REGSAM samDesired, LPSECURITY_ATTRIBUTES lpSecurityAttributes, PHKEY phkResult, - LPDWORD lpdwDisposition) RegCreateKeyExWProc; - alias LONG function(HKEY hKey, LPCWSTR lpSubKey, DWORD ulOptions, REGSAM samDesired, - PHKEY phkResult) RegOpenKeyExWProc; - alias LONG function(HKEY hKey, LPCWSTR lpSubKey) RegDeleteKeyWProc; - alias LONG function(HKEY hKey, DWORD dwIndex, LPWSTR lpName, LPDWORD lpcbName, LPDWORD lpReserved, - LPWSTR lpClass, LPDWORD lpcbClass, PFILETIME lpftLastWriteTime) RegEnumKeyExWProc; - alias LONG function(HKEY hKey, LPCWSTR lpValueName, LPDWORD lpReserved, LPDWORD lpType, LPBYTE lpData, - LPDWORD lpcbData) RegQueryValueExWProc; - alias LONG function(HKEY hKey, DWORD dwIndex, LPTSTR lpValueName, LPDWORD lpcbValueName, - LPDWORD lpReserved, LPDWORD lpType, LPBYTE lpData, LPDWORD lpcbData) RegEnumValueWProc; - alias ATOM function(WNDCLASSW* lpWndClass) RegisterClassWProc; - alias BOOL function(HDC hdc, LPCWSTR lpString, int cbString, LPSIZE lpSize) GetTextExtentPoint32WProc; - alias HANDLE function(HINSTANCE hinst, LPCWSTR lpszName, UINT uType, int cxDesired, int cyDesired, UINT fuLoad) - LoadImageWProc; - alias UINT function(HDROP hDrop, UINT iFile, LPWSTR lpszFile, UINT cch) DragQueryFileWProc; - alias DWORD function(HMODULE hModule, LPWSTR lpFilename, DWORD nSize) GetModuleFileNameWProc; - alias LONG function(MSG* lpmsg) DispatchMessageWProc; - alias BOOL function(LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT wMsgFilterMax, UINT wRemoveMsg) - PeekMessageWProc; - alias BOOL function(HWND hDlg, LPMSG lpMsg) IsDialogMessageWProc; - alias LRESULT function(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) DefWindowProcWProc; - alias LRESULT function(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam) DefDlgProcWProc; - alias LRESULT function(HWND hWnd, HWND hWndMDIClient, UINT uMsg, WPARAM wParam, LPARAM lParam) DefFrameProcWProc; - alias LRESULT function(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) DefMDIChildProcWProc; - alias BOOL function(HINSTANCE hInstance, LPCWSTR lpClassName, LPWNDCLASSW lpWndClass) GetClassInfoWProc; - alias HANDLE function(LPCWSTR lpPathName, BOOL bWatchSubtree, DWORD dwNotifyFilter) FindFirstChangeNotificationWProc; - alias DWORD function(LPCWSTR lpFileName, DWORD nBufferLength, LPWSTR lpBuffer, LPWSTR *lpFilePart) GetFullPathNameWProc; - alias typeof(&LoadLibraryExW) LoadLibraryExWProc; - alias typeof(&SetMenuItemInfoW) SetMenuItemInfoWProc; - alias typeof(&InsertMenuItemW) InsertMenuItemWProc; - alias typeof(&CreateFontIndirectW) CreateFontIndirectWProc; - alias typeof(&GetObjectW) GetObjectWProc; + LPVOID lpParam); + alias GetWindowTextLengthWProc = int function(HWND hWnd); + alias GetWindowTextWProc = int function(HWND hWnd, LPCWSTR lpString, int nMaxCount); + alias SetWindowTextWProc = BOOL function(HWND hWnd, LPCWSTR lpString); + alias SendMessageWProc = LRESULT function(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); + alias CallWindowProcWProc = LRESULT function(WNDPROC lpPrevWndFunc, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); + alias RegisterClipboardFormatWProc = UINT function(LPCWSTR lpszFormat); + alias GetClipboardFormatNameWProc = int function (UINT format, LPWSTR lpszFormatName, int cchMaxCount); + alias DrawTextExWProc = int function(HDC hdc, LPWSTR lpchText, int cchText, LPRECT lprc, UINT dwDTFormat, + LPDRAWTEXTPARAMS lpDTParams); + alias SetCurrentDirectoryWProc = BOOL function(LPCWSTR lpPathName); + alias GetCurrentDirectoryWProc = DWORD function(DWORD nBufferLength, LPWSTR lpBuffer); + alias GetComputerNameWProc = BOOL function(LPWSTR lpBuffer, LPDWORD nSize); + alias GetSystemDirectoryWProc = UINT function(LPWSTR lpBuffer, UINT uSize); + alias GetUserNameWProc = BOOL function(LPWSTR lpBuffer, LPDWORD nSize); + alias ExpandEnvironmentStringsWProc = DWORD function(LPCWSTR lpSrc, LPWSTR lpDst, DWORD nSize); + alias GetEnvironmentVariableWProc = DWORD function(LPCWSTR lpName, LPWSTR lpBuffer, DWORD nSize); + alias RegSetValueExWProc = LONG function(HKEY hKey, LPCWSTR lpValueName, DWORD Reserved, + DWORD dwType, BYTE* lpData, DWORD cbData); + alias RegCreateKeyExWProc = LONG function(HKEY hKey, LPCWSTR lpSubKey, DWORD Reserved, + LPWSTR lpClass, DWORD dwOptions, REGSAM samDesired, LPSECURITY_ATTRIBUTES lpSecurityAttributes, + PHKEY phkResult, LPDWORD lpdwDisposition); + alias RegOpenKeyExWProc = LONG function(HKEY hKey, LPCWSTR lpSubKey, DWORD ulOptions, REGSAM samDesired, + PHKEY phkResult); + alias RegDeleteKeyWProc = LONG function(HKEY hKey, LPCWSTR lpSubKey); + alias RegEnumKeyExWProc = LONG function(HKEY hKey, DWORD dwIndex, LPWSTR lpName, LPDWORD lpcbName, + LPDWORD lpReserved, LPWSTR lpClass, LPDWORD lpcbClass, PFILETIME lpftLastWriteTime); + alias RegQueryValueExWProc = LONG function(HKEY hKey, LPCWSTR lpValueName, LPDWORD lpReserved, + LPDWORD lpType, LPBYTE lpData, LPDWORD lpcbData); + alias RegEnumValueWProc = LONG function(HKEY hKey, DWORD dwIndex, LPTSTR lpValueName, + LPDWORD lpcbValueName, LPDWORD lpReserved, LPDWORD lpType, LPBYTE lpData, LPDWORD lpcbData); + alias RegisterClassWProc = ATOM function(WNDCLASSW* lpWndClass); + alias GetTextExtentPoint32WProc = BOOL function(HDC hdc, LPCWSTR lpString, int cbString, LPSIZE lpSize); + alias LoadImageWProc = HANDLE function(HINSTANCE hinst, LPCWSTR lpszName, UINT uType, + int cxDesired, int cyDesired, UINT fuLoad); + alias DragQueryFileWProc = UINT function(HDROP hDrop, UINT iFile, LPWSTR lpszFile, UINT cch); + alias GetModuleFileNameWProc = DWORD function(HMODULE hModule, LPWSTR lpFilename, DWORD nSize); + alias DispatchMessageWProc = LONG function(MSG* lpmsg); + alias PeekMessageWProc = BOOL function(LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT wMsgFilterMax, + UINT wRemoveMsg); + alias IsDialogMessageWProc = BOOL function(HWND hDlg, LPMSG lpMsg); + alias DefWindowProcWProc = LRESULT function(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); + alias DefDlgProcWProc = LRESULT function(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam); + alias DefFrameProcWProc = LRESULT function(HWND hWnd, HWND hWndMDIClient, UINT uMsg, WPARAM wParam, LPARAM lParam); + alias DefMDIChildProcWProc = LRESULT function(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + alias GetClassInfoWProc = BOOL function(HINSTANCE hInstance, LPCWSTR lpClassName, LPWNDCLASSW lpWndClass); + alias FindFirstChangeNotificationWProc = HANDLE function(LPCWSTR lpPathName, BOOL bWatchSubtree, DWORD dwNotifyFilter); + alias GetFullPathNameWProc = DWORD function(LPCWSTR lpFileName, DWORD nBufferLength, LPWSTR lpBuffer, + LPWSTR *lpFilePart); + alias LoadLibraryExWProc = typeof(&LoadLibraryExW); + alias SetMenuItemInfoWProc = typeof(&SetMenuItemInfoW); + alias InsertMenuItemWProc = typeof(&InsertMenuItemW); + alias CreateFontIndirectWProc = typeof(&CreateFontIndirectW); + alias GetObjectWProc = typeof(&GetObjectW); } @@ -468,7 +467,7 @@ HANDLE loadImage(HINSTANCE hinst, Dstring name, UINT uType, int cxDesired, int c { version(STATIC_UNICODE) { - alias LoadImageW proc; + alias proc = LoadImageW; } else { @@ -500,7 +499,7 @@ HWND createWindowEx(DWORD dwExStyle, Dstring className, Dstring windowName, DWOR { version(STATIC_UNICODE) { - alias CreateWindowExW proc; + alias proc = CreateWindowExW; } else { @@ -542,8 +541,8 @@ Dstring getWindowText(HWND hwnd) { version(STATIC_UNICODE) { - alias GetWindowTextW proc; - alias GetWindowTextLengthW proclen; + alias proc = GetWindowTextW; + alias proclen = GetWindowTextLengthW; } else { @@ -603,7 +602,7 @@ BOOL setWindowText(HWND hwnd, Dstring str) { version(STATIC_UNICODE) { - alias SetWindowTextW proc; + alias proc = SetWindowTextW; } else { @@ -633,7 +632,7 @@ Dstring getModuleFileName(HMODULE hmod) { version(STATIC_UNICODE) { - alias GetModuleFileNameW proc; + alias proc = GetModuleFileNameW; } else { @@ -707,7 +706,7 @@ Dstring emGetSelText(HWND hwnd, size_t selTextLength) { version(STATIC_UNICODE_SEND_MESSAGE) { - alias SendMessageW proc; + alias proc = SendMessageW; } else { @@ -743,7 +742,7 @@ Dstring getSelectedText(HWND hwnd) { version(STATIC_UNICODE_SEND_MESSAGE) { - alias SendMessageW proc; + alias proc = SendMessageW; } else { @@ -808,7 +807,7 @@ void emSetPasswordChar(HWND hwnd, dchar pwc) { version(STATIC_UNICODE_SEND_MESSAGE) { - alias SendMessageW proc; + alias proc = SendMessageW; } else { @@ -839,7 +838,7 @@ dchar emGetPasswordChar(HWND hwnd) { version(STATIC_UNICODE_SEND_MESSAGE) { - alias SendMessageW proc; + alias proc = SendMessageW; } else { @@ -871,7 +870,7 @@ LRESULT sendMessage(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { version(STATIC_UNICODE_SEND_MESSAGE) { - alias SendMessageW proc; + alias proc = SendMessageW; } else { @@ -894,7 +893,7 @@ LRESULT sendMessage(HWND hwnd, UINT msg, WPARAM wparam, Dstring lparam, bool saf { version(STATIC_UNICODE_SEND_MESSAGE) { - alias SendMessageW proc; + alias proc = SendMessageW; } else { @@ -926,7 +925,7 @@ LRESULT callWindowProc(WNDPROC lpPrevWndFunc, HWND hwnd, UINT msg, WPARAM wparam { version(STATIC_UNICODE_CALL_WINDOW_PROC) { - alias CallWindowProcW proc; + alias proc = CallWindowProcW; } else { @@ -956,7 +955,7 @@ UINT registerClipboardFormat(Dstring formatName) { version(STATIC_UNICODE) { - alias RegisterClipboardFormatW proc; + alias proc = RegisterClipboardFormatW; } else { @@ -986,7 +985,7 @@ Dstring getClipboardFormatName(UINT format) { version(STATIC_UNICODE) { - alias GetClipboardFormatNameW proc; + alias proc = GetClipboardFormatNameW; } else { @@ -1032,7 +1031,7 @@ int drawTextEx(HDC hdc, Dstring text, LPRECT lprc, UINT dwDTFormat, LPDRAWTEXTPA { version(STATIC_UNICODE) { - alias DrawTextExW proc; + alias proc = DrawTextExW; } else { @@ -1116,7 +1115,7 @@ BOOL setCurrentDirectory(Dstring pathName) { version(STATIC_UNICODE) { - alias SetCurrentDirectoryW proc; + alias proc = SetCurrentDirectoryW; } else { @@ -1149,7 +1148,7 @@ Dstring getCurrentDirectory() { version(STATIC_UNICODE) { - alias GetCurrentDirectoryW proc; + alias proc = GetCurrentDirectoryW; } else { @@ -1198,7 +1197,7 @@ Dstring getFullPathName(Dstring fileName) { version(STATIC_UNICODE) { - alias GetFullPathNameW proc; + alias proc = GetFullPathNameW; } else { @@ -1249,7 +1248,7 @@ Dstring getComputerName() { version(STATIC_UNICODE) { - alias GetComputerNameW proc; + alias proc = GetComputerNameW; } else { @@ -1289,7 +1288,7 @@ Dstring getSystemDirectory() { version(STATIC_UNICODE) { - alias GetSystemDirectoryW proc; + alias proc = GetSystemDirectoryW; } else { @@ -1331,7 +1330,7 @@ Dstring getUserName() { version(STATIC_UNICODE) { - alias GetUserNameW proc; + alias proc = GetUserNameW; } else { @@ -1370,7 +1369,7 @@ DWORD expandEnvironmentStrings(Dstring src, out Dstring result) { version(STATIC_UNICODE) { - alias ExpandEnvironmentStringsW proc; + alias proc = ExpandEnvironmentStringsW; } else { @@ -1424,7 +1423,7 @@ Dstring getEnvironmentVariable(Dstring name) { version(STATIC_UNICODE) { - alias GetEnvironmentVariableW proc; + alias proc = GetEnvironmentVariableW; } else { @@ -1478,7 +1477,7 @@ struct WndClass WNDCLASSW wcw; WNDCLASSA wca; } - alias wcw wc; + alias wc = wcw; Dstring className; } @@ -1490,7 +1489,7 @@ ATOM registerClass(ref WndClass wc) { version(STATIC_UNICODE) { - alias RegisterClassW proc; + alias proc = RegisterClassW; } else { @@ -1524,7 +1523,7 @@ BOOL getClassInfo(HINSTANCE hinst, Dstring className, ref WndClass wc) { version(STATIC_UNICODE) { - alias GetClassInfoW proc; + alias proc = GetClassInfoW; } else { @@ -1555,7 +1554,7 @@ deprecated BOOL getTextExtentPoint32(HDC hdc, Dstring text, LPSIZE lpSize) { version(STATIC_UNICODE) { - alias GetTextExtentPoint32W proc; + alias proc = GetTextExtentPoint32W; } else { @@ -1594,7 +1593,7 @@ Dstring dragQueryFile(HDROP hDrop, UINT idxFile) { version(STATIC_UNICODE) { - alias DragQueryFileW proc; + alias proc = DragQueryFileW; } else { @@ -1664,7 +1663,7 @@ LRESULT defWindowProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { version(STATIC_UNICODE_DEF_WINDOW_PROC) { - alias DefWindowProcW proc; + alias proc = DefWindowProcW; } else { @@ -1694,7 +1693,7 @@ LRESULT defDlgProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { version(STATIC_UNICODE_DEF_WINDOW_PROC) { - alias DefDlgProcW proc; + alias proc = DefDlgProcW; } else { @@ -1724,7 +1723,7 @@ LRESULT defFrameProc(HWND hwnd, HWND hwndMdiClient, UINT msg, WPARAM wparam, LPA { version(STATIC_UNICODE_DEF_WINDOW_PROC) { - alias DefFrameProcW proc; + alias proc = DefFrameProcW; } else { @@ -1754,7 +1753,7 @@ LRESULT defMDIChildProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { version(STATIC_UNICODE_DEF_WINDOW_PROC) { - alias DefMDIChildProcW proc; + alias proc = DefMDIChildProcW; } else { @@ -1788,7 +1787,7 @@ LONG dispatchMessage(MSG* pmsg) { version(STATIC_UNICODE_DISPATCH_MESSAGE) { - alias DispatchMessageW dispatchproc; + alias dispatchproc = DispatchMessageW; } else { @@ -1818,7 +1817,7 @@ BOOL peekMessage(MSG* pmsg, HWND hwnd = HWND.init, UINT wmFilterMin = 0, UINT wm { version(STATIC_UNICODE_PEEK_MESSAGE) { - alias PeekMessageW peekproc; + alias peekproc = PeekMessageW; } else { @@ -1887,7 +1886,7 @@ BOOL isDialogMessage(HWND hwnd, MSG* pmsg) { version(STATIC_UNICODE) { - alias IsDialogMessageW proc; + alias proc = IsDialogMessageW; } else { @@ -1917,7 +1916,7 @@ HANDLE findFirstChangeNotification(Dstring pathName, BOOL watchSubtree, DWORD no { version(STATIC_UNICODE) { - alias FindFirstChangeNotificationW proc; + alias proc = FindFirstChangeNotificationW; } else { @@ -1947,7 +1946,7 @@ HINSTANCE loadLibraryEx(Dstring libFileName, DWORD flags) { version(STATIC_UNICODE) { - alias LoadLibraryExW proc; + alias proc = LoadLibraryExW; } else { @@ -1977,7 +1976,7 @@ BOOL _setMenuItemInfoW(HMENU hMenu, UINT uItem, BOOL fByPosition, LPMENUITEMINFO { version(STATIC_UNICODE) { - alias SetMenuItemInfoW proc; + alias proc = SetMenuItemInfoW; } else { @@ -2007,7 +2006,7 @@ BOOL _insertMenuItemW(HMENU hMenu, UINT uItem, BOOL fByPosition, LPMENUITEMINFOW { version(STATIC_UNICODE) { - alias InsertMenuItemW proc; + alias proc = InsertMenuItemW; } else { @@ -2043,7 +2042,7 @@ Dstring regQueryValueString(HKEY hkey, Dstring valueName, LPDWORD lpType = null) { version(STATIC_UNICODE) { - alias RegQueryValueExW proc; + alias proc = RegQueryValueExW; } else { @@ -2092,7 +2091,7 @@ struct LogFont LOGFONTW lfw; LOGFONTA lfa; } - alias lfw lf; + alias lf = lfw; Dstring faceName; } @@ -2104,7 +2103,7 @@ HFONT createFontIndirect(ref LogFont lf) { version(STATIC_UNICODE) { - alias CreateFontIndirectW proc; + alias proc = CreateFontIndirectW; } else { @@ -2153,7 +2152,7 @@ int getLogFont(HFONT hf, ref LogFont lf) { version(STATIC_UNICODE) { - alias GetObjectW proc; + alias proc = GetObjectW; } else { @@ -2189,7 +2188,7 @@ Dstring shGetPathFromIDList(LPCITEMIDLIST pidl) { version(STATIC_UNICODE) { - alias SHGetPathFromIDListW proc; + alias proc = SHGetPathFromIDListW; } else { diff --git a/source/dfl/internal/winapi.d b/source/dfl/internal/winapi.d index 6d379b6..c9fd748 100644 --- a/source/dfl/internal/winapi.d +++ b/source/dfl/internal/winapi.d @@ -39,27 +39,27 @@ else extern(Windows) nothrow: - alias SIZE* LPSIZE; + alias LPSIZE = SIZE*; - alias POINTL* LPPOINTL; + alias LPPOINTL = POINTL*; - alias RECT* LPCRECT; + alias LPCRECT = RECT*; - alias WORD LANGID; + alias LANGID = WORD; - alias size_t ULONG_PTR; + alias ULONG_PTR = size_t; - alias long LONGLONG; + alias LONGLONG = long; - alias ulong DWORDLONG; + alias DWORDLONG = ulong; - alias HRESULT THEMEAPI; + alias THEMEAPI = HRESULT; enum: UINT @@ -214,7 +214,7 @@ extern(Windows) nothrow: POINT pt; LPARAM dwHitInfo; } - alias NMMOUSE* LPNMMOUSE; + alias LPNMMOUSE = NMMOUSE*; enum: UINT @@ -493,7 +493,7 @@ extern(Windows) nothrow: UINT message; HWND hwnd; } - alias CWPSTRUCT* LPCWPSTRUCT; + alias LPCWPSTRUCT = CWPSTRUCT*; struct CWPRETSTRUCT @@ -504,7 +504,7 @@ extern(Windows) nothrow: DWORD message; HWND hwnd; } - alias CWPRETSTRUCT* LPCWPRETSTRUCT; + alias LPCWPRETSTRUCT = CWPRETSTRUCT*; enum: UINT @@ -629,8 +629,7 @@ extern(Windows) nothrow: } - //alias UINT CLIPFORMAT; // TODO: ? - alias WORD CLIPFORMAT; // TODO: ? + alias CLIPFORMAT = WORD; // enum can't derive from HWND. @@ -1687,7 +1686,7 @@ extern(Windows) nothrow: enum DWORD LF_FACESIZE = 32; - alias HANDLE HIMAGELIST; + alias HIMAGELIST = HANDLE; enum: UINT @@ -1710,10 +1709,10 @@ extern(Windows) nothrow: // Rich edit. - alias DWORD function(DWORD_PTR dwCookie, LPBYTE pbBuff, LONG cb, LONG* pcb) EDITSTREAMCALLBACK; + alias EDITSTREAMCALLBACK = DWORD function(DWORD_PTR dwCookie, LPBYTE pbBuff, LONG cb, LONG* pcb); - alias DWORD LCID; + alias LCID = DWORD; struct WINDOWPOS @@ -1726,8 +1725,8 @@ extern(Windows) nothrow: int cy; UINT flags; } - alias WINDOWPOS* LPWINDOWPOS; - alias WINDOWPOS* PWINDOWPOS; + alias LPWINDOWPOS = WINDOWPOS*; + alias PWINDOWPOS = WINDOWPOS*; struct WNDCLASSW @@ -1743,7 +1742,7 @@ extern(Windows) nothrow: LPCWSTR lpszMenuName; LPCWSTR lpszClassName; } - alias WNDCLASSW* LPWNDCLASSW; + alias LPWNDCLASSW = WNDCLASSW*; struct OSVERSIONINFOA @@ -1755,7 +1754,7 @@ extern(Windows) nothrow: DWORD dwPlatformId; CHAR[128] szCSDVersion; } - alias OSVERSIONINFOA* LPOSVERSIONINFOA; + alias LPOSVERSIONINFOA = OSVERSIONINFOA*; const HWND HWND_MESSAGE = cast(HWND)-3; // Win2000/XP only. @@ -1771,7 +1770,7 @@ extern(Windows) nothrow: HICON hIcon; char[64] szTip; } - alias NOTIFYICONDATA* PNOTIFYICONDATA; + alias PNOTIFYICONDATA = NOTIFYICONDATA*; // Unaligned! @@ -1781,21 +1780,21 @@ extern(Windows) nothrow: USHORT cb; // Size including cb. BYTE[1] abID; } - alias SHITEMID* PSHITEMID; - alias SHITEMID* LPSHITEMID; - alias SHITEMID* LPCSHITEMID; + alias PSHITEMID = SHITEMID*; + alias LPSHITEMID = SHITEMID*; + alias LPCSHITEMID = SHITEMID*; struct ITEMIDLIST { SHITEMID mkid; } - alias ITEMIDLIST* PITEMIDLIST; - alias ITEMIDLIST* LPITEMIDLIST; - alias ITEMIDLIST* LPCITEMIDLIST; + alias PITEMIDLIST = ITEMIDLIST*; + alias LPITEMIDLIST = ITEMIDLIST*; + alias LPCITEMIDLIST = ITEMIDLIST*; - alias int function(HWND hwnd, UINT uMsg, LPARAM lParam, LPARAM lpData) BFFCALLBACK; + alias BFFCALLBACK = int function(HWND hwnd, UINT uMsg, LPARAM lParam, LPARAM lpData); struct BROWSEINFOA @@ -1809,8 +1808,8 @@ extern(Windows) nothrow: LPARAM lParam; int iImage; } - alias BROWSEINFOA* PBROWSEINFOA; - alias BROWSEINFOA* LPBROWSEINFOA; + alias PBROWSEINFOA = BROWSEINFOA*; + alias LPBROWSEINFOA = BROWSEINFOA*; struct BROWSEINFOW @@ -1824,8 +1823,8 @@ extern(Windows) nothrow: LPARAM lParam; int iImage; } - alias BROWSEINFOW* PBROWSEINFOW; - alias BROWSEINFOW* LPBROWSEINFOW; + alias PBROWSEINFOW = BROWSEINFOW*; + alias LPBROWSEINFOW = BROWSEINFOW*; struct LOGBRUSH @@ -1834,10 +1833,10 @@ extern(Windows) nothrow: COLORREF lbColor; LONG lbHatch; } - alias LOGBRUSH* LPLOGBRUSH; + alias LPLOGBRUSH = LOGBRUSH*; - alias DRAWTEXTPARAMS* LPDRAWTEXTPARAMS; + alias LPDRAWTEXTPARAMS = DRAWTEXTPARAMS*; struct NMHDR @@ -1846,7 +1845,7 @@ extern(Windows) nothrow: UINT_PTR idFrom; UINT code; } - alias NMHDR* LPNMHDR; + alias LPNMHDR = NMHDR*; struct NMCUSTOMDRAW @@ -1859,7 +1858,7 @@ extern(Windows) nothrow: UINT uItemState; LPARAM lItemlParam; } - alias NMCUSTOMDRAW* LPNMCUSTOMDRAW; + alias LPNMCUSTOMDRAW = NMCUSTOMDRAW*; struct NMTVCUSTOMDRAW @@ -1869,7 +1868,7 @@ extern(Windows) nothrow: COLORREF clrTextBk; int iLevel; // IE4+ } - alias NMTVCUSTOMDRAW* LPNMTVCUSTOMDRAW; + alias LPNMTVCUSTOMDRAW = NMTVCUSTOMDRAW*; struct NM_LISTVIEW @@ -1897,11 +1896,11 @@ extern(Windows) nothrow: int iImage; LPARAM lParam; } - alias LVITEMA* LPLVITEMA; - alias LVITEMA* PLVITEMA; - alias LVITEMA LV_ITEMA; - alias LVITEMA* LPLV_ITEMA; - alias LVITEMA* PLV_ITEMA; + alias LPLVITEMA = LVITEMA*; + alias PLVITEMA = LVITEMA*; + alias LV_ITEMA = LVITEMA; + alias LPLV_ITEMA = LVITEMA*; + alias PLV_ITEMA = LVITEMA*; struct LVITEMW @@ -1916,11 +1915,11 @@ extern(Windows) nothrow: int iImage; LPARAM lParam; } - alias LVITEMW* LPLVITEMW; - alias LVITEMW* PLVITEMW; - alias LVITEMW LV_ITEMW; - alias LVITEMW* LPLV_ITEMW; - alias LVITEMW* PLV_ITEMW; + alias LPLVITEMW = LVITEMW*; + alias PLVITEMW = LVITEMW*; + alias LV_ITEMW = LVITEMW; + alias LPLV_ITEMW = LVITEMW*; + alias PLV_ITEMW = LVITEMW*; struct LVDISPINFOA @@ -1928,11 +1927,11 @@ extern(Windows) nothrow: NMHDR hdr; LVITEMA item; } - alias LVDISPINFOA* LPLVDISPINFOA; - alias LVDISPINFOA* PLVDISPINFOA; - alias LVDISPINFOA LV_DISPINFOA; - alias LVDISPINFOA* LPLV_DISPINFOA; - alias LVDISPINFOA* PLV_DISPINFOA; + alias LPLVDISPINFOA = LVDISPINFOA*; + alias PLVDISPINFOA = LVDISPINFOA*; + alias LV_DISPINFOA = LVDISPINFOA; + alias LPLV_DISPINFOA = LVDISPINFOA*; + alias PLV_DISPINFOA = LVDISPINFOA*; struct LVDISPINFOW @@ -1940,11 +1939,11 @@ extern(Windows) nothrow: NMHDR hdr; LVITEMW item; } - alias LVDISPINFOW* LPLVDISPINFOW; - alias LVDISPINFOW* PLVDISPINFOW; - alias LVDISPINFOW LV_DISPINFOW; - alias LVDISPINFOW* LPLV_DISPINFOW; - alias LVDISPINFOW* PLV_DISPINFOW; + alias LPLVDISPINFOW = LVDISPINFOW*; + alias PLVDISPINFOW = LVDISPINFOW*; + alias LV_DISPINFOW = LVDISPINFOW; + alias LPLV_DISPINFOW = LVDISPINFOW*; + alias PLV_DISPINFOW = LVDISPINFOW*; struct LVCOLUMNA @@ -1956,11 +1955,11 @@ extern(Windows) nothrow: int cchTextMax; int iSubItem; } - alias LVCOLUMNA* LPLVCOLUMNA; - alias LVCOLUMNA* PLVCOLUMNA; - alias LVCOLUMNA LV_COLUMNA; - alias LVCOLUMNA* LPLV_COLUMNA; - alias LVCOLUMNA* PLV_COLUMNA; + alias LPLVCOLUMNA = LVCOLUMNA*; + alias PLVCOLUMNA = LVCOLUMNA*; + alias LV_COLUMNA = LVCOLUMNA; + alias LPLV_COLUMNA = LVCOLUMNA*; + alias PLV_COLUMNA = LVCOLUMNA*; struct LVCOLUMNW @@ -1972,11 +1971,11 @@ extern(Windows) nothrow: int cchTextMax; int iSubItem; } - alias LVCOLUMNW* LPLVCOLUMNW; - alias LVCOLUMNW* PLVCOLUMNW; - alias LVCOLUMNW LV_COLUMNW; - alias LVCOLUMNW* LPLV_COLUMNW; - alias LVCOLUMNW* PLV_COLUMNW; + alias LPLVCOLUMNW = LVCOLUMNW*; + alias PLVCOLUMNW = LVCOLUMNW*; + alias LV_COLUMNW = LVCOLUMNW; + alias LPLV_COLUMNW = LVCOLUMNW*; + alias PLV_COLUMNW = LVCOLUMNW*; struct TBBUTTON @@ -1993,7 +1992,9 @@ extern(Windows) nothrow: DWORD_PTR dwData; INT_PTR iString; } - alias TBBUTTON* PTBBUTTON, LPTBBUTTON, LPCTBBUTTON; + alias PTBBUTTON = TBBUTTON*; + alias LPTBBUTTON = TBBUTTON*; + alias LPCTBBUTTON = TBBUTTON*; struct NMTOOLBARA @@ -2005,7 +2006,7 @@ extern(Windows) nothrow: LPSTR pszText; RECT rcButton; } - alias NMTOOLBARA* LPNMTOOLBARA; + alias LPNMTOOLBARA = NMTOOLBARA*; struct NMTOOLBARW @@ -2017,7 +2018,7 @@ extern(Windows) nothrow: LPWSTR pszText; RECT rcButton; } - alias NMTOOLBARW* LPNMTOOLBARW; + alias LPNMTOOLBARW = NMTOOLBARW*; enum: BYTE @@ -2104,11 +2105,11 @@ extern(Windows) nothrow: int cChildren; LPARAM lParam; } - alias TVITEMA* LPTVITEMA; - alias TVITEMA* PTVITEMA; - alias TVITEMA TV_ITEMA; - alias TVITEMA* LPTV_ITEMA; - alias TVITEMA* PTV_ITEMA; + alias LPTVITEMA = TVITEMA*; + alias PTVITEMA = TVITEMA*; + alias TV_ITEMA = TVITEMA; + alias LPTV_ITEMA = TVITEMA*; + alias PTV_ITEMA = TVITEMA*; struct TVITEMW @@ -2124,11 +2125,11 @@ extern(Windows) nothrow: int cChildren; LPARAM lParam; } - alias TVITEMW* LPTVITEMW; - alias TVITEMW* PTVITEMW; - alias TVITEMW TV_ITEMW; - alias TVITEMW* LPTV_ITEMW; - alias TVITEMW* PTV_ITEMW; + alias LPTVITEMW = TVITEMW*; + alias PTVITEMW = TVITEMW*; + alias TV_ITEMW = TVITEMW; + alias LPTV_ITEMW = TVITEMW*; + alias PTV_ITEMW = TVITEMW*; struct TVHITTESTINFO @@ -2137,7 +2138,7 @@ extern(Windows) nothrow: UINT flags; HTREEITEM hItem; } - alias TVHITTESTINFO* LPTVHITTESTINFO; + alias LPTVHITTESTINFO = TVHITTESTINFO*; struct TVINSERTSTRUCTA @@ -2146,9 +2147,9 @@ extern(Windows) nothrow: HTREEITEM hInsertAfter; TV_ITEMA item; } - alias TVINSERTSTRUCTA* LPTVINSERTSTRUCTA; - alias TVINSERTSTRUCTA TV_INSERTSTRUCTA; - alias TVINSERTSTRUCTA* LPTV_INSERTSTRUCTA; + alias LPTVINSERTSTRUCTA = TVINSERTSTRUCTA*; + alias TV_INSERTSTRUCTA = TVINSERTSTRUCTA; + alias LPTV_INSERTSTRUCTA = TVINSERTSTRUCTA*; struct NMTREEVIEWA @@ -2159,9 +2160,9 @@ extern(Windows) nothrow: TVITEMA itemNew; POINT ptDrag; } - alias NMTREEVIEWA* LPNMTREEVIEWA; - alias NMTREEVIEWA NM_TREEVIEW; - alias NMTREEVIEWA* LPNM_TREEVIEW; + alias LPNMTREEVIEWA = NMTREEVIEWA*; + alias NM_TREEVIEW = NMTREEVIEWA; + alias LPNM_TREEVIEW = NMTREEVIEWA*; struct NMTVDISPINFOA @@ -2169,9 +2170,9 @@ extern(Windows) nothrow: NMHDR hdr; TVITEMA item; } - alias NMTVDISPINFOA* LPNMTVDISPINFOA; - alias NMTVDISPINFOA TV_DISPINFOA; - alias NMTVDISPINFOA* LPTV_DISPINFOA; + alias LPNMTVDISPINFOA = NMTVDISPINFOA*; + alias TV_DISPINFOA = NMTVDISPINFOA; + alias LPTV_DISPINFOA = NMTVDISPINFOA*; struct NMTVDISPINFOW @@ -2179,9 +2180,9 @@ extern(Windows) nothrow: NMHDR hdr; TVITEMW item; } - alias NMTVDISPINFOW* LPNMTVDISPINFOW; - alias NMTVDISPINFOW TV_DISPINFOW; - alias NMTVDISPINFOW* LPTV_DISPINFOW; + alias LPNMTVDISPINFOW = NMTVDISPINFOW*; + alias TV_DISPINFOW = NMTVDISPINFOW; + alias LPTV_DISPINFOW = NMTVDISPINFOW*; struct TCITEMA @@ -2194,9 +2195,9 @@ extern(Windows) nothrow: int iImage; LPARAM lParam; } - alias TCITEMA* LPTCITEMA; - alias TCITEMA TC_ITEMA; - alias TCITEMA* LPTC_ITEMA; + alias LPTCITEMA = TCITEMA*; + alias TC_ITEMA = TCITEMA; + alias LPTC_ITEMA = TCITEMA*; struct TCITEMW @@ -2209,9 +2210,9 @@ extern(Windows) nothrow: int iImage; LPARAM lParam; } - alias TCITEMW* LPTCITEMW; - alias TCITEMW TC_ITEMW; - alias TCITEMW* LPTC_ITEMW; + alias LPTCITEMW = TCITEMW*; + alias TC_ITEMW = TCITEMW; + alias LPTC_ITEMW = TCITEMW*; // Rich edit. @@ -2282,7 +2283,7 @@ extern(Windows) nothrow: LPWSTR lpstrText; } - alias MENUITEMINFOW* LPMENUITEMINFOW; + alias LPMENUITEMINFOW = MENUITEMINFOW*; struct SCROLLINFO @@ -2295,7 +2296,7 @@ extern(Windows) nothrow: int nPos; int nTrackPos; } - alias SCROLLINFO* LPSCROLLINFO; + alias LPSCROLLINFO = SCROLLINFO*; struct OPENFILENAMEW @@ -2321,16 +2322,16 @@ extern(Windows) nothrow: LPOFNHOOKPROC lpfnHook; LPCWSTR lpTemplateName; } - alias OPENFILENAMEW* LPOPENFILENAMEW; + alias LPOPENFILENAMEW = OPENFILENAMEW*; - alias UINT_PTR function(HWND hdlg, UINT uiMsg, WPARAM wParam, LPARAM lParam) LPCCHOOKPROC; + alias LPCCHOOKPROC = UINT_PTR function(HWND hdlg, UINT uiMsg, WPARAM wParam, LPARAM lParam); - alias UINT_PTR function(HWND hdlg, UINT uiMsg, WPARAM wParam, LPARAM lParam) LPCFHOOKPROC; + alias LPCFHOOKPROC = UINT_PTR function(HWND hdlg, UINT uiMsg, WPARAM wParam, LPARAM lParam); - alias BOOL function(HDC hdc, LPARAM lpData, int cchData) GRAYSTRINGPROC; + alias GRAYSTRINGPROC = BOOL function(HDC hdc, LPARAM lpData, int cchData); enum: DWORD @@ -2359,12 +2360,12 @@ extern(Windows) nothrow: LPCCHOOKPROC lpfnHook; LPCSTR lpTemplateName; } - alias CHOOSECOLORA* PCHOOSECOLORA; - alias CHOOSECOLORA* LPCHOOSECOLORA; + alias PCHOOSECOLORA = CHOOSECOLORA*; + alias LPCHOOSECOLORA = CHOOSECOLORA*; - alias LOGFONTW* PLOGFONTW; - alias LOGFONTW* LPLOGFONTW; + alias PLOGFONTW = LOGFONTW*; + alias LPLOGFONTW = LOGFONTW*; struct NONCLIENTMETRICSA @@ -2385,7 +2386,7 @@ extern(Windows) nothrow: LOGFONTA lfStatusFont; LOGFONTA lfMessageFont; } - alias NONCLIENTMETRICSA LPNONCLIENTMETRICSA; + alias LPNONCLIENTMETRICSA = NONCLIENTMETRICSA; struct CHOOSEFONTW @@ -2408,8 +2409,8 @@ extern(Windows) nothrow: INT nSizeMin; INT nSizeMax; } - alias CHOOSEFONTW* PCHOOSEFONTW; - alias CHOOSEFONTW* LPCHOOSEFONTW; + alias PCHOOSEFONTW = CHOOSEFONTW*; + alias LPCHOOSEFONTW = CHOOSEFONTW*; struct CHOOSEFONTA @@ -2432,12 +2433,12 @@ extern(Windows) nothrow: INT nSizeMin; INT nSizeMax; } - alias CHOOSEFONTA* PCHOOSEFONTA; - alias CHOOSEFONTA* LPCHOOSEFONTA; + alias PCHOOSEFONTA = CHOOSEFONTA*; + alias LPCHOOSEFONTA = CHOOSEFONTA*; - alias ICONINFO* LPICONINFO; - alias ICONINFO* PICONINFO; + alias LPICONINFO = ICONINFO*; + alias PICONINFO = ICONINFO*; struct MINMAXINFO @@ -2448,8 +2449,8 @@ extern(Windows) nothrow: POINT ptMinTrackSize; POINT ptMaxTrackSize; } - alias MINMAXINFO* LPMINMAXINFO; - alias MINMAXINFO* PMINMAXINFO; + alias LPMINMAXINFO = MINMAXINFO*; + alias PMINMAXINFO = MINMAXINFO*; struct NCCALCSIZE_PARAMS @@ -2457,7 +2458,7 @@ extern(Windows) nothrow: RECT[3] rgrc; PWINDOWPOS lppos; } - alias NCCALCSIZE_PARAMS* LPNCCALCSIZE_PARAMS; + alias LPNCCALCSIZE_PARAMS = NCCALCSIZE_PARAMS*; struct CREATESTRUCTA @@ -2475,10 +2476,10 @@ extern(Windows) nothrow: LPCSTR lpszClass; DWORD dwExStyle; } - alias CREATESTRUCTA* LPCREATESTRUCTA; + alias LPCREATESTRUCTA = CREATESTRUCTA*; - alias ACTCTXW* LPACTCTXW; + alias LPACTCTXW = ACTCTXW*; struct HELPINFO @@ -2490,7 +2491,7 @@ extern(Windows) nothrow: DWORD dwContextId; POINT MousePos; } - alias HELPINFO* LPHELPINFO; + alias LPHELPINFO = HELPINFO*; struct TOOLINFOA @@ -2503,8 +2504,8 @@ extern(Windows) nothrow: HINSTANCE hinst; LPSTR lpszText; } - alias TOOLINFOA* PTOOLINFOA; - alias TOOLINFOA* LPTOOLINFOA; + alias PTOOLINFOA = TOOLINFOA*; + alias LPTOOLINFOA = TOOLINFOA*; struct TRACKMOUSEEVENT @@ -2514,7 +2515,7 @@ extern(Windows) nothrow: HWND hwndTrack; DWORD dwHoverTime; } - alias TRACKMOUSEEVENT* LPTRACKMOUSEEVENT; + alias LPTRACKMOUSEEVENT = TRACKMOUSEEVENT*; struct STYLESTRUCT @@ -2522,7 +2523,7 @@ extern(Windows) nothrow: DWORD styleOld; DWORD styleNew; } - alias STYLESTRUCT* LPSTYLESTRUCT; + alias LPSTYLESTRUCT = STYLESTRUCT*; //extern(C) DWORD MAKELONG(WORD wLow, WORD wHigh) @@ -2531,9 +2532,9 @@ extern(Windows) nothrow: return cast(DWORD)cast(WORD)wLow | (cast(DWORD)cast(WORD)wHigh << 16); } - alias MAKELONG MAKELPARAM; - alias MAKELONG MAKEWPARAM; - alias MAKELONG MAKELRESULT; + alias MAKELPARAM = MAKELONG; + alias MAKEWPARAM = MAKELONG; + alias MAKELRESULT = MAKELONG; enum int DLGWINDOWEXTRA = 30; @@ -2559,7 +2560,7 @@ extern(Windows) nothrow: RECT rcItem; DWORD itemData; } - alias DRAWITEMSTRUCT* LPDRAWITEMSTRUCT; + alias LPDRAWITEMSTRUCT = DRAWITEMSTRUCT*; struct MEASUREITEMSTRUCT @@ -2571,7 +2572,7 @@ extern(Windows) nothrow: UINT itemHeight; ULONG_PTR itemData; } - alias MEASUREITEMSTRUCT* LPMEASUREITEMSTRUCT; + alias LPMEASUREITEMSTRUCT = MEASUREITEMSTRUCT*; struct ANIMATIONINFO @@ -2590,7 +2591,7 @@ extern(Windows) nothrow: RECT rc; LPARAM lParam; // message specific } - alias APPBARDATA* PAPPBARDATA; + alias PAPPBARDATA = APPBARDATA*; struct CLIENTCREATESTRUCT @@ -2598,7 +2599,7 @@ extern(Windows) nothrow: HANDLE hWindowMenu; UINT idFirstChild; } - alias CLIENTCREATESTRUCT* LPCLIENTCREATESTRUCT; + alias LPCLIENTCREATESTRUCT = CLIENTCREATESTRUCT*; struct MDICREATESTRUCTA @@ -2613,7 +2614,7 @@ extern(Windows) nothrow: DWORD style; LPARAM lParam; } - alias MDICREATESTRUCTA* LPMDICREATESTRUCTA; + alias LPMDICREATESTRUCTA = MDICREATESTRUCTA*; struct INITCOMMONCONTROLSEX @@ -2621,8 +2622,8 @@ extern(Windows) nothrow: DWORD dwSize; DWORD dwICC; } - alias INITCOMMONCONTROLSEX* LPINITCOMMONCONTROLSEX; - alias INITCOMMONCONTROLSEX* PINITCOMMONCONTROLSEX; + alias LPINITCOMMONCONTROLSEX = INITCOMMONCONTROLSEX*; + alias PINITCOMMONCONTROLSEX = INITCOMMONCONTROLSEX*; struct DROPFILES @@ -2632,14 +2633,14 @@ extern(Windows) nothrow: BOOL fNC; BOOL fWide; } - alias DROPFILES* LPDROPFILES; + alias LPDROPFILES = DROPFILES*; - alias HANDLE HHOOK; - alias HANDLE HTHEME; - alias HANDLE HTREEITEM; - alias HANDLE HDROP; - alias HANDLE HMONITOR; + alias HHOOK = HANDLE; + alias HTHEME = HANDLE; + alias HTREEITEM = HANDLE; + alias HDROP = HANDLE; + alias HMONITOR = HANDLE; HCURSOR CopyCursor(HCURSOR pcur) @@ -2648,7 +2649,7 @@ extern(Windows) nothrow: } - alias BOOL function(HMONITOR hMonitor, HDC hdcMonitor, LPRECT lprcMonitor, LPARAM dwData) MONITORENUMPROC; + alias MONITORENUMPROC = BOOL function(HMONITOR hMonitor, HDC hdcMonitor, LPRECT lprcMonitor, LPARAM dwData); struct MONITORINFO @@ -2658,7 +2659,7 @@ extern(Windows) nothrow: RECT rcWork; DWORD dwFlags; } - alias MONITORINFO* LPMONITORINFO; + alias LPMONITORINFO = MONITORINFO*; enum: DWORD diff --git a/source/dfl/internal/wincom.d b/source/dfl/internal/wincom.d index 220b516..aa55dec 100644 --- a/source/dfl/internal/wincom.d +++ b/source/dfl/internal/wincom.d @@ -16,9 +16,9 @@ version(_dfl_needcom) // Grabbed from std.c.windows.com: - alias WCHAR OLECHAR; - alias OLECHAR *LPOLESTR; - alias OLECHAR *LPCOLESTR; + alias OLECHAR = WCHAR; + alias LPOLESTR = OLECHAR*; + alias LPCOLESTR = OLECHAR*; enum { @@ -67,8 +67,8 @@ version(_dfl_needcom) CLSCTX_SERVER = (CLSCTX_INPROC_SERVER|CLSCTX_LOCAL_SERVER), } - alias GUID IID; - alias GUID CLSID; + alias IID = GUID; + alias CLSID = GUID; extern (C) { @@ -281,14 +281,14 @@ extern(C) } else { - alias IID_IUnknown _IID_IUnknown; - alias IID_IDataObject _IID_IDataObject; - alias IID_IPicture _IID_IPicture; - alias IID_ISequentialStream _IID_ISequentialStream; - alias IID_IStream _IID_IStream; - alias IID_IDropTarget _IID_IDropTarget; - alias IID_IDropSource _IID_IDropSource; - alias IID_IEnumFORMATETC _IID_IEnumFORMATETC; + alias _IID_IUnknown = IID_IUnknown; + alias _IID_IDataObject = IID_IDataObject; + alias _IID_IPicture = IID_IPicture; + alias _IID_ISequentialStream = IID_ISequentialStream; + alias _IID_IStream = IID_IStream; + alias _IID_IDropTarget = IID_IDropTarget; + alias _IID_IDropSource = IID_IDropSource; + alias _IID_IEnumFORMATETC = IID_IEnumFORMATETC; } } @@ -310,7 +310,7 @@ enum: DWORD STREAM_SEEK_CUR = 1, STREAM_SEEK_END = 2, } -alias DWORD STREAM_SEEK; +alias STREAM_SEEK = DWORD; // TODO: implement the enum`s used here. @@ -343,18 +343,18 @@ interface IStream: ISequentialStream HRESULT Stat(STATSTG* pstatstg, DWORD grfStatFlag); HRESULT Clone(IStream* ppstm); } -alias IStream* LPSTREAM; +alias LPSTREAM = IStream*; -alias UINT OLE_HANDLE; +alias OLE_HANDLE = UINT; -alias LONG OLE_XPOS_HIMETRIC; +alias OLE_XPOS_HIMETRIC = LONG; -alias LONG OLE_YPOS_HIMETRIC; +alias OLE_YPOS_HIMETRIC = LONG; -alias LONG OLE_XSIZE_HIMETRIC; +alias OLE_XSIZE_HIMETRIC = LONG; -alias LONG OLE_YSIZE_HIMETRIC; +alias OLE_YSIZE_HIMETRIC = LONG; interface IPicture: IUnknown @@ -395,7 +395,7 @@ struct FORMATETC LONG lindex; DWORD tymed; } -alias FORMATETC* LPFORMATETC; +alias LPFORMATETC = FORMATETC*; struct STATDATA @@ -422,7 +422,7 @@ struct STGMEDIUM } IUnknown pUnkForRelease; } -alias STGMEDIUM* LPSTGMEDIUM; +alias LPSTGMEDIUM = STGMEDIUM*; interface IDataObject: IUnknown @@ -495,8 +495,8 @@ interface IMalloc: IUnknown void HeapMinimize(); } // Since an interface is a pointer.. -alias IMalloc PMALLOC; -alias IMalloc LPMALLOC; +alias PMALLOC = IMalloc; +alias LPMALLOC = IMalloc; LONG MAP_LOGHIM_TO_PIX(LONG x, LONG logpixels) @@ -512,7 +512,7 @@ enum: DWORD DVASPECT_ICON = 4, DVASPECT_DOCPRINT = 8, } -alias DWORD DVASPECT; +alias DVASPECT = DWORD; enum: DWORD @@ -526,7 +526,7 @@ enum: DWORD TYMED_ENHMF = 64, TYMED_NULL = 0 } -alias DWORD TYMED; +alias TYMED = DWORD; enum @@ -536,7 +536,7 @@ enum } -alias HRESULT WINOLEAPI; +alias WINOLEAPI = HRESULT; WINOLEAPI OleInitialize(LPVOID pvReserved); diff --git a/source/dfl/label.d b/source/dfl/label.d index bc1b560..5cbd3e7 100644 --- a/source/dfl/label.d +++ b/source/dfl/label.d @@ -114,7 +114,7 @@ class Label: Control // docmain invalidate(false); } - alias Control.text text; // Overload. + alias text = Control.text; // Overload. /// @@ -379,13 +379,13 @@ class Label: Control // docmain bool autosz = false; - final @property void tfmt(TextFormat tf) // setter + @property void tfmt(TextFormat tf) // setter { _tfmt = tf; } - final @property TextFormat tfmt() // getter + @property TextFormat tfmt() // getter { /+ // This causes it to invert. diff --git a/source/dfl/listbox.d b/source/dfl/listbox.d index ff1edaa..e6f2530 100644 --- a/source/dfl/listbox.d +++ b/source/dfl/listbox.d @@ -19,7 +19,7 @@ private extern(C) void* memmove(void*, void*, size_t len); private extern(Windows) void _initListbox(); -alias StringObject ListString; +alias ListString = StringObject; /// @@ -64,7 +64,7 @@ abstract class ListControl: ControlSuperClass // docmain return backc; } - alias Control.backColor backColor; // Overload. + alias backColor = Control.backColor; // Overload. static @property Color defaultForeColor() //getter @@ -80,7 +80,7 @@ abstract class ListControl: ControlSuperClass // docmain return forec; } - alias Control.foreColor foreColor; // Overload. + alias foreColor = Control.foreColor; // Overload. this() @@ -122,7 +122,7 @@ class ListBox: ListControl // docmain /// static class SelectedIndexCollection { - deprecated alias length count; + deprecated alias count = length; @property int length() // getter { @@ -218,7 +218,7 @@ class ListBox: ListControl // docmain /// static class SelectedObjectCollection { - deprecated alias length count; + deprecated alias count = length; @property int length() // getter { @@ -360,7 +360,7 @@ class ListBox: ListControl // docmain // Had to do it this way because: DMD 1.028: -H is broken for mixin identifiers // Note that this way probably prevents opApply from being overridden. - alias _opApply opApply; + alias opApply = _opApply; protected this(ListBox lb) diff --git a/source/dfl/listview.d b/source/dfl/listview.d index c86e77b..f463c4a 100644 --- a/source/dfl/listview.d +++ b/source/dfl/listview.d @@ -976,7 +976,7 @@ class ListView: ControlSuperClass // docmain /// static class SelectedIndexCollection { - deprecated alias length count; + deprecated alias count = length; @property int length() // getter { @@ -1059,12 +1059,12 @@ class ListView: ControlSuperClass // docmain } - deprecated alias SelectedItemCollection SelectedListViewItemCollection; + deprecated alias SelectedListViewItemCollection = SelectedItemCollection; /// static class SelectedItemCollection { - deprecated alias length count; + deprecated alias count = length; @property int length() // getter { @@ -1150,7 +1150,7 @@ class ListView: ControlSuperClass // docmain /// static class CheckedIndexCollection { - deprecated alias length count; + deprecated alias count = length; @property int length() // getter { diff --git a/source/dfl/messagebox.d b/source/dfl/messagebox.d index 68da0b7..fb2b0ba 100644 --- a/source/dfl/messagebox.d +++ b/source/dfl/messagebox.d @@ -145,14 +145,14 @@ deprecated final class MessageBox static: - deprecated alias msgBox show; + deprecated alias show = msgBox; } -deprecated alias msgBox messageBox; +deprecated alias messageBox = msgBox; -deprecated alias MsgBoxOptions MessageBoxOptions; -deprecated alias MsgBoxDefaultButton MessageBoxDefaultButton; -deprecated alias MsgBoxButtons MessageBoxButtons; -deprecated alias MsgBoxIcon MessageBoxIcon; +deprecated alias MessageBoxOptions = MsgBoxOptions; +deprecated alias MessageBoxDefaultButton = MsgBoxDefaultButton; +deprecated alias MessageBoxButtons = MsgBoxButtons; +deprecated alias MessageBoxIcon = MsgBoxIcon; diff --git a/source/dfl/progressbar.d b/source/dfl/progressbar.d index 54ff82a..6d8d02a 100644 --- a/source/dfl/progressbar.d +++ b/source/dfl/progressbar.d @@ -13,7 +13,6 @@ private import dfl.event; static private import dfl.internal.utf; -// private import dfl.internal.winapi; // Don't use private import core.sys.windows.windows; private import core.sys.windows.commctrl; diff --git a/source/dfl/registry.d b/source/dfl/registry.d index 1d2c94a..3a9578b 100644 --- a/source/dfl/registry.d +++ b/source/dfl/registry.d @@ -253,7 +253,7 @@ class RegistryValueMultiSz: RegistryValue result ~= str ~ "\r\n"; } if(result.length) - result = result[0 .. result.length - 2]; // Exclude last \r\n. + result = result[0 .. $ - 2]; // Exclude last \r\n. return result; } @@ -404,7 +404,7 @@ class RegistryValueDword: RegistryValue } /// ditto -alias RegistryValueDword RegistryValueDwordLittleEndian; +alias RegistryValueDwordLittleEndian = RegistryValueDword; /// ditto class RegistryValueDwordBigEndian: RegistryValue @@ -962,8 +962,8 @@ class RegistryKey // docmain case REG_SZ: with(new RegistryValueSz) { - assert(!data[data.length - 1]); - value = cast(Dstring)data[0 .. data.length - 1]; + assert(!data[$ - 1]); + value = cast(Dstring)data[0 .. $ - 1]; defaultValue = _reg; } break; @@ -980,8 +980,8 @@ class RegistryKey // docmain case REG_EXPAND_SZ: with(new RegistryValueExpandSz) { - assert(!data[data.length - 1]); - value = cast(Dstring)data[0 .. data.length - 1]; + assert(!data[$ - 1]); + value = cast(Dstring)data[0 .. $ - 1]; defaultValue = _reg; } break; @@ -996,7 +996,7 @@ class RegistryKey // docmain if(s.length) { value ~= s; - data = data[s.length + 1 .. data.length]; + data = data[s.length + 1 .. $]; goto next_sz; } diff --git a/source/dfl/resources.d b/source/dfl/resources.d index c1262a0..1442d66 100644 --- a/source/dfl/resources.d +++ b/source/dfl/resources.d @@ -137,7 +137,7 @@ else return new Icon(hi, true); // Owned. } - deprecated alias getIcon loadIcon; + deprecated alias loadIcon = getIcon; /// @@ -167,7 +167,7 @@ else return new Bitmap(h, true); // Owned. } - deprecated alias getBitmap loadBitmap; + deprecated alias loadBitmap = getBitmap; /// @@ -197,7 +197,7 @@ else return new Cursor(h, true); // Owned. } - deprecated alias getCursor loadCursor; + deprecated alias loadCursor = getCursor; /// @@ -223,7 +223,7 @@ else return result; } - deprecated alias getString loadString; + deprecated alias loadString = getString; // Used internally diff --git a/source/dfl/sharedcontrol.d b/source/dfl/sharedcontrol.d index d5a5819..b3e9983 100644 --- a/source/dfl/sharedcontrol.d +++ b/source/dfl/sharedcontrol.d @@ -27,8 +27,8 @@ private: void function(Control, ARGS) fn; ARGS args; } - alias dfl.internal.clib.malloc malloc; - alias dfl.internal.clib.free free; + alias malloc = dfl.internal.clib.malloc; + alias free = dfl.internal.clib.free; auto param = cast(InvokeParam*)malloc(InvokeParam.sizeof); param.fn = fn; @@ -61,8 +61,8 @@ private: LPARAM makeParamNoneArgs(void function(Control) fn) { static assert((DflInvokeParam*).sizeof <= LPARAM.sizeof); - alias dfl.internal.clib.malloc malloc; - alias dfl.internal.clib.free free; + alias malloc = dfl.internal.clib.malloc; + alias free = dfl.internal.clib.free; auto p = cast(DflInvokeParam*)malloc(DflInvokeParam.sizeof); diff --git a/source/dfl/socket.d b/source/dfl/socket.d index 9e6f3b4..f04aaca 100644 --- a/source/dfl/socket.d +++ b/source/dfl/socket.d @@ -25,8 +25,8 @@ private private import std.socket, core.bitop; private import core.sys.windows.winsock2; - alias InternetHost DInternetHost; - alias InternetAddress DInternetAddress; + alias DInternetHost = InternetHost; + alias DInternetAddress = InternetAddress; socket_t getSocketHandle(Socket sock) nothrow @nogc { @@ -34,7 +34,7 @@ private } } -alias std.socket.Socket DflSocket; /// +alias DflSocket = std.socket.Socket; /// private import dfl.internal.winapi, dfl.application, dfl.base, dfl.internal.utf; @@ -79,7 +79,7 @@ enum EventType /// // -err- will be 0 if no error. // -type- will always contain only one flag. -alias void delegate(DflSocket sock, EventType type, int err) RegisterEventCallback; +alias RegisterEventCallback = void delegate(DflSocket sock, EventType type, int err); // Calling this twice on the same socket cancels out previously @@ -318,7 +318,7 @@ private class _InternetHost: DInternetHost /// // If -err- is nonzero, it is a winsock error code and -inetHost- is null. -alias void delegate(DInternetHost inetHost, int err) GetHostCallback; +alias GetHostCallback = void delegate(DInternetHost inetHost, int err); /// @@ -616,8 +616,8 @@ class SocketQueue // docmain deprecated { - alias receiveBytes recvBytes; - alias receive recv; + alias recvBytes = receiveBytes; + alias recv = receive; } diff --git a/source/dfl/splitter.d b/source/dfl/splitter.d index a9822c7..2b6e383 100644 --- a/source/dfl/splitter.d +++ b/source/dfl/splitter.d @@ -113,7 +113,7 @@ class Splitter: Control // docmain super.dock(ds); } - alias Control.dock dock; // Overload. + alias dock = Control.dock; // Overload. package void initsplit(int sx, int sy) @@ -179,9 +179,9 @@ class Splitter: Control // docmain return mgrip; } - deprecated alias movingGrip moveingGrip; - deprecated alias movingGrip moveGrip; - deprecated alias movingGrip sizingGrip; + deprecated alias moveingGrip = movingGrip; + deprecated alias moveGrip = movingGrip; + deprecated alias sizingGrip = movingGrip; protected override void onPaint(PaintEventArgs ea) diff --git a/source/dfl/statusbar.d b/source/dfl/statusbar.d index 5cd415f..12e9b89 100644 --- a/source/dfl/statusbar.d +++ b/source/dfl/statusbar.d @@ -435,7 +435,7 @@ class StatusBar: ControlSuperClass // docmain } } - alias Control.dock dock; // Overload. + alias dock = Control.dock; // Overload. /// diff --git a/source/dfl/tabcontrol.d b/source/dfl/tabcontrol.d index 87a542a..f81acdf 100644 --- a/source/dfl/tabcontrol.d +++ b/source/dfl/tabcontrol.d @@ -53,7 +53,7 @@ class TabPage: Panel } - alias Control.opEquals opEquals; + alias opEquals = Control.opEquals; override Dequ opEquals(Object o) @@ -68,7 +68,7 @@ class TabPage: Panel } - alias Control.opCmp opCmp; + alias opCmp = Control.opCmp; override int opCmp(Object o) @@ -102,7 +102,7 @@ class TabPage: Panel } } - alias Panel.text text; // Overload with Panel.text. + alias text = Panel.text; // Overload with Panel.text. /+ diff --git a/source/dfl/tooltip.d b/source/dfl/tooltip.d index 2ebadd3..9a69ec0 100644 --- a/source/dfl/tooltip.d +++ b/source/dfl/tooltip.d @@ -14,7 +14,6 @@ private import dfl.internal.dlib; private import dfl.internal.clib; private import dfl.internal.utf; -// private import dfl.internal.winapi; // Don't use private import core.sys.windows.windows; private import core.sys.windows.commctrl; diff --git a/source/dfl/trackbar.d b/source/dfl/trackbar.d index 21beb3d..efc5768 100644 --- a/source/dfl/trackbar.d +++ b/source/dfl/trackbar.d @@ -17,7 +17,6 @@ private import dfl.event; private import dfl.drawing; private static import dfl.internal.utf; -//private import dfl.internal.winapi; // Do not use private import core.sys.windows.commctrl; private import core.sys.windows.windef; private import core.sys.windows.winuser; diff --git a/source/dfl/treeview.d b/source/dfl/treeview.d index 151dc1a..5bc779d 100644 --- a/source/dfl/treeview.d +++ b/source/dfl/treeview.d @@ -1072,7 +1072,7 @@ class TreeView: ControlSuperClass // docmain return forec; } - alias Control.foreColor foreColor; // Overload. + alias foreColor = Control.foreColor; // Overload. final @property void borderStyle(BorderStyle bs) // setter @@ -1166,7 +1166,7 @@ class TreeView: ControlSuperClass // docmain } - deprecated alias hoverSelection hotTracking; + deprecated alias hotTracking = hoverSelection; /// final @property void hoverSelection(bool byes) // setter