Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

getting rid of warnings

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16737 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2002-08-24 17:06:53 +00:00
parent 7934cbd11d
commit 49b45dcd85
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/mac/carbon/textctrl.cpp
View File

@@ -889,6 +889,7 @@ bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style)
{ {
OSStatus status = TXNSetTypeAttributes ((TXNObject)m_macTXN, attrCounter , typeAttr, OSStatus status = TXNSetTypeAttributes ((TXNObject)m_macTXN, attrCounter , typeAttr,
start,end); start,end);
wxASSERT_MSG( status == noErr , "Couldn't set text attributes" ) ;
} }
SetEditable(formerEditable) ; SetEditable(formerEditable) ;
} }
@@ -995,7 +996,6 @@ bool wxTextCtrl::CanPaste() const
if (!IsEditable()) if (!IsEditable())
return FALSE; return FALSE;
long offset ;
#if TARGET_CARBON #if TARGET_CARBON
OSStatus err = noErr; OSStatus err = noErr;
ScrapRef scrapRef; ScrapRef scrapRef;
@@ -1017,6 +1017,7 @@ bool wxTextCtrl::CanPaste() const
return FALSE; return FALSE;
#else #else
long offset ;
if ( GetScrap( NULL , 'TEXT' , &offset ) > 0 ) if ( GetScrap( NULL , 'TEXT' , &offset ) > 0 )
{ {
return TRUE ; return TRUE ;
@@ -1040,7 +1041,7 @@ void wxTextCtrl::SetEditable(bool editable)
else else
{ {
TXNControlTag tag[] = { kTXNIOPrivilegesTag } ; TXNControlTag tag[] = { kTXNIOPrivilegesTag } ;
TXNControlData data[] = { editable ? kTXNReadWrite : kTXNReadOnly } ; TXNControlData data[] = { { editable ? kTXNReadWrite : kTXNReadOnly } } ;
TXNSetTXNObjectControls( (TXNObject) m_macTXN , false , sizeof(tag) / sizeof (TXNControlTag) , tag , data ) ; TXNSetTXNObjectControls( (TXNObject) m_macTXN , false , sizeof(tag) / sizeof (TXNControlTag) , tag , data ) ;
} }
} }
@@ -1312,7 +1313,7 @@ int wxTextCtrl::GetNumberOfLines() const
wxString content = GetValue() ; wxString content = GetValue() ;
int count = 1; int count = 1;
for (int i = 0; i < content.Length() ; i++) for (size_t i = 0; i < content.Length() ; i++)
{ {
if (content[i] == '\r') count++; if (content[i] == '\r') count++;
} }
@@ -1343,13 +1344,13 @@ int wxTextCtrl::GetLineLength(long lineNo) const
// Find line first // Find line first
int count = 0; int count = 0;
for (int i = 0; i < content.Length() ; i++) for (size_t i = 0; i < content.Length() ; i++)
{ {
if (count == lineNo) if (count == lineNo)
{ {
// Count chars in line then // Count chars in line then
count = 0; count = 0;
for (int j = i; j < content.Length(); j++) for (size_t j = i; j < content.Length(); j++)
{ {
count++; count++;
if (content[j] == '\r') return count; if (content[j] == '\r') return count;
@@ -1369,14 +1370,14 @@ wxString wxTextCtrl::GetLineText(long lineNo) const
// Find line first // Find line first
int count = 0; int count = 0;
for (int i = 0; i < content.Length() ; i++) for (size_t i = 0; i < content.Length() ; i++)
{ {
if (count == lineNo) if (count == lineNo)
{ {
// Add chars in line then // Add chars in line then
wxString tmp(""); wxString tmp("");
for (int j = i; j < content.Length(); j++) for (size_t j = i; j < content.Length(); j++)
{ {
if (content[j] == '\r') if (content[j] == '\r')
return tmp; return tmp;

15
src/mac/textctrl.cpp
View File

@@ -889,6 +889,7 @@ bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style)
{ {
OSStatus status = TXNSetTypeAttributes ((TXNObject)m_macTXN, attrCounter , typeAttr, OSStatus status = TXNSetTypeAttributes ((TXNObject)m_macTXN, attrCounter , typeAttr,
start,end); start,end);
wxASSERT_MSG( status == noErr , "Couldn't set text attributes" ) ;
} }
SetEditable(formerEditable) ; SetEditable(formerEditable) ;
} }
@@ -995,7 +996,6 @@ bool wxTextCtrl::CanPaste() const
if (!IsEditable()) if (!IsEditable())
return FALSE; return FALSE;
long offset ;
#if TARGET_CARBON #if TARGET_CARBON
OSStatus err = noErr; OSStatus err = noErr;
ScrapRef scrapRef; ScrapRef scrapRef;
@@ -1017,6 +1017,7 @@ bool wxTextCtrl::CanPaste() const
return FALSE; return FALSE;
#else #else
long offset ;
if ( GetScrap( NULL , 'TEXT' , &offset ) > 0 ) if ( GetScrap( NULL , 'TEXT' , &offset ) > 0 )
{ {
return TRUE ; return TRUE ;
@@ -1040,7 +1041,7 @@ void wxTextCtrl::SetEditable(bool editable)
else else
{ {
TXNControlTag tag[] = { kTXNIOPrivilegesTag } ; TXNControlTag tag[] = { kTXNIOPrivilegesTag } ;
TXNControlData data[] = { editable ? kTXNReadWrite : kTXNReadOnly } ; TXNControlData data[] = { { editable ? kTXNReadWrite : kTXNReadOnly } } ;
TXNSetTXNObjectControls( (TXNObject) m_macTXN , false , sizeof(tag) / sizeof (TXNControlTag) , tag , data ) ; TXNSetTXNObjectControls( (TXNObject) m_macTXN , false , sizeof(tag) / sizeof (TXNControlTag) , tag , data ) ;
} }
} }
@@ -1312,7 +1313,7 @@ int wxTextCtrl::GetNumberOfLines() const
wxString content = GetValue() ; wxString content = GetValue() ;
int count = 1; int count = 1;
for (int i = 0; i < content.Length() ; i++) for (size_t i = 0; i < content.Length() ; i++)
{ {
if (content[i] == '\r') count++; if (content[i] == '\r') count++;
} }
@@ -1343,13 +1344,13 @@ int wxTextCtrl::GetLineLength(long lineNo) const
// Find line first // Find line first
int count = 0; int count = 0;
for (int i = 0; i < content.Length() ; i++) for (size_t i = 0; i < content.Length() ; i++)
{ {
if (count == lineNo) if (count == lineNo)
{ {
// Count chars in line then // Count chars in line then
count = 0; count = 0;
for (int j = i; j < content.Length(); j++) for (size_t j = i; j < content.Length(); j++)
{ {
count++; count++;
if (content[j] == '\r') return count; if (content[j] == '\r') return count;
@@ -1369,14 +1370,14 @@ wxString wxTextCtrl::GetLineText(long lineNo) const
// Find line first // Find line first
int count = 0; int count = 0;
for (int i = 0; i < content.Length() ; i++) for (size_t i = 0; i < content.Length() ; i++)
{ {
if (count == lineNo) if (count == lineNo)
{ {
// Add chars in line then // Add chars in line then
wxString tmp(""); wxString tmp("");
for (int j = i; j < content.Length(); j++) for (size_t j = i; j < content.Length(); j++)
{ {
if (content[j] == '\r') if (content[j] == '\r')
return tmp; return tmp;