1 files changed, 5 insertions, 31 deletions

diff --git a/alf/alf.cpp b/alf/alf.cpp
index f36dda3..0d50f4a 100644
--- a/alf/alf.cpp
+++ b/alf/alf.cpp
@@ -122,19 +122,6 @@ ALF_DefWindowProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
 {
     ALFWindowPriv *priv = (ALFWindowPriv*)GetWindowLongPtr(hwnd, 0);
 
-    if (msg == ALF_WM_QUERYSIZE) {
-        ALF_Layout_CalcSizes(&priv->layout, hwnd);
-        SIZE *ps = (SIZE*)lparam;
-        ps->cx = priv->layout.totalMinWidth;
-        ps->cy = priv->layout.totalMinHeight;
-        return 0;
-    }
-
-    if (msg == ALF_WM_APPLYLAYOUT) {
-        ALF_Layout_Apply(&priv->layout, hwnd);
-        return 0;
-    }
-
     if (msg == ALF_WM_GETMODALRESULT) {
         return (LRESULT)priv->modalResult;
     }
@@ -147,23 +134,6 @@ ALF_DefWindowProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
         return (LRESULT)ALF_CentipointsToPxPriv(priv, (int)wparam);
     }
 
-    if (msg == ALF_WM_ADDWIDGET) {
-        ALF_Layout_AddWidget(&priv->layout, hwnd, (ALFWidgetLayoutParams *)lparam);
-        return 0;
-    }
-
-    if (msg == ALF_WM_GETLAYOUTPARAMS) {
-        return (LRESULT)ALF_Layout_GetWidgetParams(&priv->layout, (ALFWidgetLayoutParams *)lparam, (HWND)wparam);
-    }
-
-    if (msg == ALF_WM_SETLAYOUTPARAMS) {
-        return (LRESULT)ALF_Layout_SetWidgetParams(&priv->layout, (const ALFWidgetLayoutParams *)lparam, (HWND)wparam);
-    }
-
-    if (msg == ALF_WM_GETWIDGETATPOS) {
-        return (LRESULT)ALF_Layout_WidgetAtPos(&priv->layout, ((UINT*)lparam)[0], ((UINT*)lparam)[1]);
-    }
-
     if (msg == ALF_WM_SETFOCUS) {
         priv->hwndFocus = (HWND)lparam;
         ALF_ApplyFocus(hwnd, priv, FALSE);
@@ -224,7 +194,6 @@ ALF_DefWindowProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
 
     if (msg == WM_SIZE) {
         ALF_Layout_Apply(&priv->layout, hwnd);
-        return 0;
     }
 
     if (msg == WM_GETMINMAXINFO) {
@@ -313,6 +282,11 @@ ALF_DefWindowProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
         return TRUE;
     }
 
+    LRESULT ret = 0;
+    if (ALF_Layout_HandleMessage(&priv->layout, hwnd, msg, wparam, lparam, &ret)) {
+        return ret;
+    }
+
     return DefWindowProc(hwnd, msg, wparam, lparam);
 }