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

Modified Files:
        wxComposeView.h 
Log Message:
updated the composer controls layout to include expand/delete/add buttons
according to the recent discussion on m-users


Index: wxComposeView.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxComposeView.h,v
retrieving revision 1.81
retrieving revision 1.82
diff -b -u -2 -r1.81 -r1.82
--- wxComposeView.h     30 Mar 2002 00:40:09 -0000      1.81
+++ wxComposeView.h     11 Apr 2002 23:15:48 -0000      1.82
@@ -39,6 +39,6 @@
 // ----------------------------------------------------------------------------
 
-class wxNewAddressTextCtrl;
-class wxRcptControls;
+class wxRcptMainControl;
+class wxRcptExtraControl;
 class wxComposeView;
 class wxEnhancedPanel;
@@ -55,5 +55,5 @@
 #include <wx/dynarray.h>
 
-WX_DEFINE_ARRAY(wxRcptControls *, ArrayRcptControls);
+WX_DEFINE_ARRAY(wxRcptExtraControl *, ArrayRcptControls);
 
 // ----------------------------------------------------------------------------
@@ -132,5 +132,5 @@
 
    /// expands an address
-   virtual RecipientType ExpandRecipient(String *text, bool quiet = false);
+   virtual RecipientType ExpandRecipient(String *text);
 
    /// get from value (empty means default)
@@ -210,7 +210,4 @@
    //@}
 
-   /// for wxAddressTextCtrl usage: remember last focused field
-   void SetLastAddressEntry(int field) { m_indexLast = field; }
-
    /// is the control with this index enabled?
    bool IsRecipientEnabled(size_t index) const;
@@ -339,17 +336,4 @@
    };
 
-   // create a horz sizer containing the given control and the text ctrl
-   // (pointer to which will be saved in the provided variable if not NULL)
-   // with the specified id
-   wxSizer *CreateSizerWithText(wxControl *control,
-                                wxTextCtrl **ppText = NULL,
-                                TextField tf = TextField_Normal,
-                                wxWindow *parent = NULL);
-
-   // create a sizer containing a label and a text ctrl
-   wxSizer *CreateSizerWithTextAndLabel(const wxString& label,
-                                        wxTextCtrl **ppText = NULL,
-                                        TextField tf = TextField_Normal);
-
    // add a place holder to the recipients sizer
    void CreatePlaceHolder();
@@ -400,6 +384,6 @@
    wxTextCtrl *m_txtSubject;
 
-      /// the address field
-   wxNewAddressTextCtrl *m_txtRecipient;
+      /// the main recipient field
+   wxRcptMainControl *m_rcptMain;
 
       /// the sizer containing all recipients
@@ -410,5 +394,5 @@
 
       /// the additional recipients: array of corresponding controls
-   ArrayRcptControls m_rcptControls;
+   ArrayRcptControls m_rcptExtra;
 
       /// the editor where the message is really edited
@@ -416,10 +400,4 @@
 
    //@}
-
-   /// the last focused address field: index of -1 means m_txtRecipient itself
-   int m_indexLast;
-
-   /// the index of the next text control to create (-1 initially)
-   int m_indexRcpt;
 
    /// the type of the last recipient


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

Reply via email to