Revision: 7394
http://mahogany.svn.sourceforge.net/mahogany/?rev=7394&view=rev
Author: vadz
Date: 2007-12-09 16:01:34 -0800 (Sun, 09 Dec 2007)
Log Message:
-----------
use char*, not wxChar*, for profile key name parameter of MInputBox()
Modified Paths:
--------------
trunk/M/include/gui/wxMDialogs.h
trunk/M/src/adb/AdbDialogs.cpp
trunk/M/src/adb/AdbFrame.cpp
trunk/M/src/classes/MessageView.cpp
trunk/M/src/gui/wxFolderView.cpp
trunk/M/src/gui/wxMDialogs.cpp
trunk/M/src/gui/wxMFrame.cpp
trunk/M/src/gui/wxMsgCmdProc.cpp
trunk/M/src/gui/wxTemplateDialog.cpp
trunk/M/src/util/strutil.cpp
Modified: trunk/M/include/gui/wxMDialogs.h
===================================================================
--- trunk/M/include/gui/wxMDialogs.h 2007-12-09 23:54:37 UTC (rev 7393)
+++ trunk/M/include/gui/wxMDialogs.h 2007-12-10 00:01:34 UTC (rev 7394)
@@ -303,8 +303,8 @@
const wxString& caption,
const wxString& prompt,
const wxWindow *parent = NULL,
- const wxChar *key = NULL,
- const wxChar *def = NULL,
+ const char *key = NULL,
+ const wxString& def = wxEmptyString,
bool passwordflag = false);
/**
Modified: trunk/M/src/adb/AdbDialogs.cpp
===================================================================
--- trunk/M/src/adb/AdbDialogs.cpp 2007-12-09 23:54:37 UTC (rev 7393)
+++ trunk/M/src/adb/AdbDialogs.cpp 2007-12-10 00:01:34 UTC (rev 7394)
@@ -617,7 +617,7 @@
_("Address book import"),
_("Native address book to create: "),
frame,
- _T("AdbImportBook"),
+ "AdbImportBook",
adbname) )
{
// cancelled by user
Modified: trunk/M/src/adb/AdbFrame.cpp
===================================================================
--- trunk/M/src/adb/AdbFrame.cpp 2007-12-09 23:54:37 UTC (rev 7393)
+++ trunk/M/src/adb/AdbFrame.cpp 2007-12-10 00:01:34 UTC (rev 7394)
@@ -2036,7 +2036,7 @@
{
wxString strGoto;
if ( MInputBox(&strGoto, _("Go to entry/group"),
- _("Full entry &name:"), this, _T("GoTo")) ) {
+ _("Full entry &name:"), this, "GoTo") ) {
MoveSelection(strGoto);
}
}
@@ -2196,7 +2196,7 @@
case AdbDataProvider::Name_String:
{
wxString strMsg = _("Enter the address book name");
- if ( !MInputBox(&strAdbName, strTitle, strMsg, this,
_T("LastAdbName")) )
+ if ( !MInputBox(&strAdbName, strTitle, strMsg, this, "LastAdbName") )
return FALSE;
}
break;
Modified: trunk/M/src/classes/MessageView.cpp
===================================================================
--- trunk/M/src/classes/MessageView.cpp 2007-12-09 23:54:37 UTC (rev 7393)
+++ trunk/M/src/classes/MessageView.cpp 2007-12-10 00:01:34 UTC (rev 7394)
@@ -2241,6 +2241,7 @@
);
ClickablePGPInfo *pgpInfo = ClickablePGPInfo::CreateFromSigStatusCode
(
+ pgpEngine,
status,
this,
log
@@ -3382,7 +3383,7 @@
_("Find text"),
_(" Find:"),
GetParentFrame(),
- _T("MsgViewFindString")) )
+ "MsgViewFindString") )
{
if ( !m_viewer->Find(text) )
{
Modified: trunk/M/src/gui/wxFolderView.cpp
===================================================================
--- trunk/M/src/gui/wxFolderView.cpp 2007-12-09 23:54:37 UTC (rev 7393)
+++ trunk/M/src/gui/wxFolderView.cpp 2007-12-10 00:01:34 UTC (rev 7394)
@@ -4571,7 +4571,7 @@
_("Search for messages"),
_("String to search for:"),
m_Frame,
- _T("MsgSearch"),
+ "MsgSearch",
m_searchData.str
) )
{
Modified: trunk/M/src/gui/wxMDialogs.cpp
===================================================================
--- trunk/M/src/gui/wxMDialogs.cpp 2007-12-09 23:54:37 UTC (rev 7393)
+++ trunk/M/src/gui/wxMDialogs.cpp 2007-12-10 00:01:34 UTC (rev 7394)
@@ -503,8 +503,8 @@
const wxString& strCaption,
const wxString& strPrompt,
const wxWindow *parent,
- const wxChar *szKey,
- const wxChar *def,
+ const char *szKey,
+ const wxString& def,
bool passwordflag)
{
wxString strConfigPath;
@@ -514,7 +514,7 @@
strCaption, strPrompt, strConfigPath, def,
passwordflag);
// do not allow attempts to store the password:
- wxASSERT_MSG( !passwordflag || (szKey==NULL && def == NULL),
+ wxASSERT_MSG( !passwordflag || (!szKey && def.empty()),
_T("passwords can't be stored!") );
if ( dlg.ShowModal() != wxID_OK )
Modified: trunk/M/src/gui/wxMFrame.cpp
===================================================================
--- trunk/M/src/gui/wxMFrame.cpp 2007-12-09 23:54:37 UTC (rev 7393)
+++ trunk/M/src/gui/wxMFrame.cpp 2007-12-10 00:01:34 UTC (rev 7394)
@@ -769,7 +769,7 @@
_("Mahogany: Create new identity"),
_("Enter the identity name:"),
this,
- _T("NewIdentity")) )
+ "NewIdentity") )
{
ShowIdentityDialog(ident, this);
Modified: trunk/M/src/gui/wxMsgCmdProc.cpp
===================================================================
--- trunk/M/src/gui/wxMsgCmdProc.cpp 2007-12-09 23:54:37 UTC (rev 7393)
+++ trunk/M/src/gui/wxMsgCmdProc.cpp 2007-12-10 00:01:34 UTC (rev 7394)
@@ -1069,7 +1069,7 @@
_("Please enter the address"),
_("Bounce the message to:"),
GetFrame(),
- _T("BounceAddress")) )
+ "BounceAddress") )
{
// cancelled by user
return;
Modified: trunk/M/src/gui/wxTemplateDialog.cpp
===================================================================
--- trunk/M/src/gui/wxTemplateDialog.cpp 2007-12-09 23:54:37 UTC (rev
7393)
+++ trunk/M/src/gui/wxTemplateDialog.cpp 2007-12-10 00:01:34 UTC (rev
7394)
@@ -361,7 +361,7 @@
{
// get some text from user (FIXME the prompts are really stupid)
if ( !MInputBox(&value, _("Value for template variable"),
- _T("Value"), this, _T("TemplateText")) )
+ _T("Value"), this, "TemplateText") )
{
// user cancelled
return;
@@ -1019,7 +1019,7 @@
_("Create new template"),
_("Name for the new template:"),
this,
- _T("AddTemplate")
+ "AddTemplate"
) )
{
// cancelled
Modified: trunk/M/src/util/strutil.cpp
===================================================================
--- trunk/M/src/util/strutil.cpp 2007-12-09 23:54:37 UTC (rev 7393)
+++ trunk/M/src/util/strutil.cpp 2007-12-10 00:01:34 UTC (rev 7394)
@@ -722,7 +722,10 @@
MInputBox(&gs_GlobalPassword,
_("Global Password:"),
_("Please enter the global password:"),
- NULL,NULL,NULL,TRUE);
+ NULL,
+ NULL,
+ "",
+ true /* password */);
if ( gs_GlobalPassword.empty() )
{
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Mahogany-cvsupdates mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
