Update of /cvsroot/mahogany/M/src/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10764/src/gui
Modified Files:
wxComposeView.cpp wxFolderTree.cpp wxTemplateDialog.cpp
wxllist.cpp wxlwindow.cpp
Log Message:
isspace->wxIsspace, isalnum->wxIsalnum, and fixing warning "Filters.cpp:2051: warning:
comparison is always true due to limited range of data type"
Index: wxComposeView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxComposeView.cpp,v
retrieving revision 1.359
retrieving revision 1.360
diff -b -u -2 -r1.359 -r1.360
--- wxComposeView.cpp 14 Mar 2004 22:51:36 -0000 1.359
+++ wxComposeView.cpp 16 Mar 2004 00:00:58 -0000 1.360
@@ -60,6 +60,4 @@
#endif
-#include <ctype.h> // for isspace
-
#include <wx/clipbrd.h>
#include <wx/process.h>
@@ -2076,5 +2074,5 @@
// the address will probably never start with spaces but if it does, it
// will be enough to just take it into quotes
- while ( isspace(text[nLastAddr]) )
+ while ( wxIsspace(text[nLastAddr]) )
{
nLastAddr++;
@@ -2171,5 +2169,5 @@
{
wxChar c = text[nPrevAddrEnd];
- if ( !isspace(c) && (c != ',') && (c != ';') )
+ if ( !wxIsspace(c) && (c != ',') && (c != ';') )
{
// this character is a part of previous string, leave it there
Index: wxFolderTree.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxFolderTree.cpp,v
retrieving revision 1.229
retrieving revision 1.230
diff -b -u -2 -r1.229 -r1.230
--- wxFolderTree.cpp 14 Mar 2004 22:51:37 -0000 1.229
+++ wxFolderTree.cpp 16 Mar 2004 00:00:59 -0000 1.230
@@ -1678,5 +1678,5 @@
default: /* must be alphanumeric */
- if (!isalnum (s))
+ if (!wxIsalnum (s))
{
wxLogDebug(_T("invalid modified UTF-7 name"));
Index: wxTemplateDialog.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxTemplateDialog.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -b -u -2 -r1.36 -r1.37
--- wxTemplateDialog.cpp 27 Dec 2003 22:58:52 -0000 1.36
+++ wxTemplateDialog.cpp 16 Mar 2004 00:00:59 -0000 1.37
@@ -312,5 +312,5 @@
for ( const wxChar *pc = value.c_str(); *pc; pc++ )
{
- if ( !isalnum(*pc) )
+ if ( !wxIsalnum(*pc) )
{
needsQuotes = TRUE;
Index: wxllist.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxllist.cpp,v
retrieving revision 1.160
retrieving revision 1.161
diff -b -u -2 -r1.160 -r1.161
--- wxllist.cpp 10 Jan 2004 18:49:23 -0000 1.160
+++ wxllist.cpp 16 Mar 2004 00:00:59 -0000 1.161
@@ -1089,7 +1089,7 @@
// Find out how many positions we need to delete:
// 1. eat leading space
- while(isspace(str.c_str()[count])) count++;
+ while(wxIsspace(str.c_str()[count])) count++;
// 2. eat the word itself:
- while(isalnum(str.c_str()[count])) count++;
+ while(wxIsalnum(str.c_str()[count])) count++;
// now delete it:
wxASSERT(count+offset <= (size_t) (**i).GetLength());
@@ -1436,5 +1436,5 @@
do
{
- foundSpace = isspace(tobj->GetText()[breakpos]) != 0;
+ foundSpace = wxIsspace(tobj->GetText()[breakpos]) != 0;
if ( foundSpace )
break;
@@ -1600,5 +1600,5 @@
do
{
- if(isspace(((wxLayoutObjectText*)*i)->GetText().c_str()[(size_t)offset]))
+
if(wxIsspace(((wxLayoutObjectText*)*i)->GetText().c_str()[(size_t)offset]))
return column;
else
@@ -1633,5 +1633,5 @@
// first space in it
for(offset = 0; offset < (**i).GetLength(); offset++)
- if( isspace(((wxLayoutObjectText*)*i)->GetText().c_str()[(size_t)offset]))
+ if( wxIsspace(((wxLayoutObjectText*)*i)->GetText().c_str()[(size_t)offset]))
{
return pos+offset;
@@ -2150,5 +2150,5 @@
// to the beginning/end of the next/prev word
- while ( p >= start && p < end && isspace(*p) )
+ while ( p >= start && p < end && wxIsspace(*p) )
{
n > 0 ? p++ : p--;
@@ -2156,5 +2156,5 @@
// go to the end/beginning of the word (in a broad sense...)
- while ( p >= start && p < end && !isspace(*p) )
+ while ( p >= start && p < end && !wxIsspace(*p) )
{
n > 0 ? p++ : p--;
@@ -2166,5 +2166,5 @@
{
// now advance to the beginning of the next word
- while ( isspace(*p) && p < end )
+ while ( wxIsspace(*p) && p < end )
p++;
}
@@ -2173,5 +2173,5 @@
{
// in these 2 cases we took 1 char too much
- if ( (p < start) || isspace(*p) )
+ if ( (p < start) || wxIsspace(*p) )
{
p++;
Index: wxlwindow.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxlwindow.cpp,v
retrieving revision 1.142
retrieving revision 1.143
diff -b -u -2 -r1.142 -r1.143
--- wxlwindow.cpp 10 Jan 2004 18:49:23 -0000 1.142
+++ wxlwindow.cpp 16 Mar 2004 00:00:59 -0000 1.143
@@ -799,5 +799,5 @@
&& m_WrapMargin > 0
&& m_llist->GetCursorPos().x > m_WrapMargin
- && isspace(keyCode))
+ && wxIsspace(keyCode))
m_llist->WrapLine(m_WrapMargin);
m_llist->Insert((wxChar)keyCode);
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
