layout code reorganization and renaming

s/Widget/Control/ throughout the code. Only the widget factory gets
to keep its name for now.

1 files changed, 9 insertions, 9 deletions

diff --git a/alf/alfnotebook.cpp b/alf/alfnotebook.cpp
index 494cbee..8bf6b5e 100644
--- a/alf/alfnotebook.cpp
+++ b/alf/alfnotebook.cpp
@@ -327,7 +327,7 @@ ALF_Notebook_InternalPaint(HWND hwnd, ALFNotebookPriv *priv, HDC dc, RECT *f)
 }
 
 static DWORD
-ALF_Notebook_GetWidgetFlags(HWND hwndNotebook, ALFNotebookPriv *priv, HWND widget)
+ALF_Notebook_GetControlFlags(HWND hwndNotebook, ALFNotebookPriv *priv, HWND control)
 {
     int n = ALF_Notebook_InternalTabCount(hwndNotebook, priv->hwndTabCtrl);
     for (int i = 0; i < n; ++i) {
@@ -336,7 +336,7 @@ ALF_Notebook_GetWidgetFlags(HWND hwndNotebook, ALFNotebookPriv *priv, HWND widge
         p.header.mask = TCIF_PARAM;
 
         if (TabCtrl_GetItem(priv->hwndTabCtrl, i, &p)) {
-            if (p.panel == widget) {
+            if (p.panel == control) {
                 return p.layoutFlags;
             }
         }
@@ -346,7 +346,7 @@ ALF_Notebook_GetWidgetFlags(HWND hwndNotebook, ALFNotebookPriv *priv, HWND widge
 }
 
 static BOOL
-ALF_Notebook_SetWidgetFlags(HWND hwndNotebook, ALFNotebookPriv *priv, HWND widget, DWORD flags)
+ALF_Notebook_SetControlFlags(HWND hwndNotebook, ALFNotebookPriv *priv, HWND control, DWORD flags)
 {
     int n = ALF_Notebook_InternalTabCount(hwndNotebook, priv->hwndTabCtrl);
     for (int i = 0; i < n; ++i) {
@@ -355,7 +355,7 @@ ALF_Notebook_SetWidgetFlags(HWND hwndNotebook, ALFNotebookPriv *priv, HWND widge
         p.header.mask = TCIF_PARAM;
 
         if (TabCtrl_GetItem(priv->hwndTabCtrl, i, &p)) {
-            if (p.panel == widget) {
+            if (p.panel == control) {
                 if (p.layoutFlags == flags)
                     return TRUE;
 
@@ -538,10 +538,10 @@ ALF_Notebook_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
         if ((oldFlags & ALF_NOTEBOOK_SOLID_TAB_BACKGROUND) != (priv->flags & ALF_NOTEBOOK_SOLID_TAB_BACKGROUND)) {
             ALF_Notebook_InternalHandleThemeChange(hwnd, priv);
         }
-    } else if (uMsg == ALF_WM_LYT_GETWDGTFLAGS) {
-        return (LRESULT)ALF_Notebook_GetWidgetFlags(hwnd, priv, (HWND)wParam);
-    } else if (uMsg == ALF_WM_LYT_SETWDGTFLAGS) {
-        return (LRESULT)ALF_Notebook_SetWidgetFlags(hwnd, priv, (HWND)wParam, (DWORD)lParam);
+    } else if (uMsg == ALF_WM_LYT_GETCTLFLAGS) {
+        return (LRESULT)ALF_Notebook_GetControlFlags(hwnd, priv, (HWND)wParam);
+    } else if (uMsg == ALF_WM_LYT_SETCTLFLAGS) {
+        return (LRESULT)ALF_Notebook_SetControlFlags(hwnd, priv, (HWND)wParam, (DWORD)lParam);
     } else if (uMsg == ALF_WM_DPICHANGE) {
         priv->dpi = (int)lParam;
         ALF_Notebook_PropagateDpiChange(hwnd, priv, wParam, lParam);
@@ -564,7 +564,7 @@ ALF_AddNotebook(HWND parent, WORD id, int x, int y)
                                              ALF_Notebook_WindowProc,
                                              NULL);
 
-    ALF_AddWidget(parent, x, y, hwndNtbk, 0, 0, ALF_LAYOUT_SIZE_QUERY | ALF_LAYOUT_INHERITFONT | ALF_LAYOUT_SENDDPICHANGE);
+    ALF_AddControl(parent, x, y, hwndNtbk, 0, 0, ALF_LAYOUT_SIZE_QUERY | ALF_LAYOUT_INHERITFONT | ALF_LAYOUT_SENDDPICHANGE);
 
     return hwndNtbk;
 }