1 files changed, 13 insertions, 13 deletions

diff --git a/alf/alfgroupbox.cpp b/alf/alfgroupbox.cpp
index 3aed7d1..0b60d81 100644
--- a/alf/alfgroupbox.cpp
+++ b/alf/alfgroupbox.cpp
@@ -14,11 +14,11 @@ typedef struct {
 
 static void ALF_GroupBox_BeginCalcSizes(ALFLayout *layout, HWND hwnd);
 
-static void ALF_GroupBox_HandleContainerWidgetSize(ALFLayout *layout, HWND groupbox, HWND child, SIZE *s);
+static void ALF_GroupBox_HandleContainerControlSize(ALFLayout *layout, HWND groupbox, HWND child, SIZE *s);
 
 static void ALF_GroupBox_EndCalcSizes(ALFLayout *layout, HWND hwnd, SIZE *containerMinSize);
 
-static void ALF_GroupBox_PreContainerWidgetApplyPos(ALFLayout *layout, HWND groupbox, HWND child, RECT *r);
+static void ALF_GroupBox_PreContainerControlApplyPos(ALFLayout *layout, HWND groupbox, HWND child, RECT *r);
 
 static void ALF_GroupBox_HandleThemeChange(ALFGroupBoxPriv *priv, HWND hwnd);
 
@@ -27,9 +27,9 @@ ALF_GroupBox_IntializePriv(ALFGroupBoxPriv *priv, HWND window, const TCHAR *text
 {
     ALF_Layout_Init(&priv->layout);
     priv->layout.beginCalcSizes = ALF_GroupBox_BeginCalcSizes;
-    priv->layout.handleContainerWidgetSize = ALF_GroupBox_HandleContainerWidgetSize;
+    priv->layout.handleContainerControlSize = ALF_GroupBox_HandleContainerControlSize;
     priv->layout.endCalcSizes = ALF_GroupBox_EndCalcSizes;
-    priv->layout.preApplyLayoutToContainerWidget = ALF_GroupBox_PreContainerWidgetApplyPos;
+    priv->layout.preApplyLayoutToContainerControl = ALF_GroupBox_PreContainerControlApplyPos;
 
     priv->label = ALF_AddLabel(window, (WORD)-1, -1, -1, text);
     ALF_Label_SetStyle(priv->label, ALF_LABEL_ALIGN_LEFT | ALF_LABEL_ALIGN_TOP);
@@ -155,7 +155,7 @@ ALF_GroupBox_BeginCalcSizes(ALFLayout *layout, HWND hwnd)
 }
 
 static void
-ALF_GroupBox_HandleContainerWidgetSize(ALFLayout *layout, HWND groupbox, HWND child, SIZE *s)
+ALF_GroupBox_HandleContainerControlSize(ALFLayout *layout, HWND groupbox, HWND child, SIZE *s)
 {
     ALFGroupBoxPriv *priv = (ALFGroupBoxPriv *)layout;
     (void)groupbox;
@@ -180,7 +180,7 @@ static void ALF_GroupBox_EndCalcSizes(ALFLayout *layout, HWND hwnd, SIZE *contai
     containerMinSize->cy = priv->layout.containerMargins.top + priv->layout.containerMargins.bottom;
 }
 
-static void ALF_GroupBox_PreContainerWidgetApplyPos(ALFLayout *layout, HWND groupbox, HWND child, RECT *r)
+static void ALF_GroupBox_PreContainerControlApplyPos(ALFLayout *layout, HWND groupbox, HWND child, RECT *r)
 {
     ALFGroupBoxPriv *priv = (ALFGroupBoxPriv *)layout;
 
@@ -288,23 +288,23 @@ ALF_GroupBox_WindowProc(HWND window, UINT msg, WPARAM wparam, LPARAM lparam)
         RECT c;
         GetClientRect(window, &c);
 
-        if (c.right > priv->layout.allocatedWidgetRect.right + priv->layout.containerMargins.right) {
+        if (c.right > priv->layout.allocatedControlRect.right + priv->layout.containerMargins.right) {
             // enlarged to the right -> invalidate place occupied by old border
-            RECT i = { priv->layout.allocatedWidgetRect.right,
+            RECT i = { priv->layout.allocatedControlRect.right,
                         0,
                         c.right,
                         c.bottom };
             InvalidateRect(window, &i, TRUE);
         }
-        if (c.bottom > priv->layout.allocatedWidgetRect.bottom + priv->layout.containerMargins.bottom) {
+        if (c.bottom > priv->layout.allocatedControlRect.bottom + priv->layout.containerMargins.bottom) {
             // enlarged to the bottom -> invalidate place occupied by old border
             RECT i = { 0,
-                        priv->layout.allocatedWidgetRect.bottom,
+                        priv->layout.allocatedControlRect.bottom,
                         c.right,
                         c.bottom };
             InvalidateRect(window, &i, TRUE);
         }
-        if (c.right < priv->layout.allocatedWidgetRect.right + priv->layout.containerMargins.right) {
+        if (c.right < priv->layout.allocatedControlRect.right + priv->layout.containerMargins.right) {
             // shrunk horizontally -> invalidate place now occupied by new border
             RECT i = { c.right - priv->layout.containerMargins.right,
                         0,
@@ -312,7 +312,7 @@ ALF_GroupBox_WindowProc(HWND window, UINT msg, WPARAM wparam, LPARAM lparam)
                         c.bottom };
             InvalidateRect(window, &i, TRUE);
         }
-        if (c.bottom < priv->layout.allocatedWidgetRect.bottom + priv->layout.containerMargins.bottom) {
+        if (c.bottom < priv->layout.allocatedControlRect.bottom + priv->layout.containerMargins.bottom) {
             // shrunk vertically -> invalidate place now ocuupied by new border
             RECT i = { 0,
                         c.bottom - priv->layout.containerMargins.bottom,
@@ -356,7 +356,7 @@ ALF_AddGroupBox(HWND parent, WORD id, int x, int y, const TCHAR *text)
                                              ALF_GroupBox_WindowProc,
                                              NULL);
 
-    ALF_AddWidget(parent, x, y, hwndPanel, 0, 0, ALF_LAYOUT_SIZE_QUERY | ALF_LAYOUT_INHERITFONT | ALF_LAYOUT_INHERITBGCOLOR | ALF_LAYOUT_SENDBGCHANGE | ALF_LAYOUT_SENDDPICHANGE);
+    ALF_AddControl(parent, x, y, hwndPanel, 0, 0, ALF_LAYOUT_SIZE_QUERY | ALF_LAYOUT_INHERITFONT | ALF_LAYOUT_INHERITBGCOLOR | ALF_LAYOUT_SENDBGCHANGE | ALF_LAYOUT_SENDDPICHANGE);
 
     return hwndPanel;
 }