From f0319406c56cdaf6b91e35ef657c6570c1ebdf23 Mon Sep 17 00:00:00 2001 From: Jonas Kümmerlin Date: Mon, 1 Jun 2020 10:56:58 +0200 Subject: layout code reorganization and renaming s/Widget/Control/ throughout the code. Only the widget factory gets to keep its name for now. --- widgetfactory.cpp | 241 +++++++++++++++++++++++++++--------------------------- 1 file changed, 121 insertions(+), 120 deletions(-) (limited to 'widgetfactory.cpp') diff --git a/widgetfactory.cpp b/widgetfactory.cpp index 7c63191..29c7475 100644 --- a/widgetfactory.cpp +++ b/widgetfactory.cpp @@ -160,7 +160,7 @@ commonPanelMessage(void *closure, HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpa switch (priv->bgmode) { case BG_INHERIT: - ALF_AddWidgetLayoutFlag(GetParent(hwnd), hwnd, ALF_LAYOUT_INHERITBGCOLOR); + ALF_Layout_AddControlFlag(GetParent(hwnd), hwnd, ALF_LAYOUT_INHERITBGCOLOR); ALF_InvalidateBackground(hwnd); break; case BG_GRADIENT: @@ -212,10 +212,10 @@ buttonPanelAttach(void *closure, HWND outerPanel) ALF_AddLabel(panel, (WORD)-1, 0, 6, TEXT("layout dummy")); b = ALF_AddButton(panel, (WORD)-1, 2, 2, TEXT("Hello, World!")); - ALF_SetWidgetLayoutMinSize(panel, b, 0, 0); + ALF_Layout_SetControlMinSize(panel, b, 0, 0); b = ALF_AddButton(panel, (WORD)-1, 2, 4, TEXT("Hello, World!")); EnableWindow(b, FALSE); - ALF_SetWidgetLayoutMinSize(panel, b, 0, 0); + ALF_Layout_SetControlMinSize(panel, b, 0, 0); HWND hwndNb1 = CreateWindowEx(0, @@ -238,14 +238,14 @@ buttonPanelAttach(void *closure, HWND outerPanel) NULL); EnableWindow(hwndNb2, FALSE); - ALF_AddWidget(panel, 4, 2, hwndNb1, 0, 0, ALF_LAYOUT_INHERITFONT | ALF_LAYOUT_TRANSPARENTBG); - ALF_AddWidget(panel, 4, 4, hwndNb2, 0, 0, ALF_LAYOUT_INHERITFONT | ALF_LAYOUT_TRANSPARENTBG); + ALF_AddControl(panel, 4, 2, hwndNb1, 0, 0, ALF_LAYOUT_INHERITFONT | ALF_LAYOUT_TRANSPARENTBG); + ALF_AddControl(panel, 4, 4, hwndNb2, 0, 0, ALF_LAYOUT_INHERITFONT | ALF_LAYOUT_TRANSPARENTBG); b = ALF_AddButton(panel, (WORD)-1, 4, 6, TEXT("Hello, World!")); - ALF_SetWidgetLayoutMinSize(panel, b, 0, 0); + ALF_Layout_SetControlMinSize(panel, b, 0, 0); b = ALF_AddButton(panel, (WORD)-1, 2, 8, TEXT("Multiline\r\nButton")); - ALF_SetWidgetLayoutMinSize(panel, b, 0, 0); + ALF_Layout_SetControlMinSize(panel, b, 0, 0); HWND hwndNb3 = CreateWindowEx(0, TEXT("BUTTON"), @@ -257,17 +257,17 @@ buttonPanelAttach(void *closure, HWND outerPanel) (HINSTANCE)GetModuleHandle(NULL), NULL); - ALF_AddWidget(panel, 4, 8, hwndNb3, 0, 0, ALF_LAYOUT_INHERITFONT | ALF_LAYOUT_TRANSPARENTBG); + ALF_AddControl(panel, 4, 8, hwndNb3, 0, 0, ALF_LAYOUT_INHERITFONT | ALF_LAYOUT_TRANSPARENTBG); - ALF_LayoutSetRowMinSize(panel, 1, 825); - ALF_LayoutSetRowMinSize(panel, 3, 825); - ALF_LayoutSetRowMinSize(panel, 5, 825); - ALF_LayoutSetRowMinSize(panel, 7, 825); - ALF_LayoutSetRowMinSize(panel, 9, 825); - ALF_LayoutSetColumnMinSize(panel, 1, 825); - ALF_LayoutSetColumnMinSize(panel, 3, 825); + ALF_Layout_SetRowMinSize(panel, 1, 825); + ALF_Layout_SetRowMinSize(panel, 3, 825); + ALF_Layout_SetRowMinSize(panel, 5, 825); + ALF_Layout_SetRowMinSize(panel, 7, 825); + ALF_Layout_SetRowMinSize(panel, 9, 825); + ALF_Layout_SetColumnMinSize(panel, 1, 825); + ALF_Layout_SetColumnMinSize(panel, 3, 825); - ALF_LayoutSetColumnExpandNumerator(panel, 9, 1); + ALF_Layout_SetColumnExpandNumerator(panel, 9, 1); ALF_Panel_SetEdge(panel, BDR_RAISEDINNER); @@ -284,7 +284,7 @@ buttonPanelAttach(void *closure, HWND outerPanel) (HMENU)(WORD)-1, (HINSTANCE)GetModuleHandle(NULL), NULL); - ALF_AddWidget(panel, 4, 2, hwndNb4, 5625, 1725, ALF_LAYOUT_INHERITFONT | ALF_LAYOUT_TRANSPARENTBG); + ALF_AddControl(panel, 4, 2, hwndNb4, 5625, 1725, ALF_LAYOUT_INHERITFONT | ALF_LAYOUT_TRANSPARENTBG); ALF_AddButton(panel, (WORD)-1, 2, 4, TEXT("Expanding")); @@ -297,7 +297,7 @@ buttonPanelAttach(void *closure, HWND outerPanel) (HMENU)(WORD)-1, (HINSTANCE)GetModuleHandle(NULL), NULL); - ALF_AddWidget(panel, 4, 4, hwndNb5, 0, 0, ALF_LAYOUT_INHERITFONT | ALF_LAYOUT_TRANSPARENTBG); + ALF_AddControl(panel, 4, 4, hwndNb5, 0, 0, ALF_LAYOUT_INHERITFONT | ALF_LAYOUT_TRANSPARENTBG); ALF_AddButton(panel, (WORD)-1, 2, 6, TEXT("Expanding\r\nMultiline")); @@ -310,22 +310,22 @@ buttonPanelAttach(void *closure, HWND outerPanel) (HMENU)(WORD)-1, (HINSTANCE)GetModuleHandle(NULL), NULL); - ALF_AddWidget(panel, 4, 6, hwndNb6, 0, 0, ALF_LAYOUT_INHERITFONT | ALF_LAYOUT_TRANSPARENTBG); + ALF_AddControl(panel, 4, 6, hwndNb6, 0, 0, ALF_LAYOUT_INHERITFONT | ALF_LAYOUT_TRANSPARENTBG); - ALF_LayoutSetRowMinSize(panel, 1, 825); - ALF_LayoutSetRowMinSize(panel, 3, 825); - ALF_LayoutSetRowMinSize(panel, 5, 825); - ALF_LayoutSetRowMinSize(panel, 7, 825); - ALF_LayoutSetColumnMinSize(panel, 1, 825); - ALF_LayoutSetColumnMinSize(panel, 3, 825); + ALF_Layout_SetRowMinSize(panel, 1, 825); + ALF_Layout_SetRowMinSize(panel, 3, 825); + ALF_Layout_SetRowMinSize(panel, 5, 825); + ALF_Layout_SetRowMinSize(panel, 7, 825); + ALF_Layout_SetColumnMinSize(panel, 1, 825); + ALF_Layout_SetColumnMinSize(panel, 3, 825); - ALF_LayoutSetColumnExpandNumerator(panel, 9, 1); - ALF_LayoutSetRowExpandNumerator(panel, 4, 1); - ALF_LayoutSetRowExpandNumerator(panel, 6, 1); + ALF_Layout_SetColumnExpandNumerator(panel, 9, 1); + ALF_Layout_SetRowExpandNumerator(panel, 4, 1); + ALF_Layout_SetRowExpandNumerator(panel, 6, 1); ALF_Panel_SetEdge(panel, BDR_RAISEDINNER); - ALF_LayoutSetRowExpandNumerator(outerPanel, 1, 1); + ALF_Layout_SetRowExpandNumerator(outerPanel, 1, 1); // TODO: recreate old button box @@ -355,8 +355,8 @@ buttonPanelAttach(void *closure, HWND outerPanel) (HINSTANCE)GetWindowLongPtr(panel, GWLP_HINSTANCE), NULL); EnableWindow(hwndBc5, FALSE); - ALF_AddWidget(panel, 3, 0, hwndBc4, 1000, 0, ALF_LAYOUT_INHERITFONT); - ALF_AddWidget(panel, 4, 0, hwndBc5, 1000, 0, ALF_LAYOUT_INHERITFONT);*/ + ALF_AddControl(panel, 3, 0, hwndBc4, 1000, 0, ALF_LAYOUT_INHERITFONT); + ALF_AddControl(panel, 4, 0, hwndBc5, 1000, 0, ALF_LAYOUT_INHERITFONT);*/ } static ALFPanelVTable buttonPanelVtbl = { @@ -378,7 +378,7 @@ buttonPanelInit(HWND panel) /* label panel */ -//FIXME! replace with real widget +//FIXME! replace with real control static HWND makeSeparator(HWND parent, int x, int y) { @@ -421,9 +421,9 @@ labelPanelAttach(void *closure, HWND panel) makeSeparator(g, 4, 1); makeSeparator(g, 4, 3); - ALF_LayoutSetRowExpandNumerator(g, 0, 1); - ALF_LayoutSetRowExpandNumerator(g, 2, 1); - ALF_LayoutSetRowExpandNumerator(g, 4, 1); + ALF_Layout_SetRowExpandNumerator(g, 0, 1); + ALF_Layout_SetRowExpandNumerator(g, 2, 1); + ALF_Layout_SetRowExpandNumerator(g, 4, 1); makeSeparator(g, 1, 0); makeSeparator(g, 1, 2); @@ -432,9 +432,9 @@ labelPanelAttach(void *closure, HWND panel) makeSeparator(g, 3, 2); makeSeparator(g, 3, 4); - ALF_LayoutSetColumnExpandNumerator(g, 0, 1); - ALF_LayoutSetColumnExpandNumerator(g, 2, 1); - ALF_LayoutSetColumnExpandNumerator(g, 4, 1); + ALF_Layout_SetColumnExpandNumerator(g, 0, 1); + ALF_Layout_SetColumnExpandNumerator(g, 2, 1); + ALF_Layout_SetColumnExpandNumerator(g, 4, 1); g = ALF_AddGroupBox(panel, (WORD)-1, 1, 0, TEXT("Like Edit")); ALF_AddLabel(g, (WORD)-1, 1, 2, TEXT("Bas&eline")); @@ -449,7 +449,7 @@ labelPanelAttach(void *closure, HWND panel) l = ALF_AddLabel(g, (WORD)-1, 0, 1, TEXT("Disabled")); EnableWindow(l, FALSE); - ALF_LayoutSetRowExpandNumerator(panel, 0, 1); + ALF_Layout_SetRowExpandNumerator(panel, 0, 1); } static ALFPanelVTable labelPanelVtbl = { @@ -495,14 +495,14 @@ comboPanelAttach(void *closure, HWND panel) ALF_ComboBox_SetText(hwndCombo2, TEXT("Goodbye World!")); - ALF_LayoutSetRowMinSize(panel, 1, 825); - ALF_LayoutSetRowMinSize(panel, 3, 825); - ALF_LayoutSetRowMinSize(panel, 5, 825); - ALF_LayoutSetRowMinSize(panel, 7, 825); - ALF_LayoutSetColumnMinSize(panel, 1, 825); - ALF_LayoutSetColumnMinSize(panel, 3, 825); - ALF_LayoutSetColumnExpandNumerator(panel, 2, 1); - ALF_LayoutSetRowExpandNumerator(panel, 9, 1); + ALF_Layout_SetRowMinSize(panel, 1, 825); + ALF_Layout_SetRowMinSize(panel, 3, 825); + ALF_Layout_SetRowMinSize(panel, 5, 825); + ALF_Layout_SetRowMinSize(panel, 7, 825); + ALF_Layout_SetColumnMinSize(panel, 1, 825); + ALF_Layout_SetColumnMinSize(panel, 3, 825); + ALF_Layout_SetColumnExpandNumerator(panel, 2, 1); + ALF_Layout_SetRowExpandNumerator(panel, 9, 1); } static ALFPanelVTable comboPanelVtbl = { @@ -540,15 +540,15 @@ notebookPanelAttach(void *closure, HWND panel) ALF_AddButton(hwndTabPanel0, ID_B_TABBGSOLID, 0, 0, TEXT("Solid tab background")); ALF_AddButton(hwndTabPanel0, ID_B_TABBGTEXTURE, 0, 1, TEXT("Textured tab background")); - ALF_LayoutSetRowExpandNumerator(hwndTabPanel0, 2, 1); - ALF_LayoutSetColumnExpandNumerator(hwndTabPanel0, 1, 1); + ALF_Layout_SetRowExpandNumerator(hwndTabPanel0, 2, 1); + ALF_Layout_SetColumnExpandNumerator(hwndTabPanel0, 1, 1); ALF_AddLabel(hwndTabPanel1, (WORD)-1, 0, 0, TEXT("Hello World!")); ALF_AddLabel(hwndTabPanel2, (WORD)-1, 0, 0, TEXT("Goodbye, &World!")); ALF_AddEdit(hwndTabPanel2, (WORD)-1, 1, 0, TEXT("lol")); ALF_AddLabel(hwndTabPanel1, (WORD)-1, 0, 1, TEXT("Blabla")); - ALF_LayoutSetRowExpandNumerator(hwndTabPanel1, 1, 1); + ALF_Layout_SetRowExpandNumerator(hwndTabPanel1, 1, 1); ALF_AddLabel(hwndTabPanel1, (WORD)-1, 0, 2, TEXT("No 3")); ALF_AddEdit(hwndTabPanel1, (WORD)-1, 0, 3, TEXT("Dummy")); @@ -592,11 +592,11 @@ checkboxPanelAttach(void *closure, HWND outerPanel) HWND c = ALF_AddCheckbox(panel, (WORD)-1, 1, 8, TEXT("Disabled Checkbox")); EnableWindow(c, FALSE); - ALF_LayoutSetRowMinSize(panel, 3, 525); - ALF_LayoutSetRowMinSize(panel, 5, 525); - ALF_LayoutSetRowMinSize(panel, 7, 525); - ALF_LayoutSetColumnExpandNumerator(panel, 9, 1); - ALF_LayoutSetRowExpandNumerator(panel, 9, 1); + ALF_Layout_SetRowMinSize(panel, 3, 525); + ALF_Layout_SetRowMinSize(panel, 5, 525); + ALF_Layout_SetRowMinSize(panel, 7, 525); + ALF_Layout_SetColumnExpandNumerator(panel, 9, 1); + ALF_Layout_SetRowExpandNumerator(panel, 9, 1); panel = ALF_AddGroupBox(outerPanel, (WORD)-1, 3, 1, TEXT("Nat&ive Checkbox")); @@ -604,10 +604,10 @@ checkboxPanelAttach(void *closure, HWND outerPanel) HWND hwnd = ALF_AddNativeCheckbox(panel, (WORD)-1, 1, 3, TEXT("Native disabled Chec&kbox")); EnableWindow(hwnd, FALSE); - ALF_LayoutSetRowMinSize(panel, 2, 525); - ALF_LayoutSetRowMinSize(panel, 4, 525); - ALF_LayoutSetColumnExpandNumerator(panel, 9, 1); - ALF_LayoutSetRowExpandNumerator(panel, 9, 1); + ALF_Layout_SetRowMinSize(panel, 2, 525); + ALF_Layout_SetRowMinSize(panel, 4, 525); + ALF_Layout_SetColumnExpandNumerator(panel, 9, 1); + ALF_Layout_SetRowExpandNumerator(panel, 9, 1); panel = ALF_AddGroupBox(outerPanel, (WORD)-1, 1, 3, TEXT("ALF Radio Button")); @@ -618,11 +618,11 @@ checkboxPanelAttach(void *closure, HWND outerPanel) SendMessage(hwnd, BM_SETCHECK, BST_CHECKED, 0); - ALF_LayoutSetRowMinSize(panel, 3, 525); - ALF_LayoutSetRowMinSize(panel, 5, 525); - ALF_LayoutSetRowMinSize(panel, 7, 525); - ALF_LayoutSetColumnExpandNumerator(panel, 9, 1); - ALF_LayoutSetRowExpandNumerator(panel, 9, 1); + ALF_Layout_SetRowMinSize(panel, 3, 525); + ALF_Layout_SetRowMinSize(panel, 5, 525); + ALF_Layout_SetRowMinSize(panel, 7, 525); + ALF_Layout_SetColumnExpandNumerator(panel, 9, 1); + ALF_Layout_SetRowExpandNumerator(panel, 9, 1); panel = ALF_AddGroupBox(outerPanel, (WORD)-1, 3, 3, TEXT("Native Radio")); @@ -631,19 +631,19 @@ checkboxPanelAttach(void *closure, HWND outerPanel) ALF_AddNativeRadioButton(panel, (WORD)-1, 1, 3, TEXT("Native Radio B&utton #2")); - ALF_LayoutSetRowMinSize(panel, 2, 525); - ALF_LayoutSetRowMinSize(panel, 4, 525); - ALF_LayoutSetColumnExpandNumerator(panel, 9, 1); - ALF_LayoutSetRowExpandNumerator(panel, 9, 1); - - ALF_LayoutSetRowMinSize(outerPanel, 0, 825); - ALF_LayoutSetRowMinSize(outerPanel, 2, 825); - ALF_LayoutSetColumnMinSize(outerPanel, 0, 825); - ALF_LayoutSetColumnMinSize(outerPanel, 2, 825); - ALF_LayoutSetColumnMinSize(outerPanel, 4, 825); - ALF_LayoutSetColumnExpandNumerator(outerPanel, 1, 1); - ALF_LayoutSetColumnExpandNumerator(outerPanel, 3, 1); - ALF_LayoutSetRowExpandNumerator(outerPanel, 1, 1); + ALF_Layout_SetRowMinSize(panel, 2, 525); + ALF_Layout_SetRowMinSize(panel, 4, 525); + ALF_Layout_SetColumnExpandNumerator(panel, 9, 1); + ALF_Layout_SetRowExpandNumerator(panel, 9, 1); + + ALF_Layout_SetRowMinSize(outerPanel, 0, 825); + ALF_Layout_SetRowMinSize(outerPanel, 2, 825); + ALF_Layout_SetColumnMinSize(outerPanel, 0, 825); + ALF_Layout_SetColumnMinSize(outerPanel, 2, 825); + ALF_Layout_SetColumnMinSize(outerPanel, 4, 825); + ALF_Layout_SetColumnExpandNumerator(outerPanel, 1, 1); + ALF_Layout_SetColumnExpandNumerator(outerPanel, 3, 1); + ALF_Layout_SetRowExpandNumerator(outerPanel, 1, 1); } static ALFPanelVTable checkboxPanelVtbl = { @@ -684,7 +684,7 @@ groupboxPanelAttach(void *closure, HWND panel) (HMENU)(WORD)-1, (HINSTANCE)GetModuleHandle(NULL), NULL); - ALF_AddWidget(panel, 3, 3, hwndGb1, 0, 0, ALF_LAYOUT_INHERITFONT | ALF_LAYOUT_TRANSPARENTBG); + ALF_AddControl(panel, 3, 3, hwndGb1, 0, 0, ALF_LAYOUT_INHERITFONT | ALF_LAYOUT_TRANSPARENTBG); ALF_AddEdit(hwndGb0, (WORD)-1, 0, 0, TEXT("Dummy")); @@ -700,20 +700,20 @@ groupboxPanelAttach(void *closure, HWND panel) (HMENU)(WORD)-1, (HINSTANCE)GetModuleHandle(NULL), NULL); - ALF_AddWidget(panel, 3, 5, hwndGb2, 0, 0, ALF_LAYOUT_INHERITFONT | ALF_LAYOUT_TRANSPARENTBG); + ALF_AddControl(panel, 3, 5, hwndGb2, 0, 0, ALF_LAYOUT_INHERITFONT | ALF_LAYOUT_TRANSPARENTBG); EnableWindow(hwndGb2, FALSE); - ALF_LayoutSetRowMinSize(panel, 0, 825); - ALF_LayoutSetRowMinSize(panel, 2, 825); - ALF_LayoutSetRowMinSize(panel, 4, 825); - ALF_LayoutSetRowMinSize(panel, 6, 825); - ALF_LayoutSetColumnMinSize(panel, 0, 825); - ALF_LayoutSetColumnMinSize(panel, 2, 825); - ALF_LayoutSetColumnMinSize(panel, 4, 825); - ALF_LayoutSetRowExpandNumerator(panel, 3, 1); - ALF_LayoutSetRowExpandNumerator(panel, 5, 1); - ALF_LayoutSetColumnExpandNumerator(panel, 1, 1); - ALF_LayoutSetColumnExpandNumerator(panel, 3, 1); + ALF_Layout_SetRowMinSize(panel, 0, 825); + ALF_Layout_SetRowMinSize(panel, 2, 825); + ALF_Layout_SetRowMinSize(panel, 4, 825); + ALF_Layout_SetRowMinSize(panel, 6, 825); + ALF_Layout_SetColumnMinSize(panel, 0, 825); + ALF_Layout_SetColumnMinSize(panel, 2, 825); + ALF_Layout_SetColumnMinSize(panel, 4, 825); + ALF_Layout_SetRowExpandNumerator(panel, 3, 1); + ALF_Layout_SetRowExpandNumerator(panel, 5, 1); + ALF_Layout_SetColumnExpandNumerator(panel, 1, 1); + ALF_Layout_SetColumnExpandNumerator(panel, 3, 1); } static ALFPanelVTable groupboxPanelVtbl = { @@ -766,23 +766,24 @@ handleCommand(void *closure, HWND window, WORD notificationcode, WORD sourceid, if (notificationcode == CBN_SELCHANGE && sourceid == ID_COMBO2) { TCHAR *text = ALF_ComboBox_CurrentText(control); - ALF_SetWidgetText(window, ID_LBLCOMBOTEXT, text); + HWND hwndLbl = ALF_ControlHwndById(window, ID_LBLCOMBOTEXT); + ALF_SetText(hwndLbl, text); ALF_Free(text); } if (control != NULL && sourceid == ID_BTNCOMBOCLEAR) { - HWND combo = ALF_WidgetHwndById(window, ID_COMBO2); + HWND combo = ALF_ControlHwndById(window, ID_COMBO2); ALF_ComboBox_SetCurrentIndex(combo, -1); } if (sourceid == ID_HELLO) { ALF_MessageBox(window, TEXT("Hello World!"), TEXT("Hello"), MB_ICONASTERISK|MB_OK); } if (control != NULL && sourceid == ID_B_TABBGSOLID) { - HWND nb = ALF_WidgetHwndById(window, ID_NOTEBOOK); + HWND nb = ALF_ControlHwndById(window, ID_NOTEBOOK); ALF_Notebook_AddFlag(nb, ALF_NOTEBOOK_SOLID_TAB_BACKGROUND); } if (control != NULL && sourceid == ID_B_TABBGTEXTURE) { - HWND nb = ALF_WidgetHwndById(window, ID_NOTEBOOK); + HWND nb = ALF_ControlHwndById(window, ID_NOTEBOOK); ALF_Notebook_RemoveFlag(nb, ALF_NOTEBOOK_SOLID_TAB_BACKGROUND); } @@ -791,32 +792,32 @@ handleCommand(void *closure, HWND window, WORD notificationcode, WORD sourceid, } if (sourceid == IDM_BACKGROUND_BLUE) { - HWND nb = ALF_WidgetHwndById(window, ID_NOTEBOOK); + HWND nb = ALF_ControlHwndById(window, ID_NOTEBOOK); HWND panel = ALF_Notebook_SelectedPanel(nb); SendMessage(panel, FM_PANEL_SET_BGMODE, 0, (LPARAM)BG_SOLID_BLUE); } if (sourceid == IDM_BACKGROUND_GREEN) { - HWND nb = ALF_WidgetHwndById(window, ID_NOTEBOOK); + HWND nb = ALF_ControlHwndById(window, ID_NOTEBOOK); HWND panel = ALF_Notebook_SelectedPanel(nb); SendMessage(panel, FM_PANEL_SET_BGMODE, 0, (LPARAM)BG_SOLID_GREEN); } if (sourceid == IDM_BACKGROUND_INHERIT) { - HWND nb = ALF_WidgetHwndById(window, ID_NOTEBOOK); + HWND nb = ALF_ControlHwndById(window, ID_NOTEBOOK); HWND panel = ALF_Notebook_SelectedPanel(nb); SendMessage(panel, FM_PANEL_SET_BGMODE, 0, (LPARAM)BG_INHERIT); } if (sourceid == IDM_BACKGROUND_GRADIENT) { - HWND nb = ALF_WidgetHwndById(window, ID_NOTEBOOK); + HWND nb = ALF_ControlHwndById(window, ID_NOTEBOOK); HWND panel = ALF_Notebook_SelectedPanel(nb); SendMessage(panel, FM_PANEL_SET_BGMODE, 0, (LPARAM)BG_GRADIENT); } if (sourceid >= IDM_PANES && sourceid < IDM_PANES__MAX) { int paneId = sourceid - IDM_PANES; - HWND nb = ALF_WidgetHwndById(window, ID_NOTEBOOK); + HWND nb = ALF_ControlHwndById(window, ID_NOTEBOOK); addPaneToNotebook(nb, paneId); } @@ -842,12 +843,12 @@ wfModalDialogInit(void *closure, HWND dialog) ALF_SetText(dialog, g_paneLabels[paneid]); - ALF_LayoutSetColumnExpandNumerator(dialog, 1, 1); - ALF_LayoutSetRowExpandNumerator(dialog, 1, 1); - ALF_LayoutSetRowMinSize(dialog, 0, 525); - ALF_LayoutSetRowMinSize(dialog, 2, 525); - ALF_LayoutSetColumnMinSize(dialog, 0, 525); - ALF_LayoutSetColumnMinSize(dialog, 2, 525); + ALF_Layout_SetColumnExpandNumerator(dialog, 1, 1); + ALF_Layout_SetRowExpandNumerator(dialog, 1, 1); + ALF_Layout_SetRowMinSize(dialog, 0, 525); + ALF_Layout_SetRowMinSize(dialog, 2, 525); + ALF_Layout_SetColumnMinSize(dialog, 0, 525); + ALF_Layout_SetColumnMinSize(dialog, 2, 525); return TRUE; } @@ -895,12 +896,12 @@ wfModelessDialogInit(void *closure, HWND dialog) ALF_SetText(dialog, g_paneLabels[paneid]); - ALF_LayoutSetColumnExpandNumerator(dialog, 1, 1); - ALF_LayoutSetRowExpandNumerator(dialog, 1, 1); - ALF_LayoutSetRowMinSize(dialog, 0, 525); - ALF_LayoutSetRowMinSize(dialog, 2, 525); - ALF_LayoutSetColumnMinSize(dialog, 0, 525); - ALF_LayoutSetColumnMinSize(dialog, 2, 525); + ALF_Layout_SetColumnExpandNumerator(dialog, 1, 1); + ALF_Layout_SetRowExpandNumerator(dialog, 1, 1); + ALF_Layout_SetRowMinSize(dialog, 0, 525); + ALF_Layout_SetRowMinSize(dialog, 2, 525); + ALF_Layout_SetColumnMinSize(dialog, 0, 525); + ALF_Layout_SetColumnMinSize(dialog, 2, 525); return TRUE; } @@ -979,7 +980,7 @@ WinMain ALF_SetText(win, TEXT("Widget Factory")); HWND hwndNtbk = ALF_AddNotebook(win, ID_NOTEBOOK, 1, 1); - ALF_SetWidgetLayoutSpan(win, hwndNtbk, 4, 1); + ALF_Layout_SetControlSpan(win, hwndNtbk, 4, 1); addPaneToNotebook(hwndNtbk, PANE_BUTTONS); addPaneToNotebook(hwndNtbk, PANE_LABEL); @@ -991,14 +992,14 @@ WinMain ALF_AddNativeButton(win, ID_HELLO, 1, 3, TEXT("&Hello World!")); ALF_AddNativeButton(win, (WORD)-1, 3, 3, TEXT("Goodbye, World")); - ALF_LayoutSetRowMinSize(win, 2, 525); - ALF_LayoutSetRowMinSize(win, 0, 525); - ALF_LayoutSetRowMinSize(win, 4, 525); - ALF_LayoutSetColumnMinSize(win, 0, 525); - ALF_LayoutSetColumnMinSize(win, 2, 525); - ALF_LayoutSetColumnMinSize(win, 5, 525); - ALF_LayoutSetRowExpandNumerator(win, 1, 1); - ALF_LayoutSetColumnExpandNumerator(win, 4, 1); + ALF_Layout_SetRowMinSize(win, 2, 525); + ALF_Layout_SetRowMinSize(win, 0, 525); + ALF_Layout_SetRowMinSize(win, 4, 525); + ALF_Layout_SetColumnMinSize(win, 0, 525); + ALF_Layout_SetColumnMinSize(win, 2, 525); + ALF_Layout_SetColumnMinSize(win, 5, 525); + ALF_Layout_SetRowExpandNumerator(win, 1, 1); + ALF_Layout_SetColumnExpandNumerator(win, 4, 1); ALF_Toplevel_SetDefaultButton(win, ID_HELLO); ALF_SetFocus(GetNextDlgTabItem(win, win, FALSE)); -- cgit v1.2.3