move checkbox into button

1 files changed, 27 insertions, 10 deletions

diff --git a/widgetfactory.cpp b/widgetfactory.cpp
index ecf1bbb..f036387 100644
--- a/widgetfactory.cpp
+++ b/widgetfactory.cpp
@@ -572,7 +572,7 @@ checkboxPanelAttach(void *closure, HWND outerPanel)
 
     HWND panel = ALF_AddGroupBox(outerPanel, (WORD)-1, 1, 1, TEXT("ALF Checkbox"));
 
-    ALF_AddCheckbox(panel, (WORD)-1, 1, 2, TEXT("Some Checkbox with a very very really very very long text"));
+    ALF_AddCheckbox(panel, (WORD)-1, 1, 2, TEXT("Some Checkbo&x with a very very really very very long text"));
 
     HWND l = ALF_AddLabel(panel, (WORD)-1, 1, 4, TEXT("Width checker"));
     ALF_SetBackgroundColor(l, ALF_COLOR_RGB(0, 0, 255));
@@ -580,16 +580,20 @@ checkboxPanelAttach(void *closure, HWND outerPanel)
 
     ALF_AddCheckbox(panel, (WORD)-1, 1, 6, TEXT("Another Checkbox"));
 
+    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);
 
-    panel = ALF_AddGroupBox(outerPanel, (WORD)-1, 3, 1, TEXT("Native Checkbox"));
+    panel = ALF_AddGroupBox(outerPanel, (WORD)-1, 3, 1, TEXT("Nat&ive Checkbox"));
 
     HWND hwnd  = CreateWindowEx(0,
                                 TEXT("BUTTON"),
-                                TEXT("Native Checkbox with long text"),
+                                TEXT("Native Checkbox &with long text"),
                                 WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_AUTOCHECKBOX,
                                 0, 0, 100, 100,
                                 panel,
@@ -597,17 +601,30 @@ checkboxPanelAttach(void *closure, HWND outerPanel)
                                 (HINSTANCE)GetModuleHandle(NULL),
                                 NULL);
 
-    ALF_AddWidget(panel, 1, 1, hwnd, 0, 0, ALF_LAYOUT_SIZE_CHECKBOX | ALF_LAYOUT_INHERITFONT | ALF_LAYOUT_TRANSPARENTBG);
+    ALF_AddWidget(panel, 1, 1, hwnd, 2, 0, ALF_LAYOUT_SIZE_CHECKBOX | ALF_LAYOUT_INHERITFONT | ALF_LAYOUT_TRANSPARENTBG);
 
-    ALF_LayoutSetRowMinSize(panel, 3, 825);
-    ALF_LayoutSetRowMinSize(panel, 5, 825);
+    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);
+
+    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);
     ALF_LayoutSetColumnExpandNumerator(panel, 9, 1);
     ALF_LayoutSetRowExpandNumerator(panel, 9, 1);
 
     panel = ALF_AddGroupBox(outerPanel, (WORD)-1, 1, 3, TEXT("ALF Radio Button"));
 
-    hwnd = ALF_AddRadioButton(panel, (WORD)-1, 1, 2, TEXT("Some Radio button"));
-    ALF_AddRadioButton(panel, (WORD)-1, 1, 4, TEXT("Another long One"));
+    hwnd = ALF_AddRadioButton(panel, (WORD)-1, 1, 2, TEXT("Some R&adio button"));
+    ALF_AddRadioButton(panel, (WORD)-1, 1, 4, TEXT("Anot&her long One"));
     ALF_AddRadioButton(panel, (WORD)-1, 1, 6, TEXT("Option 3"));
     ALF_AddRadioButton(panel, (WORD)-1, 1, 8, TEXT("Option IV"));
 
@@ -623,7 +640,7 @@ checkboxPanelAttach(void *closure, HWND outerPanel)
 
     hwnd  =      CreateWindowEx(0,
                                 TEXT("BUTTON"),
-                                TEXT("Native Radio Button with long text"),
+                                TEXT("Native Radio Butto&n with long text"),
                                 WS_CHILD | WS_VISIBLE | BS_AUTORADIOBUTTON,
                                 0, 0, 100, 100,
                                 panel,
@@ -635,7 +652,7 @@ checkboxPanelAttach(void *closure, HWND outerPanel)
 
     hwnd  =      CreateWindowEx(0,
                                 TEXT("BUTTON"),
-                                TEXT("Native Radio Button #2"),
+                                TEXT("Native Radio B&utton #2"),
                                 WS_CHILD | WS_VISIBLE | BS_AUTORADIOBUTTON,
                                 0, 0, 100, 100,
                                 panel,