1 files changed, 7 insertions, 191 deletions
diff --git a/alf/alf.cpp b/alf/alf.cpp
index a4abca6..fbee438 100644
--- a/alf/alf.cpp
+++ b/alf/alf.cpp
@@ -12,26 +12,6 @@ ALF_UpdateFonts(HWND win)
 }
 
 void
-ALF_InvalidateLayout(HWND hwnd)
-{
-    SendMessage(hwnd, ALF_WM_INVALIDATELAYOUT, 0, 0);
-}
-
-void
-ALF_AddWidget(HWND win, int x, int y, HWND widget, int minWidth, int minHeight, DWORD flags)
-{
-    ALFAddWidgetParams params;
-    ZeroMemory(&params, sizeof(params));
-    params.hwnd = widget;
-    params.x = x;
-    params.y = y;
-    params.width = minWidth;
-    params.height = minHeight;
-    params.flags = flags;
-    SendMessage(win, ALF_WM_ADDWIDGET, 0, (LPARAM)&params);
-}
-
-void
 ALF_Initialize(void)
 {
     // acquire init lock
@@ -117,15 +97,15 @@ ALF_GetDpi(HWND window)
     return (int)SendMessage(window, ALF_WM_GETDPI, 0, 0);
 }
 
-struct ALF_WidgetHwndById_Closure {
+struct ALF_ControlHwndById_Closure {
     HWND result;
     WORD needle;
 };
 
 static BOOL CALLBACK
-ALF_WidgetHwndById_EnumChildProc(HWND hwnd, LPARAM lParam)
+ALF_ControlHwndById_EnumChildProc(HWND hwnd, LPARAM lParam)
 {
-    struct ALF_WidgetHwndById_Closure *closure = (struct ALF_WidgetHwndById_Closure*)lParam;
+    struct ALF_ControlHwndById_Closure *closure = (struct ALF_ControlHwndById_Closure*)lParam;
     if ((WORD)GetWindowLongPtr(hwnd, GWLP_ID) == closure->needle) {
         closure->result = hwnd;
         return FALSE;
@@ -134,10 +114,10 @@ ALF_WidgetHwndById_EnumChildProc(HWND hwnd, LPARAM lParam)
 }
 
 HWND
-ALF_WidgetHwndById(HWND win, WORD id)
+ALF_ControlHwndById(HWND win, WORD id)
 {
-    struct ALF_WidgetHwndById_Closure closure = { 0, id };
-    EnumChildWindows(win, ALF_WidgetHwndById_EnumChildProc, (LPARAM)&closure);
+    struct ALF_ControlHwndById_Closure closure = { 0, id };
+    EnumChildWindows(win, ALF_ControlHwndById_EnumChildProc, (LPARAM)&closure);
     return closure.result;
 }
 
@@ -147,14 +127,6 @@ ALF_SetText(HWND hwnd, const TCHAR *text)
     SendMessage(hwnd, WM_SETTEXT, 0, (LPARAM)text);
 }
 
-void
-ALF_SetWidgetText(HWND parent, WORD id, const TCHAR *text)
-{
-    HWND h = ALF_WidgetHwndById(parent, id);
-    if (h)
-        ALF_SetText(h, text);
-}
-
 TCHAR * // free with ALF_Free
 ALF_Text(HWND hwnd)
 {
@@ -171,162 +143,6 @@ ALF_Text(HWND hwnd)
     return ALF_New(TCHAR, 1);
 }
 
-TCHAR * // free with ALF_Free
-ALF_WidgetText(HWND parent, WORD id)
-{
-    HWND h = ALF_WidgetHwndById(parent, id);
-    if (h)
-        return ALF_Text(h);
-
-    return NULL;
-}
-
-DWORD
-ALF_WidgetLayoutFlags(HWND parent, HWND widget)
-{
-    return (DWORD)SendMessage(parent, ALF_WM_LYT_GETWDGTFLAGS, (WPARAM)widget, 0);
-}
-
-BOOL
-ALF_SetWidgetLayoutFlags(HWND parent, HWND widget, DWORD flags)
-{
-    return (BOOL)SendMessage(parent, ALF_WM_LYT_SETWDGTFLAGS, (WPARAM)widget, (LPARAM)flags);
-}
-
-BOOL
-ALF_WidgetLayoutPosition(HWND parent, HWND widget, int *pX, int *pY)
-{
-    POINT p = { 0, 0 };
-
-    LRESULT r = SendMessage(parent, ALF_WM_LYT_GETWIDGETPOS, (WPARAM)widget, (LPARAM)&p);
-    *pX = p.x;
-    *pY = p.y;
-    return (BOOL)r;
-}
-
-BOOL
-ALF_SetWidgetLayoutPosition(HWND parent, HWND widget, int x, int y)
-{
-    POINT p = { x, y };
-    return (BOOL)SendMessage(parent, ALF_WM_LYT_SETWIDGETPOS, (WPARAM)widget, (LPARAM)&p);
-}
-
-BOOL
-ALF_WidgetLayoutSpan(HWND parent, HWND widget, int *pXspan, int *pYspan)
-{
-    POINT p = { 0, 0 };
-
-    LRESULT r = SendMessage(parent, ALF_WM_LYT_GETWDGTSPAN, (WPARAM)widget, (LPARAM)&p);
-    *pXspan = p.x;
-    *pYspan = p.y;
-    return (BOOL)r;
-}
-
-BOOL
-ALF_SetWidgetLayoutSpan(HWND parent, HWND widget, int xspan, int yspan)
-{
-    POINT p = { xspan, yspan };
-    return (BOOL)SendMessage(parent, ALF_WM_LYT_SETWDGTSPAN, (WPARAM)widget, (LPARAM)&p);
-}
-
-
-BOOL
-ALF_WidgetLayoutMinSize(HWND parent, HWND widget, int *pWidth, int *pHeight)
-{
-    SIZE s = { 0, 0 };
-    LRESULT r = SendMessage(parent, ALF_WM_LYT_GETWIDGTSIZE, (WPARAM)widget, (LPARAM)&s);
-    *pWidth = s.cx;
-    *pHeight = s.cy;
-    return (BOOL)r;
-}
-
-BOOL
-ALF_SetWidgetLayoutMinSize(HWND parent, HWND widget, int width, int height)
-{
-    SIZE s = { width, height };
-    return (BOOL)SendMessage(parent, ALF_WM_LYT_SETWIDGTSIZE, (WPARAM)widget, (LPARAM)&s);
-}
-
-HWND
-ALF_WidgetAtLayoutPosition(HWND parent, int x, int y)
-{
-    int xy[2] = { x, y };
-
-    return (HWND)SendMessage(parent, ALF_WM_GETWIDGETATPOS, 0, (LPARAM)&xy);
-}
-
-int
-ALF_LayoutRowMinSize(HWND parent, int rowno)
-{
-    return (int)SendMessage(parent, ALF_WM_LYT_GETROWSIZE, (WPARAM)rowno, 0);
-}
-
-BOOL
-ALF_LayoutSetRowMinSize(HWND parent, int rowno, int rowsize)
-{
-    return (BOOL)SendMessage(parent, ALF_WM_LYT_SETROWSIZE, (WPARAM)rowno, (LPARAM)rowsize);
-}
-
-int
-ALF_LayoutColumnMinSize(HWND parent, int colno)
-{
-    return (int)SendMessage(parent, ALF_WM_LYT_GETCOLSIZE, (WPARAM)colno, 0);
-}
-
-BOOL
-ALF_LayoutSetColumnMinSize(HWND parent, int colno, int colsize)
-{
-    return (BOOL)SendMessage(parent, ALF_WM_LYT_SETCOLSIZE, (WPARAM)colno, (LPARAM)colsize);
-}
-
-DWORD
-ALF_LayoutRowFlags(HWND parent, int rowno)
-{
-    return (DWORD)SendMessage(parent, ALF_WM_LYT_GETROWFLAGS, (WPARAM)rowno, 0);
-}
-
-BOOL
-ALF_LayoutSetRowFlags(HWND parent, int rowno, DWORD flags)
-{
-    return (BOOL)SendMessage(parent, ALF_WM_LYT_SETROWFLAGS, (WPARAM)rowno, (LPARAM)flags);
-}
-
-DWORD
-ALF_LayoutColumnFlags(HWND parent, int colno)
-{
-    return (DWORD)SendMessage(parent, ALF_WM_LYT_GETCOLFLAGS, (WPARAM)colno, 0);
-}
-
-BOOL
-ALF_LayoutSetColumnFlags(HWND parent, int colno, DWORD flags)
-{
-    return (BOOL)SendMessage(parent, ALF_WM_LYT_SETCOLFLAGS, (WPARAM)colno, (LPARAM)flags);
-}
-
-int
-ALF_LayoutRowExpandNumerator(HWND parent, int rowno)
-{
-    return (int)SendMessage(parent, ALF_WM_LYT_GETROWEXPAND, (WPARAM)rowno, 0);
-}
-
-BOOL
-ALF_LayoutSetRowExpandNumerator(HWND parent, int rowno, int expand)
-{
-    return (BOOL)SendMessage(parent, ALF_WM_LYT_SETROWEXPAND, (WPARAM)rowno, (LPARAM)expand);
-}
-
-int
-ALF_LayoutColumnExpandNumerator(HWND parent, int colno)
-{
-    return (int)SendMessage(parent, ALF_WM_LYT_GETCOLEXPAND, (WPARAM)colno, 0);
-}
-
-BOOL
-ALF_LayoutSetColumnExpandNumerator(HWND parent, int colno, int expand)
-{
-    return (int)SendMessage(parent, ALF_WM_LYT_SETCOLEXPAND, (WPARAM)colno, (LPARAM)expand);
-}
-
 BOOL
 ALF_ShouldMessageBubble(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
 {
@@ -379,7 +195,7 @@ ALF_SetBackgroundColor(HWND win, ALFColor color)
 {
     HWND parent = GetParent(win);
     if (parent) {
-        ALF_RemoveWidgetLayoutFlag(parent, win, ALF_LAYOUT_INHERITBGCOLOR);
+        ALF_Layout_RemoveControlFlag(parent, win, ALF_LAYOUT_INHERITBGCOLOR);
     }
 
     SendMessage(win, ALF_WM_SETBGCOLOR, 0, (LPARAM)color);