Update of /cvsroot/mahogany/M/src/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31255/src/gui
Modified Files:
MImport.cpp Mdnd.cpp wxAttachDialog.cpp wxBrowseButton.cpp
wxComposeView.cpp wxDialogLayout.cpp wxFiltersDialog.cpp
wxFolderMenu.cpp wxFolderTree.cpp wxFolderView.cpp
wxHeadersDialogs.cpp wxIconManager.cpp wxMApp.cpp
wxMDialogs.cpp wxMFolderDialogs.cpp wxMFrame.cpp
wxMIMETreeDialog.cpp wxMainFrame.cpp wxMessageView.cpp
wxMimeDialog.cpp wxModulesDlg.cpp wxMsgCmdProc.cpp
wxOptionsDlg.cpp wxSearchDialog.cpp wxSubfoldersDialog.cpp
wxTemplateDialog.cpp wxTextDialog.cpp wxWizards.cpp
wxllist.cpp wxlwindow.cpp
Log Message:
_T("") -> wxEmptyString
Index: MImport.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/MImport.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -b -u -2 -r1.22 -r1.23
--- MImport.cpp 11 Oct 2003 23:13:46 -0000 1.22
+++ MImport.cpp 16 Jan 2006 20:32:27 -0000 1.23
@@ -317,5 +317,5 @@
MF_GROUP,
0,
- _T(""),
+ wxEmptyString,
FALSE
);
Index: Mdnd.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/Mdnd.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -b -u -2 -r1.18 -r1.19
--- Mdnd.cpp 11 Oct 2003 23:13:46 -0000 1.18
+++ Mdnd.cpp 16 Jan 2006 20:32:27 -0000 1.19
@@ -118,5 +118,5 @@
if ( GetFrame() )
{
- GetFrame()->SetStatusText(_T(""));
+ GetFrame()->SetStatusText(wxEmptyString);
}
}
Index: wxAttachDialog.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxAttachDialog.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -b -u -2 -r1.9 -r1.10
--- wxAttachDialog.cpp 2 Jul 2004 21:37:10 -0000 1.9
+++ wxAttachDialog.cpp 16 Jan 2006 20:32:27 -0000 1.10
@@ -136,5 +136,5 @@
// first the buttons and the optional checkbox
- wxStaticBox *box = CreateStdButtonsAndBox(_T(""));
+ wxStaticBox *box = CreateStdButtonsAndBox(wxEmptyString);
if ( m_allowDisable )
Index: wxBrowseButton.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxBrowseButton.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -b -u -2 -r1.41 -r1.42
--- wxBrowseButton.cpp 24 Nov 2005 13:30:53 -0000 1.41
+++ wxBrowseButton.cpp 16 Jan 2006 20:32:27 -0000 1.42
@@ -157,5 +157,5 @@
style |= wxFILE_MUST_EXIST;
- wxFileDialog dialog(GetFrame(this), _T(""),
+ wxFileDialog dialog(GetFrame(this), wxEmptyString,
strLastDir, strLastFile,
wxGetTranslation(wxALL_FILES),
Index: wxComposeView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxComposeView.cpp,v
retrieving revision 1.394
retrieving revision 1.395
diff -b -u -2 -r1.394 -r1.395
--- wxComposeView.cpp 15 Jan 2006 19:53:24 -0000 1.394
+++ wxComposeView.cpp 16 Jan 2006 20:32:27 -0000 1.395
@@ -429,5 +429,5 @@
: wxTextCtrl(parent,
-1,
- _T(""),
+ wxEmptyString,
wxDefaultPosition,
wxDefaultSize,
@@ -1203,5 +1203,5 @@
// clear the entry zone as recipient(s) were moved elsewhere
- GetText()->SetValue(_T(""));
+ GetText()->SetValue(wxEmptyString);
}
@@ -1526,5 +1526,5 @@
// create dummy params object as we need one for CreateNewMessage()
- MailFolder::Params params(_T(""));
+ MailFolder::Params params(wxEmptyString);
wxComposeView *cv = (wxComposeView *)CreateNewMessage(params, profile);
@@ -1854,5 +1854,5 @@
wxSizer *sizerFrom = new wxBoxSizer(wxHORIZONTAL);
- m_txtFrom = new wxTextCtrl(m_panel, -1, _T(""));
+ m_txtFrom = new wxTextCtrl(m_panel, -1, wxEmptyString);
sizerFrom->Add(m_txtFrom, 1, wxALIGN_CENTRE_VERTICAL);
SetTextAppearance(m_txtFrom);
@@ -2013,5 +2013,5 @@
wxString str;
msg->WriteToString(str);
- m_composeView->InsertData(wxStrdup(str), str.Length(),
_T("message/rfc822"), _T(""));
+ m_composeView->InsertData(wxStrdup(str), str.Length(),
_T("message/rfc822"), wxEmptyString);
}
return true;
@@ -3113,5 +3113,5 @@
{
// indicate the current state in the status bar
- SetStatusText(enable ? _T("") : _("RO"), 1);
+ SetStatusText(enable ? wxEmptyString : _("RO"), 1);
m_editor->Enable(enable);
@@ -3588,5 +3588,5 @@
// '%s' with the file name or add the file name at the end if
// there is no '%s'
- wxFileType::MessageParameters params(tmpFileName.GetName(), _T(""));
+ wxFileType::MessageParameters params(tmpFileName.GetName(),
wxEmptyString);
String command = wxFileType::ExpandCommand(extEdit, params);
@@ -5090,5 +5090,5 @@
wxString filename;
- bool cont = dir.GetFirst(&filename, _T(""), wxDIR_FILES);
+ bool cont = dir.GetFirst(&filename, wxEmptyString, wxDIR_FILES);
while ( cont )
{
Index: wxDialogLayout.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxDialogLayout.cpp,v
retrieving revision 1.119
retrieving revision 1.120
diff -b -u -2 -r1.119 -r1.120
--- wxDialogLayout.cpp 20 Jul 2005 10:42:16 -0000 1.119
+++ wxDialogLayout.cpp 16 Jan 2006 20:32:27 -0000 1.120
@@ -233,5 +233,5 @@
c->right.SameAs(parent, wxRight, LAYOUT_X_MARGIN + nRightMargin);
c->height.AsIs();
- wxTextCtrl *pText = new wxTextCtrl(parent, -1, _T(""), wxDefaultPosition,
+ wxTextCtrl *pText = new wxTextCtrl(parent, -1, wxEmptyString,
wxDefaultPosition,
wxDefaultSize, style);
pText->SetConstraints(c);
@@ -297,5 +297,5 @@
// choice) means that they should be disabled but this is really just
// a dirty hack
- wxRadioBox *radiobox = new wxRadioBox(parent, -1, _T(""),
+ wxRadioBox *radiobox = new wxRadioBox(parent, -1, wxEmptyString,
wxDefaultPosition, wxDefaultSize,
choices,
@@ -790,5 +790,5 @@
wxALIGN_RIGHT);
- wxXFaceButton *btn = new wxXFaceButton(GetCanvas(), id, _T(""));
+ wxXFaceButton *btn = new wxXFaceButton(GetCanvas(), id, wxEmptyString);
// for the label
@@ -876,5 +876,5 @@
if ( createCombobox )
{
- combobox = new wxComboBox(GetCanvas(), -1, _T(""),
+ combobox = new wxComboBox(GetCanvas(), -1, wxEmptyString,
wxDefaultPosition, wxDefaultSize,
choices,
Index: wxFiltersDialog.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxFiltersDialog.cpp,v
retrieving revision 1.128
retrieving revision 1.129
diff -b -u -2 -r1.128 -r1.129
--- wxFiltersDialog.cpp 4 Jul 2005 12:03:41 -0000 1.128
+++ wxFiltersDialog.cpp 16 Jan 2006 20:32:27 -0000 1.129
@@ -495,5 +495,5 @@
MFDialogTest test = GetTest();
if ( ! FilterTestNeedsArgument(test) )
- return _T(""); // Don't return the value if it won't be used
+ return wxEmptyString; // Don't return the value if it won't be used
switch ( test )
@@ -513,5 +513,5 @@
case ORC_MF_Recent: return _T("R");
}
- CHECK( false, _T(""), _T("Invalid test message flag") );
+ CHECK( false, wxEmptyString, _T("Invalid test message flag") );
// Argument is used, but not for spam or message flag
@@ -615,5 +615,5 @@
m_choiceFlags = new wxChoice(parent, -1, wxDefaultPosition,
wxDefaultSize, ORC_Msg_Flag_Count, msgflagsTrans);
- m_Argument = new wxTextCtrl(parent,-1, _T(""), wxDefaultPosition);
+ m_Argument = new wxTextCtrl(parent,-1, wxEmptyString, wxDefaultPosition);
wxString whereTrans[ORC_WhereCount];
@@ -927,5 +927,5 @@
MFDialogAction action = GetAction();
if ( ! FilterActionNeedsArg(action) )
- return _T(""); // Don't return the value if it won't be used
+ return wxEmptyString; // Don't return the value if it won't be used
// message flags are decoded separately
@@ -941,5 +941,5 @@
// case OAC_MF_Recent: return _T("R"); // can't set
}
- CHECK( false, _T(""), _T("Invalid action message flag") );
+ CHECK( false, wxEmptyString, _T("Invalid action message flag") );
}
@@ -1039,5 +1039,5 @@
OAC_Msg_Flag_Count, msgflagsTrans);
- m_Argument = new wxTextCtrl(parent, -1, _T(""));
+ m_Argument = new wxTextCtrl(parent, -1, wxEmptyString);
m_btnFolder = new wxFolderBrowseButton(m_Argument, parent);
m_btnColour = new wxColorBrowseButton(m_Argument, parent);
@@ -1173,5 +1173,5 @@
// the control allowing to edit directly the filter program
m_textProgram = new wxTextCtrl(this, Text_Program,
- _T(""),
+ wxEmptyString,
wxDefaultPosition, wxDefaultSize,
wxTE_MULTILINE);
@@ -1580,5 +1580,5 @@
wxLayoutConstraints *c;
- wxStaticBox *box = CreateStdButtonsAndBox(_T(""), FALSE,
+ wxStaticBox *box = CreateStdButtonsAndBox(wxEmptyString, FALSE,
MH_DIALOG_FILTERS);
@@ -1826,5 +1826,5 @@
_T("FilterRenameWarn"));
#else
- MFolder_obj folderRoot(_T(""));
+ MFolder_obj folderRoot(wxEmptyString);
RenameAFilterTraversal traverse(folderRoot, name, nameNew);
traverse.Traverse();
@@ -2543,5 +2543,5 @@
M_MSGBOX_FILTER_REPLACE) )
{
- return _T("");
+ return wxEmptyString;
}
}
Index: wxFolderMenu.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxFolderMenu.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -b -u -2 -r1.13 -r1.14
--- wxFolderMenu.cpp 11 Oct 2003 23:13:47 -0000 1.13
+++ wxFolderMenu.cpp 16 Jan 2006 20:32:27 -0000 1.14
@@ -188,5 +188,5 @@
{
// get the root folder
- MFolder_obj folder(_T(""));
+ MFolder_obj folder(wxEmptyString);
// and add all of its children to the menu recursively
Index: wxFolderTree.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxFolderTree.cpp,v
retrieving revision 1.237
retrieving revision 1.238
diff -b -u -2 -r1.237 -r1.238
--- wxFolderTree.cpp 24 Nov 2005 13:30:53 -0000 1.237
+++ wxFolderTree.cpp 16 Jan 2006 20:32:27 -0000 1.238
@@ -538,5 +538,5 @@
if ( isRoot )
{
- Append(ShowHidden, _("Show &hidden folders"), _T(""), true);
+ Append(ShowHidden, _("Show &hidden folders"), wxEmptyString, true);
}
@@ -961,5 +961,5 @@
else
{
- m_tree->SetOpenFolderName(_T(""));
+ m_tree->SetOpenFolderName(wxEmptyString);
}
}
@@ -1287,5 +1287,5 @@
folder->GetFullName().c_str());
- m_tree->SetOpenFolderName(_T(""));
+ m_tree->SetOpenFolderName(wxEmptyString);
return true;
@@ -1802,5 +1802,5 @@
// create the root item
- MFolder *folderRoot = MFolder::Get(_T(""));
+ MFolder *folderRoot = MFolder::Get(wxEmptyString);
m_current = new wxFolderTreeNode(this, folderRoot);
@@ -3226,5 +3226,5 @@
if ( m_openFolderName == event.GetFolder()->GetName() )
{
- SetOpenFolderName(_T(""));
+ SetOpenFolderName(wxEmptyString);
}
}
@@ -3634,5 +3634,5 @@
_T("bad number of icon names") );
- CHECK( n < WXSIZEOF(aszImages), _T(""), _T("invalid icon index") );
+ CHECK( n < WXSIZEOF(aszImages), wxEmptyString, _T("invalid icon index") );
return aszImages[n];
Index: wxFolderView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxFolderView.cpp,v
retrieving revision 1.671
retrieving revision 1.672
diff -b -u -2 -r1.671 -r1.672
--- wxFolderView.cpp 30 Jun 2005 14:21:12 -0000 1.671
+++ wxFolderView.cpp 16 Jan 2006 20:32:27 -0000 1.672
@@ -1944,5 +1944,5 @@
// threading
menu.AppendSeparator();
- menu.Append(WXMENU_FVIEW_TOGGLE_THREAD, _("&Thread messages"), _T(""),
TRUE);
+ menu.Append(WXMENU_FVIEW_TOGGLE_THREAD, _("&Thread messages"),
wxEmptyString, TRUE);
menu.Append(WXMENU_FVIEW_CONFIG_THREAD, _("&Configure threading..."));
@@ -1957,6 +1957,6 @@
case WXFLC_FROM:
menu.AppendSeparator();
- menu.Append(WXMENU_FVIEW_FROM_NAMES_ONLY, _("&Show names only"),
_T(""), TRUE);
- menu.Append(WXMENU_FVIEW_TO_IN_FROM, _("Show \"&To\" address"),
_T(""), TRUE);
+ menu.Append(WXMENU_FVIEW_FROM_NAMES_ONLY, _("&Show names only"),
wxEmptyString, TRUE);
+ menu.Append(WXMENU_FVIEW_TO_IN_FROM, _("Show \"&To\" address"),
wxEmptyString, TRUE);
if ( READ_CONFIG(profile, MP_FVIEW_NAMES_ONLY) )
@@ -1973,9 +1973,9 @@
case WXFLC_SIZE:
menu.AppendSeparator();
- menu.Append(WXMENU_FVIEW_SIZE_AUTO, _("&Automatic units"), _T(""),
wxITEM_RADIO);
- menu.Append(WXMENU_FVIEW_SIZE_AUTOBYTES, _("Automatic b&yte units"),
_T(""), wxITEM_RADIO);
- menu.Append(WXMENU_FVIEW_SIZE_BYTES, _("Use &bytes"), _T(""),
wxITEM_RADIO);
- menu.Append(WXMENU_FVIEW_SIZE_KBYTES, _("Use &Kbytes"), _T(""),
wxITEM_RADIO);
- menu.Append(WXMENU_FVIEW_SIZE_MBYTES, _("Use &Mbytes"), _T(""),
wxITEM_RADIO);
+ menu.Append(WXMENU_FVIEW_SIZE_AUTO, _("&Automatic units"),
wxEmptyString, wxITEM_RADIO);
+ menu.Append(WXMENU_FVIEW_SIZE_AUTOBYTES, _("Automatic b&yte units"),
wxEmptyString, wxITEM_RADIO);
+ menu.Append(WXMENU_FVIEW_SIZE_BYTES, _("Use &bytes"), wxEmptyString,
wxITEM_RADIO);
+ menu.Append(WXMENU_FVIEW_SIZE_KBYTES, _("Use &Kbytes"),
wxEmptyString, wxITEM_RADIO);
+ menu.Append(WXMENU_FVIEW_SIZE_MBYTES, _("Use &Mbytes"),
wxEmptyString, wxITEM_RADIO);
{
@@ -2712,5 +2712,5 @@
wxLogStatus(GetFrame(this), _("Now sorting by %s%s"),
GetColumnName(col).Lower().c_str(),
- reverse ? _(" (reverse)") : _T(""));
+ reverse ? _(" (reverse)") : wxEmptyString);
profile->writeEntry(MP_MSGS_SORTBY, sortOrder);
Index: wxHeadersDialogs.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxHeadersDialogs.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -b -u -2 -r1.51 -r1.52
--- wxHeadersDialogs.cpp 11 Jul 2005 22:43:24 -0000 1.51
+++ wxHeadersDialogs.cpp 16 Jan 2006 20:32:27 -0000 1.52
@@ -452,5 +452,5 @@
for ( size_t header = 0; header < Header_Max; header++ )
{
- def = m_profile->readEntry(ms_profileNamesDefault[header], _T(""));
+ def = m_profile->readEntry(ms_profileNamesDefault[header],
wxEmptyString);
m_textvalues[header]->SetValue(def);
@@ -1057,5 +1057,5 @@
const String name = pathBase + gs_customHeaderSubgroups[type];
const String value = strutil_flatten_array(headersFor[type]);
- if ( m_profile->readEntry(name, _T("")) != value )
+ if ( m_profile->readEntry(name, wxEmptyString) != value )
m_profile->writeEntry(name, value);
}
@@ -1190,5 +1190,5 @@
path << CUSTOM_HEADERS_PREFIX << gs_customHeaderSubgroups[type];
wxArrayString
- headerNames = strutil_restore_array(profile->readEntry(path, _T("")));
+ headerNames = strutil_restore_array(profile->readEntry(path,
wxEmptyString));
if ( headerNames.Index(*headerName) == wxNOT_FOUND )
{
@@ -1240,5 +1240,5 @@
// get the names of custom headers for this type
String hdrs
- = profile->readEntry(pathBase + gs_customHeaderSubgroups[type],
_T(""));
+ = profile->readEntry(pathBase + gs_customHeaderSubgroups[type],
wxEmptyString);
// if we have any ...
@@ -1257,5 +1257,5 @@
names->Add(name);
- values->Add(profile->readEntry(path, _T("")));
+ values->Add(profile->readEntry(path, wxEmptyString));
if ( types )
types->Add(type);
Index: wxIconManager.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxIconManager.cpp,v
retrieving revision 1.109
retrieving revision 1.110
diff -b -u -2 -r1.109 -r1.110
--- wxIconManager.cpp 9 Apr 2005 18:55:42 -0000 1.109
+++ wxIconManager.cpp 16 Jan 2006 20:32:27 -0000 1.110
@@ -91,5 +91,5 @@
/// the path where the last icon was found
-wxString wxIconManager::ms_IconPath = _T("");
+wxString wxIconManager::ms_IconPath = wxEmptyString;
/// valid filename extensions for icon files
Index: wxMApp.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMApp.cpp,v
retrieving revision 1.301
retrieving revision 1.302
diff -b -u -2 -r1.301 -r1.302
--- wxMApp.cpp 27 Nov 2005 21:10:34 -0000 1.301
+++ wxMApp.cpp 16 Jan 2006 20:32:27 -0000 1.302
@@ -792,5 +792,5 @@
if ( wxPMessageBoxIsDisabled(path) )
{
- if ( !MDialog_YesNoDialog(_T(""), NULL, _T(""),
+ if ( !MDialog_YesNoDialog(wxEmptyString, NULL, wxEmptyString,
M_DLG_NO_DEFAULT, M_MSGBOX_CONFIRM_EXIT) )
{
@@ -2505,5 +2505,5 @@
// try to find another encoding
wxFontEncoding encAlt;
- if ( wxFontMapper::Get()->GetAltForEncoding(*enc, &encAlt, _T(""),
mayAskUser) )
+ if ( wxFontMapper::Get()->GetAltForEncoding(*enc, &encAlt,
wxEmptyString, mayAskUser) )
{
// translate the text (if any) to the equivalent encoding
@@ -2664,5 +2664,5 @@
wxClient client;
- wxConnectionBase *conn = client.MakeConnection(_T(""), GetIPCSocket(),
IPC_TOPIC);
+ wxConnectionBase *conn = client.MakeConnection(wxEmptyString,
GetIPCSocket(), IPC_TOPIC);
if ( !conn )
{
Index: wxMDialogs.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMDialogs.cpp,v
retrieving revision 1.422
retrieving revision 1.423
diff -b -u -2 -r1.422 -r1.423
--- wxMDialogs.cpp 17 Jul 2005 22:57:46 -0000 1.422
+++ wxMDialogs.cpp 16 Jan 2006 20:32:27 -0000 1.423
@@ -496,5 +496,5 @@
if(passwordflag)
{
- m_passwd = new wxTextCtrl(this, -1, _T(""),
+ m_passwd = new wxTextCtrl(this, -1, wxEmptyString,
wxPoint(x + widthLabel + LAYOUT_X_MARGIN, y),
wxSize(widthText, heightText),
@@ -504,5 +504,5 @@
else
{
- m_text = new wxPTextEntry(strConfigPath, this, -1, _T(""),
+ m_text = new wxPTextEntry(strConfigPath, this, -1, wxEmptyString,
wxPoint(x + widthLabel + LAYOUT_X_MARGIN, y),
wxSize(widthText, heightText));
@@ -1443,5 +1443,5 @@
if ( config )
{
- wxString folderName = config->Read(GetConfigPath(), _T(""));
+ wxString folderName = config->Read(GetConfigPath(), wxEmptyString);
if ( !folderName.empty() )
{
@@ -1561,5 +1561,5 @@
wxDateTextCtrl(wxWindow *parent) : wxTextCtrl(parent,-1)
{
- m_menu = new wxMenu(_T(""), wxMENU_TEAROFF);
+ m_menu = new wxMenu(wxEmptyString, wxMENU_TEAROFF);
m_menu->SetTitle(_("Format Specifiers:"));
for ( int n = 0; n < NUM_DATE_FMTS;n++ )
@@ -1699,5 +1699,5 @@
stattext->SetConstraints(c);
- m_statExample = new wxStaticText(this, -1, _T(""));
+ m_statExample = new wxStaticText(this, -1, wxEmptyString);
c = new wxLayoutConstraints;
c->left.RightOf(stattext);
@@ -1797,5 +1797,5 @@
{
bmp = wxBitmap(((wxMApp *)mApplication)->GetStdIcon(wxICON_HAND));
- m_XFace = _T("");
+ m_XFace = wxEmptyString;
}
else
@@ -1870,5 +1870,5 @@
- m_Button = new wxXFaceButton(this, -1, _T(""));
+ m_Button = new wxXFaceButton(this, -1, wxEmptyString);
c = new wxLayoutConstraints;
c->left.SameAs(box, wxLeft, 2*LAYOUT_X_MARGIN);
@@ -1978,6 +1978,6 @@
if(profile->HasEntry(keys[idx])) // don't work on inherited ones
{
- wxString val = profile->readEntry(keys[idx], _T(""));
- if(val != _T(""))
+ wxString val = profile->readEntry(keys[idx], wxEmptyString);
+ if(val != wxEmptyString)
{
p->writeEntry(MP_CRYPTALGO, m_OldUC);
@@ -2117,5 +2117,5 @@
label->SetConstraints(c);
- m_oPassword = new wxTextCtrl(this, -1, _T(""),
+ m_oPassword = new wxTextCtrl(this, -1, wxEmptyString,
wxDefaultPosition, wxDefaultSize,
wxTE_PASSWORD);
@@ -2142,5 +2142,5 @@
m_text1->SetConstraints(c);
- m_nPassword = new wxTextCtrl(this, -1, _T(""),
+ m_nPassword = new wxTextCtrl(this, -1, wxEmptyString,
wxDefaultPosition, wxDefaultSize,
wxTE_PASSWORD);
@@ -2160,5 +2160,5 @@
m_text2->SetConstraints(c);
- m_nPassword2 = new wxTextCtrl(this, -1, _T(""),
+ m_nPassword2 = new wxTextCtrl(this, -1, wxEmptyString,
wxDefaultPosition, wxDefaultSize,
wxTE_PASSWORD);
@@ -2230,5 +2230,5 @@
if(oldPw != newPw || oldUseCrypt != newUseCrypt)
{
- MFolder_obj folderRoot(_T(""));
+ MFolder_obj folderRoot(wxEmptyString);
ChangePasswdTraversal traverse(folderRoot,
oldUseCrypt, oldPw,
@@ -2478,5 +2478,5 @@
wxArrayString entries;
- dlg.AddAllEntries(config, _T(""), entries);
+ dlg.AddAllEntries(config, wxEmptyString, entries);
long dummy;
@@ -3145,5 +3145,5 @@
// and then remove it
- m_labelValue->SetLabel(_T(""));
+ m_labelValue->SetLabel(wxEmptyString);
m_frame->CentreOnParent();
@@ -3255,5 +3255,5 @@
label->SetConstraints(c);
- m_text1 = new wxTextCtrl(this, -1, _T(""));
+ m_text1 = new wxTextCtrl(this, -1, wxEmptyString);
c = new wxLayoutConstraints;
c->left.RightOf(label, 2*LAYOUT_X_MARGIN);
@@ -3271,5 +3271,5 @@
label->SetConstraints(c);
- m_text2 = new wxTextCtrl(this, -1, _T(""),
+ m_text2 = new wxTextCtrl(this, -1, wxEmptyString,
wxDefaultPosition, wxDefaultSize,
textStyle);
@@ -3308,5 +3308,5 @@
wxWindow *parent)
{
- MText2Dialog dlg(parent, _T("Text2Dialog"), message, caption, _T(""),
+ MText2Dialog dlg(parent, _T("Text2Dialog"), message, caption, wxEmptyString,
prompt1, value1, prompt2, value2);
Index: wxMFolderDialogs.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMFolderDialogs.cpp,v
retrieving revision 1.193
retrieving revision 1.194
diff -b -u -2 -r1.193 -r1.194
--- wxMFolderDialogs.cpp 9 Jul 2005 23:50:39 -0000 1.193
+++ wxMFolderDialogs.cpp 16 Jan 2006 20:32:27 -0000 1.194
@@ -645,5 +645,5 @@
{
// no folder specified, it can be changed
- m_folderName = new wxTextCtrl(panel, Folder_Name, _T(""));
+ m_folderName = new wxTextCtrl(panel, Folder_Name, wxEmptyString);
}
@@ -668,5 +668,5 @@
pLabel->SetConstraints(c);
- m_parentName = new wxTextCtrl(panel, -1, _T(""));
+ m_parentName = new wxTextCtrl(panel, -1, wxEmptyString);
if ( m_parentFolder )
{
@@ -768,5 +768,5 @@
{
// take the root by default
- m_parentFolder = MFolder::Get(_T(""));
+ m_parentFolder = MFolder::Get(wxEmptyString);
}
@@ -1988,5 +1988,5 @@
{
// this is only for news
- m_newsgroup->SetValue(_T(""));
+ m_newsgroup->SetValue(wxEmptyString);
}
@@ -1994,5 +1994,5 @@
{
// this is only for files
- m_path->SetValue(_T(""));
+ m_path->SetValue(wxEmptyString);
}
@@ -2000,7 +2000,7 @@
{
// this is for everything except local folders
- m_server->SetValue(_T(""));
- m_login->SetValue(_T(""));
- m_password->SetValue(_T(""));
+ m_server->SetValue(wxEmptyString);
+ m_login->SetValue(wxEmptyString);
+ m_password->SetValue(wxEmptyString);
}
@@ -2008,5 +2008,5 @@
{
// this is only for IMAP
- m_mailboxname->SetValue(_T(""));
+ m_mailboxname->SetValue(wxEmptyString);
}
Index: wxMFrame.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMFrame.cpp,v
retrieving revision 1.176
retrieving revision 1.177
diff -b -u -2 -r1.176 -r1.177
--- wxMFrame.cpp 24 Nov 2005 13:30:53 -0000 1.176
+++ wxMFrame.cpp 16 Jan 2006 20:32:27 -0000 1.177
@@ -275,5 +275,5 @@
wxMenu *fileMenu = new wxMenu();
#else
- wxMenu *fileMenu = new wxMenu(_T(""), wxMENU_TEAROFF);
+ wxMenu *fileMenu = new wxMenu(wxEmptyString, wxMENU_TEAROFF);
#endif
@@ -642,5 +642,5 @@
: _("Choose file to import settings
from"),
this,
- _T(""), _T(""), _T(""), _T(""),
+ wxEmptyString, wxEmptyString, wxEmptyString,
wxEmptyString,
doExport // true => save, false => load
);
@@ -933,5 +933,5 @@
{
// can't keep this one
- profile->writeEntry(MP_CURRENT_IDENTITY, _T(""));
+ profile->writeEntry(MP_CURRENT_IDENTITY, wxEmptyString);
}
Index: wxMIMETreeDialog.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMIMETreeDialog.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -b -u -2 -r1.5 -r1.6
--- wxMIMETreeDialog.cpp 1 Oct 2004 00:23:25 -0000 1.5
+++ wxMIMETreeDialog.cpp 16 Jan 2006 20:32:27 -0000 1.6
@@ -163,5 +163,5 @@
{
// this is a big ugly: we need to get just the primary MIME type
- MimeType mt((MimeType::Primary)i, _T(""));
+ MimeType mt((MimeType::Primary)i, wxEmptyString);
wxIcon icon = iconManager->GetIconFromMimeType(mt.GetType());
imaglist->Add(icon);
@@ -199,5 +199,5 @@
// the box containing the tree control
- wxStaticBox *box = new wxStaticBox(this, wxID_ANY, _T(""));
+ wxStaticBox *box = new wxStaticBox(this, wxID_ANY, wxEmptyString);
wxStaticBoxSizer *sizerBox = new wxStaticBoxSizer(box, wxHORIZONTAL);
sizerBox->Add(m_treectrl, 1, wxEXPAND | wxALL, LAYOUT_MARGIN);
@@ -343,5 +343,5 @@
// now copy them from there to the folder
- MFolder_obj folderSrc(MFolder::CreateTempFile(_T(""), filename));
+ MFolder_obj folderSrc(MFolder::CreateTempFile(wxEmptyString, filename));
if ( folderSrc )
{
@@ -383,5 +383,5 @@
(
_("Choose directory to save attachments to:"),
- _T(""),
+ wxEmptyString,
this,
_T("MimeSave")
Index: wxMainFrame.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMainFrame.cpp,v
retrieving revision 1.193
retrieving revision 1.194
diff -b -u -2 -r1.193 -r1.194
--- wxMainFrame.cpp 4 Jan 2006 06:38:46 -0000 1.193
+++ wxMainFrame.cpp 16 Jan 2006 20:32:27 -0000 1.194
@@ -936,5 +936,5 @@
{
// use root folder if no selection
- folder = MFolder::Get(_T(""));
+ folder = MFolder::Get(wxEmptyString);
}
@@ -991,5 +991,5 @@
MFolder *folder = m_FolderTree->GetSelection();
if ( !folder )
- folder = MFolder::Get(_T(""));
+ folder = MFolder::Get(wxEmptyString);
int nUpdated = UpdateFoldersSubtree(*folder, this);
@@ -1214,5 +1214,5 @@
// create the modules menu:
- m_ModulesMenu = new wxMenu(_T(""), wxMENU_TEAROFF);
+ m_ModulesMenu = new wxMenu(wxEmptyString, wxMENU_TEAROFF);
int pos = menuBar->GetMenuCount();
Index: wxMessageView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMessageView.cpp,v
retrieving revision 1.304
retrieving revision 1.305
diff -b -u -2 -r1.304 -r1.305
--- wxMessageView.cpp 16 Jul 2005 19:46:43 -0000 1.304
+++ wxMessageView.cpp 16 Jan 2006 20:32:27 -0000 1.305
@@ -129,5 +129,5 @@
virtual bool FindAgain() { return false; }
virtual void SelectAll() { }
- virtual String GetSelection() const { return _T(""); }
+ virtual String GetSelection() const { return wxEmptyString; }
virtual void Copy() { }
virtual bool Print() { return false; }
@@ -485,5 +485,5 @@
};
- wxMenu *menu = new wxMenu(_T(""), wxMENU_TEAROFF);
+ wxMenu *menu = new wxMenu(wxEmptyString, wxMENU_TEAROFF);
for ( size_t n = 0; n < WXSIZEOF(menuCommands); n++ )
{
Index: wxMimeDialog.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMimeDialog.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -b -u -2 -r1.4 -r1.5
--- wxMimeDialog.cpp 27 Sep 2004 20:14:13 -0000 1.4
+++ wxMimeDialog.cpp 16 Jan 2006 20:32:27 -0000 1.5
@@ -104,5 +104,5 @@
// first the buttons and the optional checkbox
- wxStaticBox *box = CreateStdButtonsAndBox(_T(""), StdBtn_NoBox);
+ wxStaticBox *box = CreateStdButtonsAndBox(wxEmptyString, StdBtn_NoBox);
// next the controls which are always shown
Index: wxModulesDlg.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxModulesDlg.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -b -u -2 -r1.33 -r1.34
--- wxModulesDlg.cpp 11 Jul 2004 00:07:18 -0000 1.33
+++ wxModulesDlg.cpp 16 Jan 2006 20:32:27 -0000 1.34
@@ -125,5 +125,5 @@
- m_textCtrl = new wxTextCtrl(this, -1, _T(""), wxDefaultPosition,
+ m_textCtrl = new wxTextCtrl(this, -1, wxEmptyString, wxDefaultPosition,
wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY);
c = new wxLayoutConstraints;
Index: wxMsgCmdProc.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMsgCmdProc.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -b -u -2 -r1.67 -r1.68
--- wxMsgCmdProc.cpp 24 Sep 2005 16:21:51 -0000 1.67
+++ wxMsgCmdProc.cpp 16 Jan 2006 20:32:27 -0000 1.68
@@ -887,5 +887,5 @@
String result;
- if ( SpamFilter::CheckIfSpam(*msg, _T(""), &result) )
+ if ( SpamFilter::CheckIfSpam(*msg, wxEmptyString, &result) )
{
wxLogWarning(str + _("seems to be a spam (%s)."),
Index: wxOptionsDlg.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxOptionsDlg.cpp,v
retrieving revision 1.426
retrieving revision 1.427
diff -b -u -2 -r1.426 -r1.427
--- wxOptionsDlg.cpp 7 Jul 2005 18:48:52 -0000 1.426
+++ wxOptionsDlg.cpp 16 Jan 2006 20:32:28 -0000 1.427
@@ -1308,5 +1308,5 @@
-ConfigField_ComposePreview
},
- { _T(""), Field_Message, -1},
+ { wxEmptyString, Field_Message, -1},
{ gettext_noop("Show \"&From\" field"), Field_Bool |
Field_Advanced, -1},
@@ -1437,5 +1437,5 @@
{ gettext_noop("Sho&w HTML if no text"), Field_Bool,
ConfigField_MessageViewAutoViewer },
{ gettext_noop("Ensure &images are shown"), Field_Bool,
ConfigField_MessageViewAutoViewer },
- { _T(""), Field_Message, -1},
+ { wxEmptyString, Field_Message, -1},
#ifdef USE_FONT_DESC
@@ -2855,5 +2855,5 @@
btnXFace->SetFile(READ_CONFIG(m_Profile,
MP_COMPOSE_XFACE_FILE));
else
- btnXFace->SetFile(_T(""));
+ btnXFace->SetFile(wxEmptyString);
}
break;
@@ -4534,5 +4534,5 @@
profile->IncRef();
else
- profile = Profile::CreateProfile(_T(""));
+ profile = Profile::CreateProfile(wxEmptyString);
Index: wxSearchDialog.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxSearchDialog.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -b -u -2 -r1.13 -r1.14
--- wxSearchDialog.cpp 7 Sep 2004 13:31:11 -0000 1.13
+++ wxSearchDialog.cpp 16 Jan 2006 20:32:28 -0000 1.14
@@ -145,5 +145,5 @@
// the buttons at the bottom
- CreateStdButtonsAndBox(_T(""), StdBtn_NoBox, MH_DIALOG_SEARCHMSGS);
+ CreateStdButtonsAndBox(wxEmptyString, StdBtn_NoBox, MH_DIALOG_SEARCHMSGS);
// the "where to search" box
Index: wxSubfoldersDialog.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxSubfoldersDialog.cpp,v
retrieving revision 1.86
retrieving revision 1.87
diff -b -u -2 -r1.86 -r1.87
--- wxSubfoldersDialog.cpp 6 Jul 2005 22:00:01 -0000 1.86
+++ wxSubfoldersDialog.cpp 16 Jan 2006 20:32:28 -0000 1.87
@@ -310,5 +310,5 @@
// ctor
wxFolderNameTextCtrl(wxSubscriptionDialog *dialog)
- : wxTextCtrl(dialog, -1, _T(""),
+ : wxTextCtrl(dialog, -1, wxEmptyString,
wxDefaultPosition, wxDefaultSize,
wxTE_PROCESS_TAB)
@@ -786,5 +786,5 @@
// create controls
wxLayoutConstraints *c;
- m_box = CreateStdButtonsAndBox(_T("")); // label will be set later
+ m_box = CreateStdButtonsAndBox(wxEmptyString); // label will be set later
// first create the label, then the text control - we rely on it in
@@ -1214,5 +1214,5 @@
_T("*"), // everything
FALSE, // subscribed only?
- _T(""), // path relative to the folder
+ wxEmptyString, // path relative to the folder
this // data to pass to the callback
);
Index: wxTemplateDialog.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxTemplateDialog.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -b -u -2 -r1.41 -r1.42
--- wxTemplateDialog.cpp 30 Jun 2005 14:22:33 -0000 1.41
+++ wxTemplateDialog.cpp 16 Jan 2006 20:32:28 -0000 1.42
@@ -72,5 +72,5 @@
// ctor
TemplateEditor(const TemplatePopupMenuItem& menu, wxWindow *parent)
- : wxTextCtrl(parent, -1, _T(""), wxDefaultPosition, wxDefaultSize,
+ : wxTextCtrl(parent, -1, wxEmptyString, wxDefaultPosition, wxDefaultSize,
wxTE_MULTILINE),
m_menuInfo(menu)
@@ -495,5 +495,5 @@
// first the box around everything
- wxStaticBox *box = CreateStdButtonsAndBox(_T(""));
+ wxStaticBox *box = CreateStdButtonsAndBox(wxEmptyString);
// then a short help message
@@ -609,5 +609,5 @@
const TemplatePopupMenuItem& menu,
wxWindow *parent)
- : wxManuallyLaidOutDialog(parent, _T(""),
_T("AllTemplates"))
+ : wxManuallyLaidOutDialog(parent, wxEmptyString,
_T("AllTemplates"))
{
m_kind = kind;
Index: wxTextDialog.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxTextDialog.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -b -u -2 -r1.9 -r1.10
--- wxTextDialog.cpp 12 Oct 2003 13:14:48 -0000 1.9
+++ wxTextDialog.cpp 16 Jan 2006 20:32:28 -0000 1.10
@@ -164,5 +164,5 @@
// ---------------
- m_text = new wxTextCtrl(this, -1, _T(""),
+ m_text = new wxTextCtrl(this, -1, wxEmptyString,
wxPoint(0, 0),
wxSize(w, h),
Index: wxWizards.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxWizards.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -b -u -2 -r1.49 -r1.50
--- wxWizards.cpp 4 Oct 2004 12:30:06 -0000 1.49
+++ wxWizards.cpp 16 Jan 2006 20:32:28 -0000 1.50
@@ -1225,5 +1225,5 @@
}
- m_Server->SetValue(p->readEntry(serverKey, _T("")));
+ m_Server->SetValue(p->readEntry(serverKey, wxEmptyString));
}
Index: wxllist.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxllist.cpp,v
retrieving revision 1.167
retrieving revision 1.168
diff -b -u -2 -r1.167 -r1.168
--- wxllist.cpp 9 Jul 2005 22:09:12 -0000 1.167
+++ wxllist.cpp 16 Jan 2006 20:32:28 -0000 1.168
@@ -179,5 +179,5 @@
void ReadString(wxString &to, wxString &from)
{
- to = _T("");
+ to = wxEmptyString;
const wxChar *cptr = from.c_str();
while(*cptr && *cptr != '\n')
@@ -1432,5 +1432,5 @@
// if we split a text-object, we must pre-pend some text to the
// next line later on, remember it here:
- wxString prependText = _T("");
+ wxString prependText = wxEmptyString;
// we might need to adjust the cursor position later, so remember it
size_t xpos = llist->GetCursorPos().x;
Index: wxlwindow.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxlwindow.cpp,v
retrieving revision 1.145
retrieving revision 1.146
diff -b -u -2 -r1.145 -r1.146
--- wxlwindow.cpp 8 Sep 2004 21:41:34 -0000 1.145
+++ wxlwindow.cpp 16 Jan 2006 20:32:28 -0000 1.146
@@ -381,5 +381,5 @@
s_hasPutMessageInStatusBar )
{
- m_StatusBar->SetStatusText(_T(""), m_StatusFieldLabel);
+ m_StatusBar->SetStatusText(wxEmptyString,
m_StatusFieldLabel);
}
}
@@ -636,5 +636,5 @@
break;
case 's': // search
- Find(_T(""));
+ Find(wxEmptyString);
break;
case 't': // search again
@@ -685,5 +685,5 @@
break;
case 's': // search
- Find(_T(""));
+ Find(wxEmptyString);
break;
case 't': // search again
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
Mahogany-cvsupdates mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
