Changeset 235 for trunk/src/helpers/dialog.c

Timestamp:

Dec 12, 2002, 12:50:50 PM (23 years ago)

Author:

umoeller

Message:

Minor changes.

File:

• trunk/src/helpers/dialog.c (modified) (15 diffs)

trunk/src/helpers/dialog.c

@@ -92 +92 @@
 #include "helpers\gpih.h"
 #include "helpers\linklist.h"
+#include "helpers\nlscache.h"
 #include "helpers\standards.h"
 #include "helpers\stringh.h"
@@ -1497 +1498 @@
                     strhncpy0(szText2, pcszText, sizeof(szText2));
 
+                #ifdef DEBUG_DIALOG_WINDOWS
                 _Pmpf(("Crash creating control of class 0x%lX (%s), title 0x%lX (%s)",
                         szClass2,
                         szText2));
+                #endif
+
                 arc = ERROR_PROTECTION_VIOLATION;
             } END_CATCH();
@@ -1761 +1765 @@
                         LONG        cxWidestRowsMinBox = pOwningTable->cxMinBox; // pWidestRow->cxMinBox;
 
+                        #ifdef DEBUG_DIALOG_WINDOWS
                         _Pmpf(("  pWidestRow->cxMinBox %d", pWidestRow->cxMinBox));
                         _Pmpf(("  pOwningTable->cxMinBox %d", pOwningTable->cxMinBox));
+                        #endif
 
                         // now, since we're supposed to set our own CONTENT
@@ -1860 +1866 @@
                                     strhncpy0(szTemp, pControlDef->pcszText, sizeof(szTemp));
                                     strcpy(szTemp + 35, "...");
+
+                                    #ifdef DEBUG_DIALOG_WINDOWS
                                     _PmpfF(("   widest column is [%s] cxMinContent %d",
                                             szTemp,
                                             pCorrespondingColumn->cxMinContent));
+                                    #endif
                                 }
                             }
@@ -2242 +2251 @@
                     }
 
+                    #ifdef DEBUG_DIALOG_WINDOWS
                     _Pmpf(("    cxMax found is %d", cxMax));
+                    #endif
 
                     pTableDef->cxMinBox =   cxMax
@@ -2394 +2405 @@
  *
  *@@changed V1.0.0 (2002-08-18) [umoeller]: mostly rewritten for new algorithm
+ *@@changed V1.0.1 (2002-12-11) [umoeller]: added interface into nlsGetString
  */
 
@@ -2446 +2458 @@
                 // copy control fields
                 pColumn->pcszClass = pControlDef->pcszClass;
-                pColumn->pcszText = pControlDef->pcszText;
+
+                if (pControlDef->pcszText == LOAD_STRING)
+                    pColumn->pcszText = nlsGetString(pControlDef->usID);
+                            // V1.0.1 (2002-12-11) [umoeller]
+                else
+                    pColumn->pcszText = pControlDef->pcszText;
+
                 pColumn->flStyle = pControlDef->flStyle;
                 pColumn->usID = pControlDef->usID;
@@ -2569 +2587 @@
 
     if (!(pDlgData = NEW(DLGPRIVATE)))
-        return (ERROR_NOT_ENOUGH_MEMORY);
+        return ERROR_NOT_ENOUGH_MEMORY;
 
     ZERO(pDlgData);
@@ -3894 +3912 @@
         }
 
-    return (MBID_CANCEL);
+    return MBID_CANCEL;
 }
 
@@ -3966 +3984 @@
     {
         // SHOW DIALOG
-        return (dlghProcessMessageBox(hwndDlg,
-                                      ulAlarmFlag,
-                                      flFlags));
+        return dlghProcessMessageBox(hwndDlg,
+                                     ulAlarmFlag,
+                                     flFlags);
     }
 
@@ -3979 +3997 @@
                   MB_CANCEL | MB_MOVEABLE);
 
-    return (DID_CANCEL);
+    return DID_CANCEL;
 }
 
@@ -4119 +4137 @@
     xstrClear(&strTitle);
 
-    return (pszReturn);
+    return pszReturn;
 }
 
@@ -4313 +4331 @@
     }
 
-    return (hwndFound);
+    return hwndFound;
 }
 
@@ -4346 +4364 @@
                                (MPARAM)TRUE,        // upclick
                                0);
-                    return (TRUE);
+                    return TRUE;
                 }
             }
@@ -4354 +4372 @@
     }
 
-    return (FALSE);
+    return FALSE;
 }