[Aptitude-svn-commit] r3544 - in branches/aptitude-0.3/aptitude: . src

[Daniel Burrows]

Author: dburrows
Date: Sat Jul  2 14:55:00 2005
New Revision: 3544

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/ui.h
Log:
Use wstrings for the UI's interface.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sat Jul  2 14:55:00 2005
@@ -1,5 +1,9 @@
 2005-07-02  Daniel Burrows  <dburrows@debian.org>
 
+	* src/ui.h:
+
+	  Use wstrings in the UI's external interface.
+
 	* src/pkg_info_screen.cc:
 
 	  Update pkg_info_screen for wide characters.

Modified: branches/aptitude-0.3/aptitude/src/ui.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/ui.h	(original)
+++ branches/aptitude-0.3/aptitude/src/ui.h	Sat Jul  2 14:55:00 2005
@@ -137,12 +137,12 @@
  *  \param menudesc the description of the generated menu item
  *  \param tablabel the label of the corresponding tab
  */
-void add_main_widget(vscreen_widget *w, const std::string &menuref,
-		     const std::string &menudesc,
-		     const std::string &tablabel);
-void insert_main_widget(vscreen_widget *w, const std::string &menuref,
-			const std::string &menudesc,
-			const std::string &tablabel);
+void add_main_widget(vscreen_widget *w, const std::wstring &menuref,
+		     const std::wstring &menudesc,
+		     const std::wstring &tablabel);
+void insert_main_widget(vscreen_widget *w, const std::wstring &menuref,
+			const std::wstring &menudesc,
+			const std::wstring &tablabel);
 
 /** Returns the currently active main widget. */
 vscreen_widget *active_main_widget();
@@ -168,22 +168,22 @@
  *  \return the new download manager.
  */
 download_manager *gen_download_progress(bool force_noninvasive,
-					const std::string &title,
-					const std::string &longtitle,
-					const std::string &tablabel,
+					const std::wstring &title,
+					const std::wstring &longtitle,
+					const std::wstring &tablabel,
 					slot0arg abortslot);
 
 // Asks the user for simple input (the question will appear in a "minibuffer"
 // or in a dialog according to preferences)
 
-void prompt_string(const std::string &prompt,
-		   const std::string &text,
+void prompt_string(const std::wstring &prompt,
+		   const std::wstring &text,
 		   slotarg<sigc::slot1<void, string> > slot,
 		   slotarg<sigc::slot0<void> > cancel_slot,
 		   slotarg<sigc::slot1<void, string> > changed_slot,
 		   vs_editline::history_list *history);
 
-void prompt_yesno(const std::string &prompt,
+void prompt_yesno(const std::wstring &prompt,
 		  bool deflt,
 		  slot0arg yesslot,
 		  slot0arg noslot);
@@ -201,7 +201,7 @@
 		  slot0arg okslot,
 		  const style &st=style());
 
-void show_message(const std::string &msg,
+void show_message(const std::wstring &msg,
 		  slot0arg okslot=NULL,
 		  const style &st=style());