Changeset 227 for trunk/src/helpers

Timestamp:

Sep 14, 2002, 11:52:10 AM (23 years ago)

Author:

umoeller

Message:

Misc changes.

Location:

trunk/src/helpers

Files:

• _call_filedlg.c (modified) (5 diffs)
• makefile (modified) (1 diff)

trunk/src/helpers/_call_filedlg.c

@@ -10 +10 @@
 #define INCL_WINWINDOWMGR
 #define INCL_WINFRAMEMGR
+#define INCL_WINMENUS
 #define INCL_WINSTDFILE
 
@@ -20 +21 @@
 #include "setup.h"                      // code generation and debugging options
 
-#include "R:\projects\R_cvs\xworkplace\include\xwpapi.h"
+#include "..\..\..\xworkplace\include\xwpapi.h"
 
 #include "helpers\call_file_dlg.c"
+#include "helpers\winh.h"
 
 /*
@@ -46 +48 @@
 }
 
+/*
+ *@@ ShowFileDlg:
+ *
+ */
 
-int main (int argc, char *argv[])
+VOID ShowFileDlg(HWND hwndFrame)
 {
-    HAB             hab;
-    HMQ             hmq;
-
     FILEDLG         fd;
-
-    hab = WinInitialize(0);
-    hmq = WinCreateMsgQueue(hab, 0);
 
     memset(&fd, 0, sizeof(FILEDLG));
@@ -63 +63 @@
     strcpy(fd.szFullFile, "C:\\*");
 
-    if (NewWinFileDlg(NULLHANDLE,
+    if (NewWinFileDlg(hwndFrame,
                       &fd))
     {
         CHAR sz[1000];
         sprintf(sz, "got: \"%s\"", fd.szFullFile);
-        WinMessageBox(HWND_DESKTOP, NULLHANDLE,
+        WinMessageBox(HWND_DESKTOP, hwndFrame,
                       sz,
                       "File:",
@@ -75 +75 @@
     }
     else
-        WinMessageBox(HWND_DESKTOP, NULLHANDLE,
+        WinMessageBox(HWND_DESKTOP, hwndFrame,
                       "file dlg returned FALSE",
                       "File:",
                       0,
                       MB_OK | MB_MOVEABLE);
+}
+
+/*
+ *@@ main:
+ *
+ */
+
+int main(int argc, char *argv[])
+{
+    HAB             hab;
+    HMQ             hmq;
+
+    ULONG           flFrame =     FCF_TITLEBAR
+                                | FCF_SYSMENU
+                                | FCF_MINMAX
+                                | FCF_SIZEBORDER
+                                | FCF_NOBYTEALIGN
+                                | FCF_SHELLPOSITION
+                                | FCF_TASKLIST;
+
+    HWND            hwndFrame,
+                    hwndClient,
+                    hwndMenu,
+                    hwndSubmenu;
+    QMSG            qmsg;
+
+    hab = WinInitialize(0);
+    hmq = WinCreateMsgQueue(hab, 0);
+
+    hwndFrame = WinCreateStdWindow(HWND_DESKTOP,
+                                   WS_VISIBLE,
+                                   &flFrame,
+                                   NULL,
+                                   "Test File Dialog",
+                                   WS_VISIBLE,
+                                   0,
+                                   0,
+                                   &hwndClient);
+
+    hwndMenu = WinCreateMenu(hwndFrame,
+                             NULL);
+
+    hwndSubmenu = winhInsertSubmenu(hwndMenu,
+                                    MIT_END,
+                                    1,
+                                    "~File",
+                                    MIS_TEXT | MIS_SUBMENU,
+                                    1000,
+                                    "~Show dialog",
+                                    MIS_TEXT,
+                                    0);
+
+    winhInsertMenuItem(hwndSubmenu,
+                       MIT_END,
+                       SC_CLOSE,
+                       "~Close",
+                       MIS_SYSCOMMAND | MIS_TEXT,
+                       0);
+
+    WinSendMsg(hwndFrame, WM_UPDATEFRAME, MPNULL, MPNULL);
+
+    while (WinGetMsg(hab, &qmsg, NULLHANDLE, 0, 0))
+    {
+        BOOL fDispatch = TRUE;
+
+        if (qmsg.hwnd == hwndFrame)
+        {
+            switch (qmsg.msg)
+            {
+                case WM_COMMAND:
+                    if (SHORT1FROMMP(qmsg.mp1) == 1000)
+                    {
+                        ShowFileDlg(hwndFrame);
+                        fDispatch = FALSE;
+                    }
+                break;
+            }
+        }
+
+        if (fDispatch)
+            WinDispatchMsg(hab, &qmsg);
+    }
 
     WinDestroyMsgQueue(hmq);

trunk/src/helpers/makefile

@@ -263 +263 @@
 # fdlg.exe
 FDLG_TEST_OBJS = \
+    $(TESTCASE_DIR)\dosh.obj \
+    $(TESTCASE_DIR)\gpih.obj \
+    $(TESTCASE_DIR)\winh.obj \
+    $(TESTCASE_DIR)\stringh.obj \
+    $(TESTCASE_DIR)\xstring.obj \
     $(TESTCASE_DIR)\_call_filedlg.obj