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

Added missing methods. Not yet tested.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11069 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2001-07-16 09:42:37 +00:00
parent 1348e1a5d9
commit c4c1fab955
2 changed files with 118 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -553,8 +553,16 @@ void wxTextCtrl::DiscardEdits()
int wxTextCtrl::GetNumberOfLines() const int wxTextCtrl::GetNumberOfLines() const
{ {
// TODO Size actualsize;
return 0; UMAGetControlData( m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , 32767 , wxBuffer , &actualsize) ;
int count = 1;
for (int i = 0; i < actualsize; i++)
{
if (wxBuffer[i] == '\r') count++;
}
return count;
} }
long wxTextCtrl::XYToPosition(long x, long y) const long wxTextCtrl::XYToPosition(long x, long y) const
@@ -575,12 +583,59 @@ void wxTextCtrl::ShowPosition(long pos)
int wxTextCtrl::GetLineLength(long lineNo) const int wxTextCtrl::GetLineLength(long lineNo) const
{ {
return GetValue().Length(); Size actualsize;
UMAGetControlData( m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , 32767 , wxBuffer , &actualsize) ;
// Find line first
int count = 0;
for (int i = 0; i < actualsize; i++)
{
if (count == lineNo)
{
// Count chars in line then
count = 0;
for (int j = i; j < actualsize; j++)
{
count++;
if (wxBuffer[j] == '\r') return count;
}
return count;
}
if (wxBuffer[i] == '\r') count++;
}
return 0;
} }
wxString wxTextCtrl::GetLineText(long lineNo) const wxString wxTextCtrl::GetLineText(long lineNo) const
{ {
return GetValue(); Size actualsize;
UMAGetControlData( m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , 32767 , wxBuffer , &actualsize) ;
// Find line first
int count = 0;
for (int i = 0; i < actualsize; i++)
{
if (count == lineNo)
{
// Add chars in line then
wxString tmp("");
for (int j = i; j < actualsize; j++)
{
tmp += wxBuffer[j];
if (wxBuffer[j] == '\r')
return tmp;
}
return tmp;
}
if (wxBuffer[i] == '\r') count++;
}
return wxString("");
} }
/* /*

63
src/mac/textctrl.cpp
View File

@@ -553,8 +553,16 @@ void wxTextCtrl::DiscardEdits()
int wxTextCtrl::GetNumberOfLines() const int wxTextCtrl::GetNumberOfLines() const
{ {
// TODO Size actualsize;
return 0; UMAGetControlData( m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , 32767 , wxBuffer , &actualsize) ;
int count = 1;
for (int i = 0; i < actualsize; i++)
{
if (wxBuffer[i] == '\r') count++;
}
return count;
} }
long wxTextCtrl::XYToPosition(long x, long y) const long wxTextCtrl::XYToPosition(long x, long y) const
@@ -575,12 +583,59 @@ void wxTextCtrl::ShowPosition(long pos)
int wxTextCtrl::GetLineLength(long lineNo) const int wxTextCtrl::GetLineLength(long lineNo) const
{ {
return GetValue().Length(); Size actualsize;
UMAGetControlData( m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , 32767 , wxBuffer , &actualsize) ;
// Find line first
int count = 0;
for (int i = 0; i < actualsize; i++)
{
if (count == lineNo)
{
// Count chars in line then
count = 0;
for (int j = i; j < actualsize; j++)
{
count++;
if (wxBuffer[j] == '\r') return count;
}
return count;
}
if (wxBuffer[i] == '\r') count++;
}
return 0;
} }
wxString wxTextCtrl::GetLineText(long lineNo) const wxString wxTextCtrl::GetLineText(long lineNo) const
{ {
return GetValue(); Size actualsize;
UMAGetControlData( m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , 32767 , wxBuffer , &actualsize) ;
// Find line first
int count = 0;
for (int i = 0; i < actualsize; i++)
{
if (count == lineNo)
{
// Add chars in line then
wxString tmp("");
for (int j = i; j < actualsize; j++)
{
tmp += wxBuffer[j];
if (wxBuffer[j] == '\r')
return tmp;
}
return tmp;
}
if (wxBuffer[i] == '\r') count++;
}
return wxString("");
} }
/* /*