From a06c7ff02ce50243cd1e4bef8bad25bd1978bcda Mon Sep 17 00:00:00 2001 From: Jonas Kümmerlin Date: Mon, 25 May 2020 21:35:28 +0200 Subject: add explicit functions for adding native buttons --- widgetfactory.cpp | 53 +++++++---------------------------------------------- 1 file changed, 7 insertions(+), 46 deletions(-) (limited to 'widgetfactory.cpp') diff --git a/widgetfactory.cpp b/widgetfactory.cpp index e4dc214..928ecb0 100644 --- a/widgetfactory.cpp +++ b/widgetfactory.cpp @@ -591,30 +591,9 @@ checkboxPanelAttach(void *closure, HWND outerPanel) panel = ALF_AddGroupBox(outerPanel, (WORD)-1, 3, 1, TEXT("Nat&ive Checkbox")); - HWND hwnd = CreateWindowEx(0, - TEXT("BUTTON"), - TEXT("Native Checkbox &with long text"), - WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_AUTOCHECKBOX, - 0, 0, 100, 100, - panel, - (HMENU)(ULONG_PTR)-1, - (HINSTANCE)GetModuleHandle(NULL), - NULL); - - ALF_AddWidget(panel, 1, 1, hwnd, 2, 0, ALF_LAYOUT_SIZE_CHECKBOX | ALF_LAYOUT_INHERITFONT | ALF_LAYOUT_TRANSPARENTBG); - - hwnd = CreateWindowEx(0, - TEXT("BUTTON"), - TEXT("Native disabled Chec&kbox"), - WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_AUTOCHECKBOX, - 0, 0, 100, 100, - panel, - (HMENU)(ULONG_PTR)-1, - (HINSTANCE)GetModuleHandle(NULL), - NULL); - + ALF_AddNativeCheckbox(panel, (WORD)-1, 1, 1, TEXT("Native Checkbox &with long text")); + HWND hwnd = ALF_AddNativeCheckbox(panel, (WORD)-1, 1, 3, TEXT("Native disabled Chec&kbox")); EnableWindow(hwnd, FALSE); - ALF_AddWidget(panel, 1, 3, hwnd, 0, 0, ALF_LAYOUT_SIZE_CHECKBOX | ALF_LAYOUT_INHERITFONT | ALF_LAYOUT_TRANSPARENTBG); ALF_LayoutSetRowMinSize(panel, 2, 525); ALF_LayoutSetRowMinSize(panel, 4, 525); @@ -638,28 +617,10 @@ checkboxPanelAttach(void *closure, HWND outerPanel) panel = ALF_AddGroupBox(outerPanel, (WORD)-1, 3, 3, TEXT("Native Radio")); - hwnd = CreateWindowEx(0, - TEXT("BUTTON"), - TEXT("Native Radio Butto&n with long text"), - WS_CHILD | WS_VISIBLE | BS_AUTORADIOBUTTON, - 0, 0, 100, 100, - panel, - (HMENU)(ULONG_PTR)-1, - (HINSTANCE)GetModuleHandle(NULL), - NULL); + hwnd = ALF_AddNativeRadioButton(panel, (WORD)-1, 1, 1, TEXT("Native Radio Butto&n with long text")); SendMessage(hwnd, BM_SETCHECK, BST_CHECKED, 0); - ALF_AddWidget(panel, 1, 1, hwnd, 0, 0, ALF_LAYOUT_SIZE_RADIOBUTTON | ALF_LAYOUT_INHERITFONT | ALF_LAYOUT_TRANSPARENTBG); - - hwnd = CreateWindowEx(0, - TEXT("BUTTON"), - TEXT("Native Radio B&utton #2"), - WS_CHILD | WS_VISIBLE | BS_AUTORADIOBUTTON, - 0, 0, 100, 100, - panel, - (HMENU)(ULONG_PTR)-1, - (HINSTANCE)GetModuleHandle(NULL), - NULL); - ALF_AddWidget(panel, 1, 3, hwnd, 0, 0, ALF_LAYOUT_SIZE_RADIOBUTTON | ALF_LAYOUT_INHERITFONT | ALF_LAYOUT_TRANSPARENTBG); + + ALF_AddNativeRadioButton(panel, (WORD)-1, 1, 3, TEXT("Native Radio B&utton #2")); ALF_LayoutSetRowMinSize(panel, 2, 525); ALF_LayoutSetRowMinSize(panel, 4, 525); @@ -889,8 +850,8 @@ WinMain addPaneToNotebook(hwndNtbk, PANE_GROUPBOX); HWND btnpanel = ALF_AddPanel(win, (WORD)-1, 1, 3); - ALF_AddButton(btnpanel, ID_HELLO, 1, 3, TEXT("&Hello World!")); - ALF_AddButton(btnpanel, (WORD)-1, 3, 3, TEXT("Goodbye, World")); + ALF_AddNativeButton(btnpanel, ID_HELLO, 1, 3, TEXT("&Hello World!")); + ALF_AddNativeButton(btnpanel, (WORD)-1, 3, 3, TEXT("Goodbye, World")); ALF_LayoutSetRowMinSize(win, 2, 525); ALF_LayoutSetRowMinSize(win, 0, 525); -- cgit v1.2.3