6.9.2a

Updated examples for QWin: dpp-gui and game-gui to show the use of edit controls

Author: quantum-leaps

Diff for: examples/arm-cm/dpp_efm32-slstk3401a/win32-gui/Resource.rc

@@ -1,13 +1,13 @@
 /*****************************************************************************
 * Product: DPP example, Win32-GUI
-* Last updated for version 6.8.0
-* Last updated on  2020-03-31
+* Last updated for version: 6.9.3
+* Date of the Last Update:  2021-03-03
 *
 *                    Q u a n t u m  L e a P s
 *                    ------------------------
 *                    Modern Embedded Software
 *
-* Copyright (C) 2005-2020 Quantum Leaps, LLC. All rights reserved.
+* Copyright (C) 2005-2021 Quantum Leaps, LLC. All rights reserved.
 *
 * This program is open source software: you can redistribute it and/or
 * modify it under the terms of the GNU General Public License as published
@@ -146,6 +146,9 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT iMsg,
             /* --> QP: spawn the application thread to run main_gui() */
             Q_ALLEGE(CreateThread(NULL, 0, &appThread, NULL, 0, NULL)
                      != (HANDLE)0);
+
+            SetDlgItemTextA(hWnd, IDC_EDIT1, "Edit1");
+            SetDlgItemTextA(hWnd, IDC_EDIT2, "Edit2");
             return 0;
         }
 
@@ -154,20 +157,29 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT iMsg,
             return 0;
         }
 
-        /* commands from regular buttons and menus... */
+        /* commands from child controls and menus... */
         case WM_COMMAND: {
-            SetFocus(hWnd);
             switch (wParam) {
                 case IDOK:
                 case IDCANCEL: {
                     PostQuitMessage(0);
                     break;
                 }
+                case IDC_PAUSE: { /* owner-drawn button(s) */
+                    SetFocus(hWnd);
+                    break;
+                }
+                case IDC_BUTTON1: { /* regular button */
+                    char buf[32];
+                    GetDlgItemTextA(hWnd, IDC_EDIT1, buf, sizeof(buf));
+                    SetDlgItemTextA(hWnd, IDC_EDIT2, buf);
+                    break;
+                }
             }
             return 0;
         }
 
-        /* owner-drawn buttons... */
+        /* drawing of owner-drawn buttons... */
         case WM_DRAWITEM: {
             LPDRAWITEMSTRUCT pdis = (LPDRAWITEMSTRUCT)lParam;
             switch (pdis->CtlID) {

Diff for: examples/arm-cm/dpp_efm32-slstk3401a/win32-gui/bsp.c

@@ -14,7 +14,10 @@
 #define IDC_PHILO_2                     1002
 #define IDC_PHILO_3                     1003
 #define IDC_PHILO_4                     1004
+#define IDC_EDIT1                       1005
 #define IDC_PAUSE                       1006
+#define IDC_EDIT2                       1007
+#define IDC_BUTTON1                     1008
 #define IDC_PAUSED                      1009
 #define IDS_APP_TITLE                   40000
 #define IDS_PAUSED                      40001
@@ -26,7 +29,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        112
 #define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1002
+#define _APS_NEXT_CONTROL_VALUE         1009
 #define _APS_NEXT_SYMED_VALUE           123
 #endif
 #endif

Diff for: examples/arm-cm/dpp_efm32-slstk3401a/win32-gui/resource.h

@@ -1,13 +1,13 @@
 /*****************************************************************************
 * Product: "Fly 'n' Shoot" game example, EFM32-SLSTK3401A, Win32-GUI
-* Last updated for version 6.9.1
-* Last updated on  2020-09-22
+* Last updated for version 6.9.3
+* Last updated on  2021-03-03
 *
 *                    Q u a n t u m  L e a P s
 *                    ------------------------
 *                    Modern Embedded Software
 *
-* Copyright (C) 2005-2020 Quantum Leaps, LLC. All rights reserved.
+* Copyright (C) 2005-2021 Quantum Leaps, LLC. All rights reserved.
 *
 * This program is open source software: you can redistribute it and/or
 * modify it under the terms of the GNU General Public License as published
@@ -74,7 +74,9 @@ static void paintBitsClear(uint8_t x, uint8_t y,
         PLAYER_TRIGGER = QS_USER,
         COMMAND_STAT
     };
-    static uint8_t const l_clock_tick = 0U;
+
+    /* QSpy source IDs */
+    static QSpyId const l_clock_tick = { 0U };
 #endif
 
 /* Local functions ---------------------------------------------------------*/
@@ -752,25 +754,29 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT iMsg,
             return 0;
         }
 
-        /* commands from regular buttons and menus... */
+        /* commands from child controls and menus... */
         case WM_COMMAND: {
-            SetFocus(hWnd);
             switch (wParam) {
                 case IDOK:
                 case IDCANCEL: {
                     OutputDebugString("QUIT\n");
                     PostQuitMessage(0);
                     break;
                 }
+                case IDC_USER0:    /* owner-drawn buttons... */
+                case IDC_USER1: {
+                    SetFocus(hWnd);
+                    break;
+                }
             }
             return 0;
         }
 
-        /* owner-drawn buttons... */
+        /* drawing of owner-drawn buttons... */
         case WM_DRAWITEM: {
             LPDRAWITEMSTRUCT pdis = (LPDRAWITEMSTRUCT)lParam;
             switch (pdis->CtlID) {
-                case IDC_USER0: {  /* USER owner-drawn Button0 */
+                case IDC_USER0: {  /* owner-drawn Button0 */
                     OutputDebugString("USER0\n");
                     switch (OwnerDrawnButton_draw(&l_userBtn0, pdis)) {
                         case BTN_DEPRESSED: {
@@ -788,9 +794,15 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT iMsg,
                     }
                     break;
                 }
-                case IDC_USER1: {  /* USER owner-drawn Button1 */
+                case IDC_USER1: {  /* owner-drawn Button1 */
                     OutputDebugString("USER1\n");
                     switch (OwnerDrawnButton_draw(&l_userBtn1, pdis)) {
+                        case BTN_DEPRESSED: {
+                             break;
+                        }
+                        case BTN_RELEASED: {
+                            break;
+                        }
                         default: {
                             break;
                         }