Update of /cvsroot/mahogany/M/src/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv29282/src/gui
Modified Files:
ClickAtt.cpp wxDialogLayout.cpp wxFiltersDialog.cpp
Log Message:
MS VC++ compilation warnings at level 4 fixed
Index: ClickAtt.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/ClickAtt.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -b -u -2 -r1.1 -r1.2
--- ClickAtt.cpp 5 Dec 2002 19:47:31 -0000 1.1
+++ ClickAtt.cpp 5 Dec 2002 20:48:51 -0000 1.2
@@ -136,5 +136,5 @@
size_t lines;
- if ( type.IsText() && (lines = mimepart->GetNumberOfLines()) )
+ if ( type.IsText() && (lines = mimepart->GetNumberOfLines()) != 0 )
{
label << strutil_ultoa(lines) << _(" lines");
Index: wxDialogLayout.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxDialogLayout.cpp,v
retrieving revision 1.92
retrieving revision 1.93
diff -b -u -2 -r1.92 -r1.93
--- wxDialogLayout.cpp 14 Sep 2002 22:39:57 -0000 1.92
+++ wxDialogLayout.cpp 5 Dec 2002 20:48:51 -0000 1.93
@@ -389,8 +389,12 @@
m_profileKey(profileKey)
{
+ if ( m_profileKey.empty() )
+ {
+ m_didRestoreSize = false;
+ }
+ else
+ {
int x, y, w, h;
-
- m_didRestoreSize = !m_profileKey.empty() &&
- wxMFrame::RestorePosition(m_profileKey, &x, &y, &w, &h);
+ m_didRestoreSize = wxMFrame::RestorePosition(m_profileKey, &x, &y, &w, &h);
if ( m_didRestoreSize )
@@ -398,6 +402,7 @@
SetSize(x, y, w, h);
}
+ }
//else: it should be set by the derived class or the default size will be
- // used - not too bad neither
+ // used -- not catastrophic neither
}
Index: wxFiltersDialog.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxFiltersDialog.cpp,v
retrieving revision 1.101
retrieving revision 1.102
diff -b -u -2 -r1.101 -r1.102
--- wxFiltersDialog.cpp 30 Oct 2002 12:51:17 -0000 1.101
+++ wxFiltersDialog.cpp 5 Dec 2002 20:48:51 -0000 1.102
@@ -773,5 +773,5 @@
if ( test == ORC_T_HasFlag )
{
- MFDialogHasFlag flag;
+ MFDialogHasFlag flag = ORC_MF_Illegal; // silent the compiler warning
if ( argument == "U" ) flag = ORC_MF_Unseen;
else if ( argument == "D" ) flag = ORC_MF_Deleted;
@@ -1064,5 +1064,5 @@
if ( FilterActionMsgFlag(action) )
{
- MFDialogSetFlag flag;
+ MFDialogSetFlag flag = OAC_MF_Illegal; // silent the compiler warning
if ( argument == "U" ) flag = OAC_MF_Unseen;
else if ( argument == "D" ) flag = OAC_MF_Deleted;
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
