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

some gixes to PositionToXY() - not sure if I made it work better or worse

Browse Source 
though


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1489 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-01-26 13:48:10 +00:00
parent 24178e4a14
commit 9638564219
2 changed files with 84 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/gtk/textctrl.cpp
View File

@@ -372,13 +372,13 @@ bool wxTextCtrl::SaveFile( const wxString &file )
} }
if (fwrite (text, sizeof (char), len, fp) != (size_t) len) if (fwrite (text, sizeof (char), len, fp) != (size_t) len)
{ {
// Did not write whole file // Did not write whole file
} }
// Make sure newline terminates the file // Make sure newline terminates the file
if (text[len - 1] != '\n') if (text[len - 1] != '\n')
fputc ('\n', fp); fputc ('\n', fp);
fclose (fp); fclose (fp);
@@ -431,29 +431,41 @@ void wxTextCtrl::OnDropFiles( wxDropFilesEvent &WXUNUSED(event) )
long wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const long wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const
{ {
if (!(m_windowStyle & wxTE_MULTILINE)) if ( m_windowStyle & wxTE_MULTILINE )
return 0; {
gint len = gtk_text_get_length( GTK_TEXT(m_text) ); wxString text = GetValue();
char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len );
if(!text)
return 0;
if( pos >= len)
return pos=len-1;
*x=1; // Col 1 if( pos >= text.Len() )
*y=1; // Line 1 return FALSE;
for (int i = 0; i < pos; i++ )
{ *x=1; // Col 1
if (text[i] == '\n') *y=1; // Line 1
{ for ( const char *p = text.c_str(); *p; p++ )
(*y)++; {
*x=1; if (*p == '\n')
{
(*y)++;
*x=1;
}
else
(*x)++;
}
} }
else else // single line control
(*x)++; {
if ( pos < GTK_ENTRY(m_text)->text_length )
{
*y = 1;
*x = pos;
}
else
{
// index out of bounds
return FALSE;
}
} }
g_free( text );
return 1; return TRUE;
} }
long wxTextCtrl::XYToPosition(long x, long y ) const long wxTextCtrl::XYToPosition(long x, long y ) const
@@ -485,21 +497,21 @@ int wxTextCtrl::GetNumberOfLines() const
{ {
int currentLine = 0; int currentLine = 0;
for (int i = 0; i < len; i++ ) for (int i = 0; i < len; i++ )
{ {
if (text[i] == '\n') if (text[i] == '\n')
currentLine++; currentLine++;
} }
g_free( text ); g_free( text );
return currentLine; return currentLine;
} }
else else
{ {
return 0; return 0;
} }
} }
else else
{ {
return 1; return 1;
} }
} }

72
src/gtk1/textctrl.cpp
View File

@@ -372,13 +372,13 @@ bool wxTextCtrl::SaveFile( const wxString &file )
} }
if (fwrite (text, sizeof (char), len, fp) != (size_t) len) if (fwrite (text, sizeof (char), len, fp) != (size_t) len)
{ {
// Did not write whole file // Did not write whole file
} }
// Make sure newline terminates the file // Make sure newline terminates the file
if (text[len - 1] != '\n') if (text[len - 1] != '\n')
fputc ('\n', fp); fputc ('\n', fp);
fclose (fp); fclose (fp);
@@ -431,29 +431,41 @@ void wxTextCtrl::OnDropFiles( wxDropFilesEvent &WXUNUSED(event) )
long wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const long wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const
{ {
if (!(m_windowStyle & wxTE_MULTILINE)) if ( m_windowStyle & wxTE_MULTILINE )
return 0; {
gint len = gtk_text_get_length( GTK_TEXT(m_text) ); wxString text = GetValue();
char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len );
if(!text)
return 0;
if( pos >= len)
return pos=len-1;
*x=1; // Col 1 if( pos >= text.Len() )
*y=1; // Line 1 return FALSE;
for (int i = 0; i < pos; i++ )
{ *x=1; // Col 1
if (text[i] == '\n') *y=1; // Line 1
{ for ( const char *p = text.c_str(); *p; p++ )
(*y)++; {
*x=1; if (*p == '\n')
{
(*y)++;
*x=1;
}
else
(*x)++;
}
} }
else else // single line control
(*x)++; {
if ( pos < GTK_ENTRY(m_text)->text_length )
{
*y = 1;
*x = pos;
}
else
{
// index out of bounds
return FALSE;
}
} }
g_free( text );
return 1; return TRUE;
} }
long wxTextCtrl::XYToPosition(long x, long y ) const long wxTextCtrl::XYToPosition(long x, long y ) const
@@ -485,21 +497,21 @@ int wxTextCtrl::GetNumberOfLines() const
{ {
int currentLine = 0; int currentLine = 0;
for (int i = 0; i < len; i++ ) for (int i = 0; i < len; i++ )
{ {
if (text[i] == '\n') if (text[i] == '\n')
currentLine++; currentLine++;
} }
g_free( text ); g_free( text );
return currentLine; return currentLine;
} }
else else
{ {
return 0; return 0;
} }
} }
else else
{ {
return 1; return 1;
} }
} }