Update of /cvsroot/mahogany/M/include/adb
In directory usw-pr-cvs1:/tmp/cvs-serv18973/include/adb

Modified Files:
        AdbDialogs.h AdbEntry.h 
Log Message:
preparations for ADB expansion enhancements: no real changes yet but the
code refactored to allow for them soon


Index: AdbDialogs.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/adb/AdbDialogs.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -b -u -2 -r1.2 -r1.3
--- AdbDialogs.h        25 Jul 1999 20:59:17 -0000      1.2
+++ AdbDialogs.h        16 Apr 2002 22:48:23 -0000      1.3
@@ -14,21 +14,40 @@
 #define _ADB_DIALOGS_H
 
-class wxWindow;
-class AdbEntryGroup;
+class WXDLLEXPORT wxWindow;
+class WXDLLEXPORT wxFrame;
 
-// ----------------------------------------------------------------------------
-// show dialog allowing the user to import any address book, return the name of
-// the native book used for import in the out parameter and return TRUE if the
-// import succeeded - FALSE and log the error message(s) if it failed.
-// ----------------------------------------------------------------------------
+class AdbEntryGroup;
+class ArrayAdbElements;
+class ArrayAdbEntries;
 
+/**
+  Show the dialog allowing the user to import any address book, return the name
+  of the native book used for import in the out parameter and return TRUE if
+  the import succeeded - FALSE and log the error message(s) if it failed.
+ */
 extern bool AdbShowImportDialog(wxWindow *parent = NULL,
                                 String *nameOfNativeAdb = NULL);
 
-// ----------------------------------------------------------------------------
-// export the given address book, returns TRUE on success
-// ----------------------------------------------------------------------------
+/**
+  Show the dialog allowing the user to export the given address book
 
+  @return TRUE on success
+ */
 extern bool AdbShowExportDialog(const AdbEntryGroup& group);
+
+/**
+  Show the ADB expansion dialog allowing the user to choose one of the entries
+  or groups matched by the expansion.
+
+  @param aEverything the array of groups and entries to show initially
+  @param aMoreEntries the array of entries to show if the user chooses
+                      to see all possible matches
+  @param parent the parent frame
+  @return the index in the concatenation of aEverything and aMoreEntries arrays
+          or -1 if the dialog was cancelled
+ */
+extern int AdbShowExpandDialog(ArrayAdbElements& aEverything,
+                               ArrayAdbEntries& aMoreEntries,
+                               wxFrame *parent);
 
 #endif // _ADB_DIALOGS_H

Index: AdbEntry.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/adb/AdbEntry.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -b -u -2 -r1.20 -r1.21
--- AdbEntry.h  14 Apr 2002 09:03:56 -0000      1.20
+++ AdbEntry.h  16 Apr 2002 22:48:23 -0000      1.21
@@ -78,5 +78,8 @@
   AdbField_O_AddrPageLast,
 
-  AdbField_Max = AdbField_O_AddrPageLast
+  // priority for expansion
+  AdbField_ExpandPriority,
+
+  AdbField_Max = AdbField_ExpandPriority
 };
 


_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates

Reply via email to