Changeset 1677 for trunk/src/comdlg32/comdlg32.cpp

Timestamp:

Nov 9, 1999, 11:38:57 PM (26 years ago)

Author:

phaller

Message:

Fix: fixes in file open dialogs

File:

• trunk/src/comdlg32/comdlg32.cpp (modified) (6 diffs)

trunk/src/comdlg32/comdlg32.cpp

@@ -1 @@
-/* $Id: comdlg32.cpp,v 1.17 1999-11-02 20:37:42 sandervl Exp $ */
+/* $Id: comdlg32.cpp,v 1.18 1999-11-09 22:38:57 phaller Exp $ */
 
 /*
@@ -25 +25 @@
 #include <win32wnd.h>
 
-ODINDEBUGCHANNEL(COMDLG32)
+ODINDEBUGCHANNEL(COMDLG32-COMDLG32)
 
 #if 0
@@ -87 +87 @@
   COMDLG32_CHECKHOOK(lpofn, OFN_ENABLEHOOK, WNDPROC)
 
+  //@@@PH 1999/11/09 needs to be fixed
   return(O32_GetSaveFileName(lpofn));
 }
@@ -175 +176 @@
   ofn.lpstrCustomFilter = szCustFilter;
 
-  COMDLG32_CHECKHOOK((&ofn), OFN_ENABLEHOOK, WNDPROC)
-
-  bResult =  O32_GetSaveFileName(&ofn);
+  // call ascii variant of function
+  // @@@PH switch to ODIN_GetSaveFileNameA later
+  bResult = GetSaveFileNameA(&ofn);
 
   if (ofn.lpTemplateName    != NULL) FreeAsciiString((char*)ofn.lpTemplateName);
@@ -230 +231 @@
   Win32WindowProc *wndproc;
 
-  if(lpofn->Flags & (OFN_ENABLETEMPLATE|OFN_ENABLETEMPLATEHANDLE)) {
-        return GetFileDialog95A(lpofn, OPEN_DIALOG);
+  if(lpofn->Flags & (OFN_ENABLETEMPLATE|OFN_ENABLETEMPLATEHANDLE))
+  {
+    return GetFileDialog95A(lpofn, OPEN_DIALOG);
   }
   COMDLG32_CHECKHOOK(lpofn, OFN_ENABLEHOOK, WNDPROC)
 
+  //@@@PH 1999/11/09 needs to be fixed
   return(O32_GetOpenFileName(lpofn));
 }
@@ -323 +326 @@
   ofn.lpstrCustomFilter = szCustFilter;
 
-  COMDLG32_CHECKHOOK((&ofn), OFN_ENABLEHOOK, WNDPROC)
-
-  bResult =  O32_GetOpenFileName(&ofn);
+  // call ascii variant of function
+  // @@@PH switch to ODIN_GetOpenFileNameA later
+  bResult = GetOpenFileNameA(&ofn);
 
   if (ofn.lpTemplateName    != NULL) FreeAsciiString((char*)ofn.lpTemplateName);