Update of /cvsroot/mahogany/M/include/gui
In directory usw-pr-cvs1:/tmp/cvs-serv3800/include/gui
Modified Files:
wxDialogLayout.h wxMDialogs.h
Log Message:
more Unicode fixes
Index: wxDialogLayout.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxDialogLayout.h,v
retrieving revision 1.62
retrieving revision 1.63
diff -b -u -2 -r1.62 -r1.63
--- wxDialogLayout.h 8 Sep 2002 19:23:08 -0000 1.62
+++ wxDialogLayout.h 12 Sep 2002 02:36:48 -0000 1.63
@@ -358,13 +358,13 @@
// a listbox with 3 standard buttons: Add, Modify and Delete
// (TODO: this is probably not flexible enough)
- wxListBox *CreateListbox(const char *label, wxControl *last);
+ wxListBox *CreateListbox(const wxChar *label, wxControl *last);
// a checkbox with a label
- wxCheckBox *CreateCheckBox(const char *label,
+ wxCheckBox *CreateCheckBox(const wxChar *label,
long widthMax,
wxControl *last);
// a label with three choices: No, Ask, Yes
- wxRadioBox *CreateActionChoice(const char *label,
+ wxRadioBox *CreateActionChoice(const wxChar *label,
long widthMax,
wxControl *last,
@@ -373,5 +373,5 @@
// a radiobox, the entries are taken from the label string which is
// composed as: "LABEL:entry1:entry2:entry3:...."
- wxRadioBox *CreateRadioBox(const char *label,
+ wxRadioBox *CreateRadioBox(const wxChar *label,
long widthMax,
wxControl *last,
@@ -380,5 +380,5 @@
// nRightMargin is the distance to the right edge of the panel to leave
// (0 means default)
- wxTextCtrl *CreateTextWithLabel(const char *label,
+ wxTextCtrl *CreateTextWithLabel(const wxChar *label,
long widthMax,
wxControl *last,
@@ -387,9 +387,9 @@
// create a simple static text control
- wxStaticText *CreateMessage(const char *label, wxControl *last);
+ wxStaticText *CreateMessage(const wxChar *label, wxControl *last);
// a combobox, the entries are taken from the label string which is
// composed as: "LABEL:entry1:entry2:entry3:...."
- wxComboBox *CreateComboBox(const char *label,
+ wxComboBox *CreateComboBox(const wxChar *label,
long widthMax,
wxControl *last,
@@ -402,5 +402,5 @@
// a choice control, the entries are taken from the label string which is
// composed as: "LABEL:entry1:entry2:entry3:...."
- wxChoice *CreateChoice(const char *label,
+ wxChoice *CreateChoice(const wxChar *label,
long widthMax,
wxControl *last,
@@ -422,5 +422,5 @@
// if ppButton != NULL, it's filled with the pointer to the ">>" browse
// button created by this function (it will be a wxFileBrowseButton)
- wxTextCtrl *CreateFileEntry(const char *label,
+ wxTextCtrl *CreateFileEntry(const wxChar *label,
long widthMax,
wxControl *last,
@@ -435,5 +435,5 @@
// if ppButton != NULL, it's filled with the pointer to the ">>" browse
// button created by this function (it will be wxFileOrDirBrowseButton)
- wxTextCtrl *CreateFileOrDirEntry(const char *label,
+ wxTextCtrl *CreateFileOrDirEntry(const wxChar *label,
long widthMax,
wxControl *last,
@@ -448,5 +448,5 @@
// create an entry with a button to browse for the directories
- wxTextCtrl *CreateDirEntry(const char *label,
+ wxTextCtrl *CreateDirEntry(const wxChar *label,
long widthMax,
wxControl *last,
@@ -458,10 +458,10 @@
}
// another entry with a browse button
- wxColorBrowseButton *CreateColorEntry(const char *label,
+ wxColorBrowseButton *CreateColorEntry(const wxChar *label,
long widthMax,
wxControl *last);
// creates a static bitmap with a label and a browse button
- wxStaticBitmap *CreateIconEntry(const char *label,
+ wxStaticBitmap *CreateIconEntry(const wxChar *label,
long widthMax,
wxControl *last,
@@ -470,5 +470,5 @@
// create a text control with a browse button allowing to browse for
// folders
- wxTextCtrl *CreateFolderEntry(const char *label,
+ wxTextCtrl *CreateFolderEntry(const wxChar *label,
long widthMax,
wxControl *last,
@@ -482,5 +482,5 @@
// create a text control with a browse button allowing to browse for
// fonts
- wxTextCtrl *CreateFontEntry(const char *label,
+ wxTextCtrl *CreateFontEntry(const wxChar *label,
long widthMax,
wxControl *last,
@@ -555,5 +555,5 @@
}
- wxTextCtrl *CreateEntryWithButton(const char *label,
+ wxTextCtrl *CreateEntryWithButton(const wxChar *label,
long widthMax,
wxControl *last,
@@ -563,5 +563,5 @@
// create a wxComboBox or wxChoice
wxControl *CreateComboBoxOrChoice(bool createCombobox,
- const char *label,
+ const wxChar *label,
long widthMax,
wxControl *last,
@@ -617,5 +617,5 @@
wxNotebookWithImages(const wxString& configPath,
wxWindow *parent,
- const char *aszImages[]);
+ const wxChar *aszImages[]);
virtual ~wxNotebookWithImages();
@@ -633,5 +633,5 @@
// they take an additional parent parameter
extern wxTextCtrl *CreateTextWithLabel(wxWindow *parent,
- const char *label,
+ const wxChar *label,
long widthMax,
wxControl *last,
@@ -640,5 +640,5 @@
extern wxRadioBox *CreateRadioBox(wxWindow *parent,
- const char *label,
+ const wxChar *label,
long widthMax,
wxControl *last,
@@ -646,5 +646,5 @@
extern wxTextCtrl *CreateEntryWithButton(wxWindow *parent,
- const char *label,
+ const wxChar *label,
long widthMax,
wxControl *last,
@@ -654,5 +654,5 @@
extern wxTextCtrl *CreateFileEntry(wxWindow *parent,
- const char *label,
+ const wxChar *label,
long widthMax,
wxControl *last,
Index: wxMDialogs.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxMDialogs.h,v
retrieving revision 1.104
retrieving revision 1.105
diff -b -u -2 -r1.104 -r1.105
--- wxMDialogs.h 8 Sep 2002 19:23:08 -0000 1.104
+++ wxMDialogs.h 12 Sep 2002 02:36:48 -0000 1.105
@@ -189,5 +189,5 @@
@return true if yes was selected
*/
-bool MDialog_YesNoDialog(char const *message,
+bool MDialog_YesNoDialog(wxChar const *message,
const wxWindow *parent = NULL,
wxChar const *title = MDIALOG_YESNOTITLE,
@@ -307,5 +307,5 @@
const wxWindow *parent = NULL,
const char *key = NULL,
- const char *def = NULL,
+ const wxChar *def = NULL,
bool passwordflag = false);
-------------------------------------------------------
In remembrance
www.osdn.com/911/
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
