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

A bit more DnD and clipbrd updates

Browse Source 
wxTextCtrl now hides the vertical until required


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1197 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1998-12-15 08:03:37 +00:00
parent f5d29b396f
commit 2830bf19dc
11 changed files with 672 additions and 528 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/gtk/textctrl.h
View File

@@ -106,14 +106,17 @@ class wxTextCtrl: public wxControl, public streambuf
// implementation // implementation
GtkWidget* GetConnectWidget(void); GtkWidget* GetConnectWidget();
bool IsOwnGtkWindow( GdkWindow *window ); bool IsOwnGtkWindow( GdkWindow *window );
void ApplyWidgetStyle(); void ApplyWidgetStyle();
void CalculateScrollbar();
private: private:
bool m_modified; bool m_modified;
GtkWidget *m_text; GtkWidget *m_text;
GtkWidget *m_vScrollbar;
bool m_vScrollbarVisible;
}; };
#endif // __GTKTEXTCTRLH__ #endif // __GTKTEXTCTRLH__

5
include/wx/gtk1/textctrl.h
View File

@@ -106,14 +106,17 @@ class wxTextCtrl: public wxControl, public streambuf
// implementation // implementation
GtkWidget* GetConnectWidget(void); GtkWidget* GetConnectWidget();
bool IsOwnGtkWindow( GdkWindow *window ); bool IsOwnGtkWindow( GdkWindow *window );
void ApplyWidgetStyle(); void ApplyWidgetStyle();
void CalculateScrollbar();
private: private:
bool m_modified; bool m_modified;
GtkWidget *m_text; GtkWidget *m_text;
GtkWidget *m_vScrollbar;
bool m_vScrollbarVisible;
}; };
#endif // __GTKTEXTCTRLH__ #endif // __GTKTEXTCTRLH__

12
samples/controls/controls.cpp
View File

@@ -78,7 +78,6 @@ class MyPanel: public wxPanel
void OnSpinUpdate( wxSpinEvent &event ); void OnSpinUpdate( wxSpinEvent &event );
void OnPasteFromClipboard( wxCommandEvent &event ); void OnPasteFromClipboard( wxCommandEvent &event );
void OnCopyToClipboard( wxCommandEvent &event ); void OnCopyToClipboard( wxCommandEvent &event );
void OnCutToClipboard( wxCommandEvent &event );
wxListBox *m_listbox; wxListBox *m_listbox;
wxChoice *m_choice; wxChoice *m_choice;
@@ -189,7 +188,6 @@ const int ID_COMBO_ENABLE = 147;
const int ID_TEXT = 150; const int ID_TEXT = 150;
const int ID_PASTE_TEXT = 151; const int ID_PASTE_TEXT = 151;
const int ID_COPY_TEXT = 152; const int ID_COPY_TEXT = 152;
const int ID_CUT_TEXT = 153;
const int ID_RADIOBOX = 160; const int ID_RADIOBOX = 160;
const int ID_RADIOBOX_SEL_NUM = 161; const int ID_RADIOBOX_SEL_NUM = 161;
@@ -245,7 +243,6 @@ BEGIN_EVENT_TABLE(MyPanel, wxPanel)
EVT_SPIN (ID_SPIN, MyPanel::OnSpinUpdate) EVT_SPIN (ID_SPIN, MyPanel::OnSpinUpdate)
EVT_BUTTON (ID_PASTE_TEXT, MyPanel::OnPasteFromClipboard) EVT_BUTTON (ID_PASTE_TEXT, MyPanel::OnPasteFromClipboard)
EVT_BUTTON (ID_COPY_TEXT, MyPanel::OnCopyToClipboard) EVT_BUTTON (ID_COPY_TEXT, MyPanel::OnCopyToClipboard)
EVT_BUTTON (ID_CUT_TEXT, MyPanel::OnCutToClipboard)
END_EVENT_TABLE() END_EVENT_TABLE()
MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) : MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) :
@@ -355,9 +352,8 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) :
(*m_multitext) << " More text."; (*m_multitext) << " More text.";
// m_multitext->SetBackgroundColour("wheat"); // m_multitext->SetBackgroundColour("wheat");
(void)new wxStaticBox( panel, -1, "wxClipboard", wxPoint(345,50), wxSize(160,145) ); (void)new wxStaticBox( panel, -1, "wxClipboard", wxPoint(345,50), wxSize(160,145) );
(void)new wxButton( panel, ID_COPY_TEXT, "Copy line 1", wxPoint(370,70), wxSize(110,30) ); (void)new wxButton( panel, ID_COPY_TEXT, "Copy line 1", wxPoint(370,80), wxSize(110,30) );
(void)new wxButton( panel, ID_PASTE_TEXT, "Paste text", wxPoint(370,110), wxSize(110,30) ); (void)new wxButton( panel, ID_PASTE_TEXT, "Paste text", wxPoint(370,140), wxSize(110,30) );
(void)new wxButton( panel, ID_CUT_TEXT, "Cut line 1", wxPoint(370,150), wxSize(110,30) );
m_notebook->AddPage(panel, "wxTextCtrl" , FALSE, Image_Text); m_notebook->AddPage(panel, "wxTextCtrl" , FALSE, Image_Text);
wxString choices2[] = wxString choices2[] =
@@ -490,10 +486,6 @@ void MyPanel::OnCopyToClipboard( wxCommandEvent &WXUNUSED(event) )
#endif #endif
} }
void MyPanel::OnCutToClipboard( wxCommandEvent &WXUNUSED(event) )
{
}
void MyPanel::OnSize( wxSizeEvent& WXUNUSED(event) ) void MyPanel::OnSize( wxSizeEvent& WXUNUSED(event) )
{ {
int x = 0; int x = 0;

18
src/gtk/clipbrd.cpp
View File

@@ -155,7 +155,7 @@ static gint
selection_clear( GtkWidget *WXUNUSED(widget), GdkEventSelection *WXUNUSED(event) ) selection_clear( GtkWidget *WXUNUSED(widget), GdkEventSelection *WXUNUSED(event) )
{ {
if (!wxTheClipboard) return TRUE; if (!wxTheClipboard) return TRUE;
// the clipboard is no longer in our hands. we have to delete the // the clipboard is no longer in our hands. we have to delete the
// clipboard data. // clipboard data.
@@ -307,6 +307,22 @@ bool wxClipboard::SetData( wxDataObject *data )
{ {
wxCHECK_MSG( data, FALSE, "data is invalid" ); wxCHECK_MSG( data, FALSE, "data is invalid" );
wxNode *node = m_dataObjects.First();
while (node)
{
wxDataObject *d = (wxDataObject*)node->Data();
if (d->GetFormat() == data->GetFormat())
{
m_dataObjects.DeleteNode( node );
break;
}
node = node->Next();
}
m_dataObjects.Append( data ); m_dataObjects.Append( data );
wxCHECK_MSG( m_open, FALSE, "clipboard not open" ); wxCHECK_MSG( m_open, FALSE, "clipboard not open" );

2
src/gtk/dialog.cpp
View File

@@ -245,7 +245,7 @@ void wxDialog::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int heigh
void wxDialog::OnSize( wxSizeEvent &WXUNUSED(event) ) void wxDialog::OnSize( wxSizeEvent &WXUNUSED(event) )
{ {
wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); wxASSERT_MSG( (m_widget != NULL), "invalid dialog" );
if (GetAutoLayout()) if (GetAutoLayout())
{ {

12
src/gtk/dnd.cpp
View File

@@ -642,10 +642,12 @@ void gtk_drag_callback( GtkWidget *widget, GdkEvent *event, wxDropSource *source
wxString text = text_object->GetText(); wxString text = text_object->GetText();
char *s = WXSTRINGCAST text;
gtk_widget_dnd_data_set( widget, gtk_widget_dnd_data_set( widget,
event, event,
(unsigned char*) text.c_str, (unsigned char*) s,
(int) text.Length() ); (int) text.Length()+1 );
break; break;
} }
@@ -656,10 +658,12 @@ void gtk_drag_callback( GtkWidget *widget, GdkEvent *event, wxDropSource *source
wxString text = file_object->GetFiles(); wxString text = file_object->GetFiles();
char *s = WXSTRINGCAST text;
gtk_widget_dnd_data_set( widget, gtk_widget_dnd_data_set( widget,
event, event,
(unsigned char*) text.c_str, (unsigned char*) s,
(int) text.Length() ); (int) text.Length()+1 );
break; break;
} }

557
src/gtk/textctrl.cpp
View File

@@ -24,17 +24,31 @@
// "changed" // "changed"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static void gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win ) static void
gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
{ {
win->SetModified(); win->SetModified();
win->CalculateScrollbar();
wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->m_windowId ); wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->m_windowId );
wxString val( win->GetValue() ); wxString val( win->GetValue() );
if (!val.IsNull()) event.m_commandString = WXSTRINGCAST val; if (!val.IsNull()) event.m_commandString = WXSTRINGCAST val;
event.SetEventObject( win ); event.SetEventObject( win );
win->GetEventHandler()->ProcessEvent( event ); win->GetEventHandler()->ProcessEvent( event );
} }
//-----------------------------------------------------------------------------
// "size_allocate"
//-----------------------------------------------------------------------------
static void
gtk_text_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* WXUNUSED(alloc), wxTextCtrl *win )
{
win->CalculateScrollbar();
}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxTextCtrl // wxTextCtrl
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -42,186 +56,217 @@ static void gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *
IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl,wxControl) IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl,wxControl)
BEGIN_EVENT_TABLE(wxTextCtrl, wxControl) BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
EVT_CHAR(wxTextCtrl::OnChar) EVT_CHAR(wxTextCtrl::OnChar)
END_EVENT_TABLE() END_EVENT_TABLE()
wxTextCtrl::wxTextCtrl() : streambuf() wxTextCtrl::wxTextCtrl() : streambuf()
{ {
if (allocate()) setp(base(),ebuf()); if (allocate()) setp(base(),ebuf());
m_modified = FALSE; m_modified = FALSE;
} }
wxTextCtrl::wxTextCtrl( wxWindow *parent, wxWindowID id, const wxString &value, wxTextCtrl::wxTextCtrl( wxWindow *parent, wxWindowID id, const wxString &value,
const wxPoint &pos, const wxSize &size, const wxPoint &pos, const wxSize &size,
int style, const wxValidator& validator, const wxString &name ) : streambuf() int style, const wxValidator& validator, const wxString &name ) : streambuf()
{ {
if (allocate()) setp(base(),ebuf()); if (allocate()) setp(base(),ebuf());
m_modified = FALSE; m_modified = FALSE;
Create( parent, id, value, pos, size, style, validator, name ); Create( parent, id, value, pos, size, style, validator, name );
} }
bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value, bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
const wxPoint &pos, const wxSize &size, const wxPoint &pos, const wxSize &size,
int style, const wxValidator& validator, const wxString &name ) int style, const wxValidator& validator, const wxString &name )
{ {
m_needParent = TRUE; m_needParent = TRUE;
PreCreation( parent, id, pos, size, style, name ); PreCreation( parent, id, pos, size, style, name );
SetValidator( validator ); SetValidator( validator );
m_vScrollbarVisible = TRUE;
bool multi_line = (style & wxTE_MULTILINE) != 0; bool multi_line = (style & wxTE_MULTILINE) != 0;
if ( multi_line ) if ( multi_line )
{ {
// a multi-line edit control: create a vertical scrollbar by default and // a multi-line edit control: create a vertical scrollbar by default and
// horizontal if requested // horizontal if requested
bool bHasHScrollbar = (style & wxHSCROLL) != 0; bool bHasHScrollbar = (style & wxHSCROLL) != 0;
// create our control...
m_text = gtk_text_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL );
// create our control... // ... and put into the upper left hand corner of the table
m_text = gtk_text_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL ); m_widget = gtk_table_new(bHasHScrollbar ? 2 : 1, 2, FALSE);
gtk_table_attach( GTK_TABLE(m_widget), m_text, 0, 1, 0, 1,
// ... and put into the upper left hand corner of the table
m_widget = gtk_table_new(bHasHScrollbar ? 2 : 1, 2, FALSE);
gtk_table_attach( GTK_TABLE(m_widget), m_text, 0, 1, 0, 1,
(GtkAttachOptions)(GTK_FILL | GTK_EXPAND | GTK_SHRINK), (GtkAttachOptions)(GTK_FILL | GTK_EXPAND | GTK_SHRINK),
(GtkAttachOptions)(GTK_FILL | GTK_EXPAND | GTK_SHRINK), (GtkAttachOptions)(GTK_FILL | GTK_EXPAND | GTK_SHRINK),
0, 0); 0, 0);
// put the horizontal scrollbar in the lower left hand corner // put the horizontal scrollbar in the lower left hand corner
if (bHasHScrollbar) if (bHasHScrollbar)
{ {
GtkWidget *hscrollbar = gtk_hscrollbar_new(GTK_TEXT(m_text)->hadj); GtkWidget *hscrollbar = gtk_hscrollbar_new(GTK_TEXT(m_text)->hadj);
gtk_table_attach(GTK_TABLE(m_widget), hscrollbar, 0, 1, 1, 2, gtk_table_attach(GTK_TABLE(m_widget), hscrollbar, 0, 1, 1, 2,
(GtkAttachOptions)(GTK_EXPAND | GTK_FILL), (GtkAttachOptions)(GTK_EXPAND | GTK_FILL),
GTK_FILL, GTK_FILL,
0, 0); 0, 0);
gtk_widget_show(hscrollbar); gtk_widget_show(hscrollbar);
} }
// finally, put the vertical scrollbar in the upper right corner // finally, put the vertical scrollbar in the upper right corner
GtkWidget *vscrollbar = gtk_vscrollbar_new(GTK_TEXT(m_text)->vadj); m_vScrollbar = gtk_vscrollbar_new( GTK_TEXT(m_text)->vadj );
gtk_table_attach(GTK_TABLE(m_widget), vscrollbar, 1, 2, 0, 1, gtk_table_attach(GTK_TABLE(m_widget), m_vScrollbar, 1, 2, 0, 1,
GTK_FILL, GTK_FILL,
(GtkAttachOptions)(GTK_EXPAND | GTK_FILL | GTK_SHRINK), (GtkAttachOptions)(GTK_EXPAND | GTK_FILL | GTK_SHRINK),
0, 0); 0, 0);
gtk_widget_show( vscrollbar ); gtk_widget_show( m_vScrollbar );
}
else gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
{ GTK_SIGNAL_FUNC(gtk_text_size_callback), (gpointer)this );
// a single-line text control: no need for scrollbars }
m_widget = else
m_text = gtk_entry_new(); {
} // a single-line text control: no need for scrollbars
m_widget =
m_text = gtk_entry_new();
}
wxSize newSize = size; wxSize newSize = size;
if (newSize.x == -1) newSize.x = 80; if (newSize.x == -1) newSize.x = 80;
if (newSize.y == -1) newSize.y = 26; if (newSize.y == -1) newSize.y = 26;
SetSize( newSize.x, newSize.y ); SetSize( newSize.x, newSize.y );
m_parent->AddChild( this ); m_parent->AddChild( this );
(m_parent->m_insertCallback)( m_parent, this ); (m_parent->m_insertCallback)( m_parent, this );
PostCreation(); PostCreation();
if (multi_line) if (multi_line)
{ {
gtk_widget_realize(m_text); gtk_widget_realize(m_text);
gtk_widget_show(m_text); gtk_widget_show(m_text);
} }
// we want to be notified about text changes // we want to be notified about text changes
gtk_signal_connect(GTK_OBJECT(m_text), "changed", gtk_signal_connect(GTK_OBJECT(m_text), "changed",
GTK_SIGNAL_FUNC(gtk_text_changed_callback), GTK_SIGNAL_FUNC(gtk_text_changed_callback),
(gpointer)this); (gpointer)this);
if (!value.IsNull()) if (!value.IsNull())
{ {
gint tmp = 0; gint tmp = 0;
gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &tmp ); gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &tmp );
SetInsertionPointEnd(); SetInsertionPointEnd();
} }
if (style & wxTE_PASSWORD) if (style & wxTE_PASSWORD)
{ {
if (!multi_line) if (!multi_line)
gtk_entry_set_visibility( GTK_ENTRY(m_text), FALSE ); gtk_entry_set_visibility( GTK_ENTRY(m_text), FALSE );
} }
if (style & wxTE_READONLY) if (style & wxTE_READONLY)
{ {
if (!multi_line) if (!multi_line)
gtk_entry_set_editable( GTK_ENTRY(m_text), FALSE ); gtk_entry_set_editable( GTK_ENTRY(m_text), FALSE );
} }
else else
{ {
if (multi_line) if (multi_line)
gtk_text_set_editable( GTK_TEXT(m_text), 1 ); gtk_text_set_editable( GTK_TEXT(m_text), 1 );
} }
Show( TRUE );
SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() );
Show( TRUE ); return TRUE;
}
SetBackgroundColour( parent->GetBackgroundColour() ); void wxTextCtrl::CalculateScrollbar()
SetForegroundColour( parent->GetForegroundColour() ); {
if ((m_windowStyle & wxTE_MULTILINE) == 0) return;
return TRUE; GtkAdjustment *adj = GTK_TEXT(m_text)->vadj;
if (adj->upper - adj->page_size < 0.8)
{
if (m_vScrollbarVisible)
{
gtk_widget_hide( m_vScrollbar );
m_vScrollbarVisible = FALSE;
}
}
else
{
if (!m_vScrollbarVisible)
{
gtk_widget_show( m_vScrollbar );
m_vScrollbarVisible = TRUE;
}
}
} }
wxString wxTextCtrl::GetValue() const wxString wxTextCtrl::GetValue() const
{ {
wxCHECK_MSG( m_text != NULL, "", "invalid text ctrl" ); wxCHECK_MSG( m_text != NULL, "", "invalid text ctrl" );
wxString tmp; wxString tmp;
if (m_windowStyle & wxTE_MULTILINE) if (m_windowStyle & wxTE_MULTILINE)
{ {
gint len = gtk_text_get_length( GTK_TEXT(m_text) ); gint len = gtk_text_get_length( GTK_TEXT(m_text) );
char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len ); char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len );
tmp = text; tmp = text;
g_free( text ); g_free( text );
} }
else else
{ {
tmp = gtk_entry_get_text( GTK_ENTRY(m_text) ); tmp = gtk_entry_get_text( GTK_ENTRY(m_text) );
} }
return tmp; return tmp;
} }
void wxTextCtrl::SetValue( const wxString &value ) void wxTextCtrl::SetValue( const wxString &value )
{ {
wxCHECK_RET( m_text != NULL, "invalid text ctrl" ); wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
wxString tmp = ""; wxString tmp = "";
if (!value.IsNull()) tmp = value; if (!value.IsNull()) tmp = value;
if (m_windowStyle & wxTE_MULTILINE) if (m_windowStyle & wxTE_MULTILINE)
{ {
gint len = gtk_text_get_length( GTK_TEXT(m_text) ); gint len = gtk_text_get_length( GTK_TEXT(m_text) );
gtk_editable_delete_text( GTK_EDITABLE(m_text), 0, len ); gtk_editable_delete_text( GTK_EDITABLE(m_text), 0, len );
len = 0; len = 0;
gtk_editable_insert_text( GTK_EDITABLE(m_text), tmp, tmp.Length(), &len ); gtk_editable_insert_text( GTK_EDITABLE(m_text), tmp, tmp.Length(), &len );
} }
else else
{ {
gtk_entry_set_text( GTK_ENTRY(m_text), tmp ); gtk_entry_set_text( GTK_ENTRY(m_text), tmp );
} }
} }
void wxTextCtrl::WriteText( const wxString &text ) void wxTextCtrl::WriteText( const wxString &text )
{ {
wxCHECK_RET( m_text != NULL, "invalid text ctrl" ); wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
if (text.IsNull()) return; if (text.IsNull()) return;
if (m_windowStyle & wxTE_MULTILINE) if (m_windowStyle & wxTE_MULTILINE)
{ {
gint len = gtk_text_get_length( GTK_TEXT(m_text) ); gint len = gtk_text_get_length( GTK_TEXT(m_text) );
gtk_editable_insert_text( GTK_EDITABLE(m_text), text, text.Length(), &len ); gtk_editable_insert_text( GTK_EDITABLE(m_text), text, text.Length(), &len );
} }
else else
{ {
gtk_entry_append_text( GTK_ENTRY(m_text), text ); gtk_entry_append_text( GTK_ENTRY(m_text), text );
} }
} }
bool wxTextCtrl::LoadFile( const wxString &file ) bool wxTextCtrl::LoadFile( const wxString &file )
@@ -354,7 +399,7 @@ wxString wxTextCtrl::GetLineText( long lineNo ) const
void wxTextCtrl::OnDropFiles( wxDropFilesEvent &WXUNUSED(event) ) void wxTextCtrl::OnDropFiles( wxDropFilesEvent &WXUNUSED(event) )
{ {
wxFAIL_MSG( "wxTextCtrl::OnDropFiles not implemented" ); wxFAIL_MSG( "wxTextCtrl::OnDropFiles not implemented" );
} }
long wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const long wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const
@@ -386,14 +431,14 @@ long wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const
long wxTextCtrl::XYToPosition(long x, long y ) const long wxTextCtrl::XYToPosition(long x, long y ) const
{ {
if (!(m_windowStyle & wxTE_MULTILINE)) if (!(m_windowStyle & wxTE_MULTILINE)) return 0;
return 0;
long pos=0; long pos=0;
for(int i=1;i<y;i++) for( int i=1; i<y; i++ ) pos += GetLineLength(i);
pos +=GetLineLength(i);
pos +=x-1; // Pos start with 0 pos +=x-1; // Pos start with 0
return pos; return pos;
} }
int wxTextCtrl::GetLineLength(long lineNo) const int wxTextCtrl::GetLineLength(long lineNo) const
@@ -404,244 +449,251 @@ int wxTextCtrl::GetLineLength(long lineNo) const
int wxTextCtrl::GetNumberOfLines() const int wxTextCtrl::GetNumberOfLines() const
{ {
if (m_windowStyle & wxTE_MULTILINE) if (m_windowStyle & wxTE_MULTILINE)
{
gint len = gtk_text_get_length( GTK_TEXT(m_text) );
char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len );
if (text)
{ {
int currentLine = 0; gint len = gtk_text_get_length( GTK_TEXT(m_text) );
for (int i = 0; i < len; i++ ) char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len );
if (text[i] == '\n')
currentLine++;
g_free( text ); if (text)
return currentLine; {
int currentLine = 0;
for (int i = 0; i < len; i++ )
{
if (text[i] == '\n')
currentLine++;
}
g_free( text );
return currentLine;
}
else
{
return 0;
}
} }
else else
return 0; {
} return 1;
else }
{
return 1;
}
} }
void wxTextCtrl::SetInsertionPoint( long pos ) void wxTextCtrl::SetInsertionPoint( long pos )
{ {
wxCHECK_RET( m_text != NULL, "invalid text ctrl" ); wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
int tmp = (int) pos; int tmp = (int) pos;
if (m_windowStyle & wxTE_MULTILINE) if (m_windowStyle & wxTE_MULTILINE)
gtk_text_set_point( GTK_TEXT(m_text), tmp ); gtk_text_set_point( GTK_TEXT(m_text), tmp );
else else
gtk_entry_set_position( GTK_ENTRY(m_text), tmp ); gtk_entry_set_position( GTK_ENTRY(m_text), tmp );
} }
void wxTextCtrl::SetInsertionPointEnd() void wxTextCtrl::SetInsertionPointEnd()
{ {
wxCHECK_RET( m_text != NULL, "invalid text ctrl" ); wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
int pos = 0; int pos = 0;
if (m_windowStyle & wxTE_MULTILINE) if (m_windowStyle & wxTE_MULTILINE)
pos = gtk_text_get_length( GTK_TEXT(m_text) ); pos = gtk_text_get_length( GTK_TEXT(m_text) );
else else
pos = GTK_ENTRY(m_text)->text_length; pos = GTK_ENTRY(m_text)->text_length;
SetInsertionPoint((pos-1)>0 ? (pos-1):0);
SetInsertionPoint((pos-1)>0 ? (pos-1):0);
} }
void wxTextCtrl::SetEditable( bool editable ) void wxTextCtrl::SetEditable( bool editable )
{ {
wxCHECK_RET( m_text != NULL, "invalid text ctrl" ); wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
if (m_windowStyle & wxTE_MULTILINE) if (m_windowStyle & wxTE_MULTILINE)
gtk_text_set_editable( GTK_TEXT(m_text), editable ); gtk_text_set_editable( GTK_TEXT(m_text), editable );
else else
gtk_entry_set_editable( GTK_ENTRY(m_text), editable ); gtk_entry_set_editable( GTK_ENTRY(m_text), editable );
} }
void wxTextCtrl::SetSelection( long from, long to ) void wxTextCtrl::SetSelection( long from, long to )
{ {
wxCHECK_RET( m_text != NULL, "invalid text ctrl" ); wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to ); gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to );
} }
void wxTextCtrl::ShowPosition( long WXUNUSED(pos) ) void wxTextCtrl::ShowPosition( long WXUNUSED(pos) )
{ {
wxFAIL_MSG( "wxTextCtrl::ShowPosition not implemented" ); wxFAIL_MSG( "wxTextCtrl::ShowPosition not implemented" );
} }
long wxTextCtrl::GetInsertionPoint() const long wxTextCtrl::GetInsertionPoint() const
{ {
wxCHECK_MSG( m_text != NULL, 0, "invalid text ctrl" ); wxCHECK_MSG( m_text != NULL, 0, "invalid text ctrl" );
return (long) GTK_EDITABLE(m_text)->current_pos; return (long) GTK_EDITABLE(m_text)->current_pos;
} }
long wxTextCtrl::GetLastPosition() const long wxTextCtrl::GetLastPosition() const
{ {
wxCHECK_MSG( m_text != NULL, 0, "invalid text ctrl" ); wxCHECK_MSG( m_text != NULL, 0, "invalid text ctrl" );
int pos = 0; int pos = 0;
if (m_windowStyle & wxTE_MULTILINE) if (m_windowStyle & wxTE_MULTILINE)
pos = gtk_text_get_length( GTK_TEXT(m_text) ); pos = gtk_text_get_length( GTK_TEXT(m_text) );
else else
pos = GTK_ENTRY(m_text)->text_length; pos = GTK_ENTRY(m_text)->text_length;
return (long)pos-1;
return (long)pos-1;
} }
void wxTextCtrl::Remove( long from, long to ) void wxTextCtrl::Remove( long from, long to )
{ {
wxCHECK_RET( m_text != NULL, "invalid text ctrl" ); wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to ); gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to );
} }
void wxTextCtrl::Replace( long from, long to, const wxString &value ) void wxTextCtrl::Replace( long from, long to, const wxString &value )
{ {
wxCHECK_RET( m_text != NULL, "invalid text ctrl" ); wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to ); gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to );
if (value.IsNull()) return; if (value.IsNull()) return;
gint pos = (gint)to; gint pos = (gint)to;
gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &pos ); gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &pos );
} }
void wxTextCtrl::Cut() void wxTextCtrl::Cut()
{ {
wxCHECK_RET( m_text != NULL, "invalid text ctrl" ); wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
#if (GTK_MINOR_VERSION == 1) #if (GTK_MINOR_VERSION == 1)
gtk_editable_cut_clipboard( GTK_EDITABLE(m_text) ); gtk_editable_cut_clipboard( GTK_EDITABLE(m_text) );
#else #else
gtk_editable_cut_clipboard( GTK_EDITABLE(m_text), 0 ); gtk_editable_cut_clipboard( GTK_EDITABLE(m_text), 0 );
#endif #endif
} }
void wxTextCtrl::Copy() void wxTextCtrl::Copy()
{ {
wxCHECK_RET( m_text != NULL, "invalid text ctrl" ); wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
#if (GTK_MINOR_VERSION == 1) #if (GTK_MINOR_VERSION == 1)
gtk_editable_copy_clipboard( GTK_EDITABLE(m_text) ); gtk_editable_copy_clipboard( GTK_EDITABLE(m_text) );
#else #else
gtk_editable_copy_clipboard( GTK_EDITABLE(m_text), 0 ); gtk_editable_copy_clipboard( GTK_EDITABLE(m_text), 0 );
#endif #endif
} }
void wxTextCtrl::Paste() void wxTextCtrl::Paste()
{ {
wxCHECK_RET( m_text != NULL, "invalid text ctrl" ); wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
#if (GTK_MINOR_VERSION == 1) #if (GTK_MINOR_VERSION == 1)
gtk_editable_paste_clipboard( GTK_EDITABLE(m_text) ); gtk_editable_paste_clipboard( GTK_EDITABLE(m_text) );
#else #else
gtk_editable_paste_clipboard( GTK_EDITABLE(m_text), 0 ); gtk_editable_paste_clipboard( GTK_EDITABLE(m_text), 0 );
#endif #endif
} }
void wxTextCtrl::Clear() void wxTextCtrl::Clear()
{ {
SetValue( "" ); SetValue( "" );
} }
void wxTextCtrl::OnChar( wxKeyEvent &key_event ) void wxTextCtrl::OnChar( wxKeyEvent &key_event )
{ {
if ((key_event.KeyCode() == WXK_RETURN) && (m_windowStyle & wxPROCESS_ENTER)) wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
{
wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId); if ((key_event.KeyCode() == WXK_RETURN) && (m_windowStyle & wxPROCESS_ENTER))
event.SetEventObject(this); {
if (GetEventHandler()->ProcessEvent(event)) return; wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
} event.SetEventObject(this);
else if (key_event.KeyCode() == WXK_TAB) if (GetEventHandler()->ProcessEvent(event)) return;
{ }
wxNavigationKeyEvent event; else if (key_event.KeyCode() == WXK_TAB)
event.SetDirection( key_event.m_shiftDown ); {
event.SetWindowChange(FALSE); wxNavigationKeyEvent event;
event.SetEventObject(this); event.SetDirection( key_event.m_shiftDown );
event.SetWindowChange(FALSE);
event.SetEventObject(this);
if (GetEventHandler()->ProcessEvent(event)) return; if (GetEventHandler()->ProcessEvent(event)) return;
} }
key_event.Skip(); key_event.Skip();
} }
int wxTextCtrl::overflow( int WXUNUSED(c) ) int wxTextCtrl::overflow( int WXUNUSED(c) )
{ {
int len = pptr() - pbase(); int len = pptr() - pbase();
char *txt = new char[len+1]; char *txt = new char[len+1];
strncpy(txt, pbase(), len); strncpy(txt, pbase(), len);
txt[len] = '\0'; txt[len] = '\0';
(*this) << txt; (*this) << txt;
setp(pbase(), epptr()); setp(pbase(), epptr());
delete[] txt; delete[] txt;
return EOF; return EOF;
} }
int wxTextCtrl::sync() int wxTextCtrl::sync()
{ {
int len = pptr() - pbase(); int len = pptr() - pbase();
char *txt = new char[len+1]; char *txt = new char[len+1];
strncpy(txt, pbase(), len); strncpy(txt, pbase(), len);
txt[len] = '\0'; txt[len] = '\0';
(*this) << txt; (*this) << txt;
setp(pbase(), epptr()); setp(pbase(), epptr());
delete[] txt; delete[] txt;
return 0; return 0;
} }
int wxTextCtrl::underflow() int wxTextCtrl::underflow()
{ {
return EOF; return EOF;
} }
wxTextCtrl& wxTextCtrl::operator<<(const wxString& s) wxTextCtrl& wxTextCtrl::operator<<(const wxString& s)
{ {
WriteText(s); WriteText(s);
return *this; return *this;
} }
wxTextCtrl& wxTextCtrl::operator<<(float f) wxTextCtrl& wxTextCtrl::operator<<(float f)
{ {
static char buf[100]; static char buf[100];
sprintf(buf, "%.2f", f); sprintf(buf, "%.2f", f);
WriteText(buf); WriteText(buf);
return *this; return *this;
} }
wxTextCtrl& wxTextCtrl::operator<<(double d) wxTextCtrl& wxTextCtrl::operator<<(double d)
{ {
static char buf[100]; static char buf[100];
sprintf(buf, "%.2f", d); sprintf(buf, "%.2f", d);
WriteText(buf); WriteText(buf);
return *this; return *this;
} }
wxTextCtrl& wxTextCtrl::operator<<(int i) wxTextCtrl& wxTextCtrl::operator<<(int i)
{ {
static char buf[100]; static char buf[100];
sprintf(buf, "%i", i); sprintf(buf, "%i", i);
WriteText(buf); WriteText(buf);
return *this; return *this;
} }
wxTextCtrl& wxTextCtrl::operator<<(long i) wxTextCtrl& wxTextCtrl::operator<<(long i)
{ {
static char buf[100]; static char buf[100];
sprintf(buf, "%ld", i); sprintf(buf, "%ld", i);
WriteText(buf); WriteText(buf);
return *this; return *this;
} }
wxTextCtrl& wxTextCtrl::operator<<(const char c) wxTextCtrl& wxTextCtrl::operator<<(const char c)
{ {
char buf[2]; char buf[2];
buf[0] = c; buf[0] = c;
buf[1] = 0; buf[1] = 0;
WriteText(buf); WriteText(buf);
return *this; return *this;
} }
GtkWidget* wxTextCtrl::GetConnectWidget() GtkWidget* wxTextCtrl::GetConnectWidget()
@@ -700,6 +752,7 @@ void wxTextCtrl::ApplyWidgetStyle()
{ {
if (m_windowStyle & wxTE_MULTILINE) if (m_windowStyle & wxTE_MULTILINE)
{ {
// how ?
} }
else else
{ {

18
src/gtk1/clipbrd.cpp
View File

@@ -155,7 +155,7 @@ static gint
selection_clear( GtkWidget *WXUNUSED(widget), GdkEventSelection *WXUNUSED(event) ) selection_clear( GtkWidget *WXUNUSED(widget), GdkEventSelection *WXUNUSED(event) )
{ {
if (!wxTheClipboard) return TRUE; if (!wxTheClipboard) return TRUE;
// the clipboard is no longer in our hands. we have to delete the // the clipboard is no longer in our hands. we have to delete the
// clipboard data. // clipboard data.
@@ -307,6 +307,22 @@ bool wxClipboard::SetData( wxDataObject *data )
{ {
wxCHECK_MSG( data, FALSE, "data is invalid" ); wxCHECK_MSG( data, FALSE, "data is invalid" );
wxNode *node = m_dataObjects.First();
while (node)
{
wxDataObject *d = (wxDataObject*)node->Data();
if (d->GetFormat() == data->GetFormat())
{
m_dataObjects.DeleteNode( node );
break;
}
node = node->Next();
}
m_dataObjects.Append( data ); m_dataObjects.Append( data );
wxCHECK_MSG( m_open, FALSE, "clipboard not open" ); wxCHECK_MSG( m_open, FALSE, "clipboard not open" );

2
src/gtk1/dialog.cpp
View File

@@ -245,7 +245,7 @@ void wxDialog::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int heigh
void wxDialog::OnSize( wxSizeEvent &WXUNUSED(event) ) void wxDialog::OnSize( wxSizeEvent &WXUNUSED(event) )
{ {
wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); wxASSERT_MSG( (m_widget != NULL), "invalid dialog" );
if (GetAutoLayout()) if (GetAutoLayout())
{ {

12
src/gtk1/dnd.cpp
View File

@@ -642,10 +642,12 @@ void gtk_drag_callback( GtkWidget *widget, GdkEvent *event, wxDropSource *source
wxString text = text_object->GetText(); wxString text = text_object->GetText();
char *s = WXSTRINGCAST text;
gtk_widget_dnd_data_set( widget, gtk_widget_dnd_data_set( widget,
event, event,
(unsigned char*) text.c_str, (unsigned char*) s,
(int) text.Length() ); (int) text.Length()+1 );
break; break;
} }
@@ -656,10 +658,12 @@ void gtk_drag_callback( GtkWidget *widget, GdkEvent *event, wxDropSource *source
wxString text = file_object->GetFiles(); wxString text = file_object->GetFiles();
char *s = WXSTRINGCAST text;
gtk_widget_dnd_data_set( widget, gtk_widget_dnd_data_set( widget,
event, event,
(unsigned char*) text.c_str, (unsigned char*) s,
(int) text.Length() ); (int) text.Length()+1 );
break; break;
} }

557
src/gtk1/textctrl.cpp
View File

@@ -24,17 +24,31 @@
// "changed" // "changed"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static void gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win ) static void
gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
{ {
win->SetModified(); win->SetModified();
win->CalculateScrollbar();
wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->m_windowId ); wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->m_windowId );
wxString val( win->GetValue() ); wxString val( win->GetValue() );
if (!val.IsNull()) event.m_commandString = WXSTRINGCAST val; if (!val.IsNull()) event.m_commandString = WXSTRINGCAST val;
event.SetEventObject( win ); event.SetEventObject( win );
win->GetEventHandler()->ProcessEvent( event ); win->GetEventHandler()->ProcessEvent( event );
} }
//-----------------------------------------------------------------------------
// "size_allocate"
//-----------------------------------------------------------------------------
static void
gtk_text_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* WXUNUSED(alloc), wxTextCtrl *win )
{
win->CalculateScrollbar();
}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxTextCtrl // wxTextCtrl
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -42,186 +56,217 @@ static void gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *
IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl,wxControl) IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl,wxControl)
BEGIN_EVENT_TABLE(wxTextCtrl, wxControl) BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
EVT_CHAR(wxTextCtrl::OnChar) EVT_CHAR(wxTextCtrl::OnChar)
END_EVENT_TABLE() END_EVENT_TABLE()
wxTextCtrl::wxTextCtrl() : streambuf() wxTextCtrl::wxTextCtrl() : streambuf()
{ {
if (allocate()) setp(base(),ebuf()); if (allocate()) setp(base(),ebuf());
m_modified = FALSE; m_modified = FALSE;
} }
wxTextCtrl::wxTextCtrl( wxWindow *parent, wxWindowID id, const wxString &value, wxTextCtrl::wxTextCtrl( wxWindow *parent, wxWindowID id, const wxString &value,
const wxPoint &pos, const wxSize &size, const wxPoint &pos, const wxSize &size,
int style, const wxValidator& validator, const wxString &name ) : streambuf() int style, const wxValidator& validator, const wxString &name ) : streambuf()
{ {
if (allocate()) setp(base(),ebuf()); if (allocate()) setp(base(),ebuf());
m_modified = FALSE; m_modified = FALSE;
Create( parent, id, value, pos, size, style, validator, name ); Create( parent, id, value, pos, size, style, validator, name );
} }
bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value, bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
const wxPoint &pos, const wxSize &size, const wxPoint &pos, const wxSize &size,
int style, const wxValidator& validator, const wxString &name ) int style, const wxValidator& validator, const wxString &name )
{ {
m_needParent = TRUE; m_needParent = TRUE;
PreCreation( parent, id, pos, size, style, name ); PreCreation( parent, id, pos, size, style, name );
SetValidator( validator ); SetValidator( validator );
m_vScrollbarVisible = TRUE;
bool multi_line = (style & wxTE_MULTILINE) != 0; bool multi_line = (style & wxTE_MULTILINE) != 0;
if ( multi_line ) if ( multi_line )
{ {
// a multi-line edit control: create a vertical scrollbar by default and // a multi-line edit control: create a vertical scrollbar by default and
// horizontal if requested // horizontal if requested
bool bHasHScrollbar = (style & wxHSCROLL) != 0; bool bHasHScrollbar = (style & wxHSCROLL) != 0;
// create our control...
m_text = gtk_text_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL );
// create our control... // ... and put into the upper left hand corner of the table
m_text = gtk_text_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL ); m_widget = gtk_table_new(bHasHScrollbar ? 2 : 1, 2, FALSE);
gtk_table_attach( GTK_TABLE(m_widget), m_text, 0, 1, 0, 1,
// ... and put into the upper left hand corner of the table
m_widget = gtk_table_new(bHasHScrollbar ? 2 : 1, 2, FALSE);
gtk_table_attach( GTK_TABLE(m_widget), m_text, 0, 1, 0, 1,
(GtkAttachOptions)(GTK_FILL | GTK_EXPAND | GTK_SHRINK), (GtkAttachOptions)(GTK_FILL | GTK_EXPAND | GTK_SHRINK),
(GtkAttachOptions)(GTK_FILL | GTK_EXPAND | GTK_SHRINK), (GtkAttachOptions)(GTK_FILL | GTK_EXPAND | GTK_SHRINK),
0, 0); 0, 0);
// put the horizontal scrollbar in the lower left hand corner // put the horizontal scrollbar in the lower left hand corner
if (bHasHScrollbar) if (bHasHScrollbar)
{ {
GtkWidget *hscrollbar = gtk_hscrollbar_new(GTK_TEXT(m_text)->hadj); GtkWidget *hscrollbar = gtk_hscrollbar_new(GTK_TEXT(m_text)->hadj);
gtk_table_attach(GTK_TABLE(m_widget), hscrollbar, 0, 1, 1, 2, gtk_table_attach(GTK_TABLE(m_widget), hscrollbar, 0, 1, 1, 2,
(GtkAttachOptions)(GTK_EXPAND | GTK_FILL), (GtkAttachOptions)(GTK_EXPAND | GTK_FILL),
GTK_FILL, GTK_FILL,
0, 0); 0, 0);
gtk_widget_show(hscrollbar); gtk_widget_show(hscrollbar);
} }
// finally, put the vertical scrollbar in the upper right corner // finally, put the vertical scrollbar in the upper right corner
GtkWidget *vscrollbar = gtk_vscrollbar_new(GTK_TEXT(m_text)->vadj); m_vScrollbar = gtk_vscrollbar_new( GTK_TEXT(m_text)->vadj );
gtk_table_attach(GTK_TABLE(m_widget), vscrollbar, 1, 2, 0, 1, gtk_table_attach(GTK_TABLE(m_widget), m_vScrollbar, 1, 2, 0, 1,
GTK_FILL, GTK_FILL,
(GtkAttachOptions)(GTK_EXPAND | GTK_FILL | GTK_SHRINK), (GtkAttachOptions)(GTK_EXPAND | GTK_FILL | GTK_SHRINK),
0, 0); 0, 0);
gtk_widget_show( vscrollbar ); gtk_widget_show( m_vScrollbar );
}
else gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
{ GTK_SIGNAL_FUNC(gtk_text_size_callback), (gpointer)this );
// a single-line text control: no need for scrollbars }
m_widget = else
m_text = gtk_entry_new(); {
} // a single-line text control: no need for scrollbars
m_widget =
m_text = gtk_entry_new();
}
wxSize newSize = size; wxSize newSize = size;
if (newSize.x == -1) newSize.x = 80; if (newSize.x == -1) newSize.x = 80;
if (newSize.y == -1) newSize.y = 26; if (newSize.y == -1) newSize.y = 26;
SetSize( newSize.x, newSize.y ); SetSize( newSize.x, newSize.y );
m_parent->AddChild( this ); m_parent->AddChild( this );
(m_parent->m_insertCallback)( m_parent, this ); (m_parent->m_insertCallback)( m_parent, this );
PostCreation(); PostCreation();
if (multi_line) if (multi_line)
{ {
gtk_widget_realize(m_text); gtk_widget_realize(m_text);
gtk_widget_show(m_text); gtk_widget_show(m_text);
} }
// we want to be notified about text changes // we want to be notified about text changes
gtk_signal_connect(GTK_OBJECT(m_text), "changed", gtk_signal_connect(GTK_OBJECT(m_text), "changed",
GTK_SIGNAL_FUNC(gtk_text_changed_callback), GTK_SIGNAL_FUNC(gtk_text_changed_callback),
(gpointer)this); (gpointer)this);
if (!value.IsNull()) if (!value.IsNull())
{ {
gint tmp = 0; gint tmp = 0;
gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &tmp ); gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &tmp );
SetInsertionPointEnd(); SetInsertionPointEnd();
} }
if (style & wxTE_PASSWORD) if (style & wxTE_PASSWORD)
{ {
if (!multi_line) if (!multi_line)
gtk_entry_set_visibility( GTK_ENTRY(m_text), FALSE ); gtk_entry_set_visibility( GTK_ENTRY(m_text), FALSE );
} }
if (style & wxTE_READONLY) if (style & wxTE_READONLY)
{ {
if (!multi_line) if (!multi_line)
gtk_entry_set_editable( GTK_ENTRY(m_text), FALSE ); gtk_entry_set_editable( GTK_ENTRY(m_text), FALSE );
} }
else else
{ {
if (multi_line) if (multi_line)
gtk_text_set_editable( GTK_TEXT(m_text), 1 ); gtk_text_set_editable( GTK_TEXT(m_text), 1 );
} }
Show( TRUE );
SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() );
Show( TRUE ); return TRUE;
}
SetBackgroundColour( parent->GetBackgroundColour() ); void wxTextCtrl::CalculateScrollbar()
SetForegroundColour( parent->GetForegroundColour() ); {
if ((m_windowStyle & wxTE_MULTILINE) == 0) return;
return TRUE; GtkAdjustment *adj = GTK_TEXT(m_text)->vadj;
if (adj->upper - adj->page_size < 0.8)
{
if (m_vScrollbarVisible)
{
gtk_widget_hide( m_vScrollbar );
m_vScrollbarVisible = FALSE;
}
}
else
{
if (!m_vScrollbarVisible)
{
gtk_widget_show( m_vScrollbar );
m_vScrollbarVisible = TRUE;
}
}
} }
wxString wxTextCtrl::GetValue() const wxString wxTextCtrl::GetValue() const
{ {
wxCHECK_MSG( m_text != NULL, "", "invalid text ctrl" ); wxCHECK_MSG( m_text != NULL, "", "invalid text ctrl" );
wxString tmp; wxString tmp;
if (m_windowStyle & wxTE_MULTILINE) if (m_windowStyle & wxTE_MULTILINE)
{ {
gint len = gtk_text_get_length( GTK_TEXT(m_text) ); gint len = gtk_text_get_length( GTK_TEXT(m_text) );
char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len ); char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len );
tmp = text; tmp = text;
g_free( text ); g_free( text );
} }
else else
{ {
tmp = gtk_entry_get_text( GTK_ENTRY(m_text) ); tmp = gtk_entry_get_text( GTK_ENTRY(m_text) );
} }
return tmp; return tmp;
} }
void wxTextCtrl::SetValue( const wxString &value ) void wxTextCtrl::SetValue( const wxString &value )
{ {
wxCHECK_RET( m_text != NULL, "invalid text ctrl" ); wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
wxString tmp = ""; wxString tmp = "";
if (!value.IsNull()) tmp = value; if (!value.IsNull()) tmp = value;
if (m_windowStyle & wxTE_MULTILINE) if (m_windowStyle & wxTE_MULTILINE)
{ {
gint len = gtk_text_get_length( GTK_TEXT(m_text) ); gint len = gtk_text_get_length( GTK_TEXT(m_text) );
gtk_editable_delete_text( GTK_EDITABLE(m_text), 0, len ); gtk_editable_delete_text( GTK_EDITABLE(m_text), 0, len );
len = 0; len = 0;
gtk_editable_insert_text( GTK_EDITABLE(m_text), tmp, tmp.Length(), &len ); gtk_editable_insert_text( GTK_EDITABLE(m_text), tmp, tmp.Length(), &len );
} }
else else
{ {
gtk_entry_set_text( GTK_ENTRY(m_text), tmp ); gtk_entry_set_text( GTK_ENTRY(m_text), tmp );
} }
} }
void wxTextCtrl::WriteText( const wxString &text ) void wxTextCtrl::WriteText( const wxString &text )
{ {
wxCHECK_RET( m_text != NULL, "invalid text ctrl" ); wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
if (text.IsNull()) return; if (text.IsNull()) return;
if (m_windowStyle & wxTE_MULTILINE) if (m_windowStyle & wxTE_MULTILINE)
{ {
gint len = gtk_text_get_length( GTK_TEXT(m_text) ); gint len = gtk_text_get_length( GTK_TEXT(m_text) );
gtk_editable_insert_text( GTK_EDITABLE(m_text), text, text.Length(), &len ); gtk_editable_insert_text( GTK_EDITABLE(m_text), text, text.Length(), &len );
} }
else else
{ {
gtk_entry_append_text( GTK_ENTRY(m_text), text ); gtk_entry_append_text( GTK_ENTRY(m_text), text );
} }
} }
bool wxTextCtrl::LoadFile( const wxString &file ) bool wxTextCtrl::LoadFile( const wxString &file )
@@ -354,7 +399,7 @@ wxString wxTextCtrl::GetLineText( long lineNo ) const
void wxTextCtrl::OnDropFiles( wxDropFilesEvent &WXUNUSED(event) ) void wxTextCtrl::OnDropFiles( wxDropFilesEvent &WXUNUSED(event) )
{ {
wxFAIL_MSG( "wxTextCtrl::OnDropFiles not implemented" ); wxFAIL_MSG( "wxTextCtrl::OnDropFiles not implemented" );
} }
long wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const long wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const
@@ -386,14 +431,14 @@ long wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const
long wxTextCtrl::XYToPosition(long x, long y ) const long wxTextCtrl::XYToPosition(long x, long y ) const
{ {
if (!(m_windowStyle & wxTE_MULTILINE)) if (!(m_windowStyle & wxTE_MULTILINE)) return 0;
return 0;
long pos=0; long pos=0;
for(int i=1;i<y;i++) for( int i=1; i<y; i++ ) pos += GetLineLength(i);
pos +=GetLineLength(i);
pos +=x-1; // Pos start with 0 pos +=x-1; // Pos start with 0
return pos; return pos;
} }
int wxTextCtrl::GetLineLength(long lineNo) const int wxTextCtrl::GetLineLength(long lineNo) const
@@ -404,244 +449,251 @@ int wxTextCtrl::GetLineLength(long lineNo) const
int wxTextCtrl::GetNumberOfLines() const int wxTextCtrl::GetNumberOfLines() const
{ {
if (m_windowStyle & wxTE_MULTILINE) if (m_windowStyle & wxTE_MULTILINE)
{
gint len = gtk_text_get_length( GTK_TEXT(m_text) );
char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len );
if (text)
{ {
int currentLine = 0; gint len = gtk_text_get_length( GTK_TEXT(m_text) );
for (int i = 0; i < len; i++ ) char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len );
if (text[i] == '\n')
currentLine++;
g_free( text ); if (text)
return currentLine; {
int currentLine = 0;
for (int i = 0; i < len; i++ )
{
if (text[i] == '\n')
currentLine++;
}
g_free( text );
return currentLine;
}
else
{
return 0;
}
} }
else else
return 0; {
} return 1;
else }
{
return 1;
}
} }
void wxTextCtrl::SetInsertionPoint( long pos ) void wxTextCtrl::SetInsertionPoint( long pos )
{ {
wxCHECK_RET( m_text != NULL, "invalid text ctrl" ); wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
int tmp = (int) pos; int tmp = (int) pos;
if (m_windowStyle & wxTE_MULTILINE) if (m_windowStyle & wxTE_MULTILINE)
gtk_text_set_point( GTK_TEXT(m_text), tmp ); gtk_text_set_point( GTK_TEXT(m_text), tmp );
else else
gtk_entry_set_position( GTK_ENTRY(m_text), tmp ); gtk_entry_set_position( GTK_ENTRY(m_text), tmp );
} }
void wxTextCtrl::SetInsertionPointEnd() void wxTextCtrl::SetInsertionPointEnd()
{ {
wxCHECK_RET( m_text != NULL, "invalid text ctrl" ); wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
int pos = 0; int pos = 0;
if (m_windowStyle & wxTE_MULTILINE) if (m_windowStyle & wxTE_MULTILINE)
pos = gtk_text_get_length( GTK_TEXT(m_text) ); pos = gtk_text_get_length( GTK_TEXT(m_text) );
else else
pos = GTK_ENTRY(m_text)->text_length; pos = GTK_ENTRY(m_text)->text_length;
SetInsertionPoint((pos-1)>0 ? (pos-1):0);
SetInsertionPoint((pos-1)>0 ? (pos-1):0);
} }
void wxTextCtrl::SetEditable( bool editable ) void wxTextCtrl::SetEditable( bool editable )
{ {
wxCHECK_RET( m_text != NULL, "invalid text ctrl" ); wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
if (m_windowStyle & wxTE_MULTILINE) if (m_windowStyle & wxTE_MULTILINE)
gtk_text_set_editable( GTK_TEXT(m_text), editable ); gtk_text_set_editable( GTK_TEXT(m_text), editable );
else else
gtk_entry_set_editable( GTK_ENTRY(m_text), editable ); gtk_entry_set_editable( GTK_ENTRY(m_text), editable );
} }
void wxTextCtrl::SetSelection( long from, long to ) void wxTextCtrl::SetSelection( long from, long to )
{ {
wxCHECK_RET( m_text != NULL, "invalid text ctrl" ); wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to ); gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to );
} }
void wxTextCtrl::ShowPosition( long WXUNUSED(pos) ) void wxTextCtrl::ShowPosition( long WXUNUSED(pos) )
{ {
wxFAIL_MSG( "wxTextCtrl::ShowPosition not implemented" ); wxFAIL_MSG( "wxTextCtrl::ShowPosition not implemented" );
} }
long wxTextCtrl::GetInsertionPoint() const long wxTextCtrl::GetInsertionPoint() const
{ {
wxCHECK_MSG( m_text != NULL, 0, "invalid text ctrl" ); wxCHECK_MSG( m_text != NULL, 0, "invalid text ctrl" );
return (long) GTK_EDITABLE(m_text)->current_pos; return (long) GTK_EDITABLE(m_text)->current_pos;
} }
long wxTextCtrl::GetLastPosition() const long wxTextCtrl::GetLastPosition() const
{ {
wxCHECK_MSG( m_text != NULL, 0, "invalid text ctrl" ); wxCHECK_MSG( m_text != NULL, 0, "invalid text ctrl" );
int pos = 0; int pos = 0;
if (m_windowStyle & wxTE_MULTILINE) if (m_windowStyle & wxTE_MULTILINE)
pos = gtk_text_get_length( GTK_TEXT(m_text) ); pos = gtk_text_get_length( GTK_TEXT(m_text) );
else else
pos = GTK_ENTRY(m_text)->text_length; pos = GTK_ENTRY(m_text)->text_length;
return (long)pos-1;
return (long)pos-1;
} }
void wxTextCtrl::Remove( long from, long to ) void wxTextCtrl::Remove( long from, long to )
{ {
wxCHECK_RET( m_text != NULL, "invalid text ctrl" ); wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to ); gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to );
} }
void wxTextCtrl::Replace( long from, long to, const wxString &value ) void wxTextCtrl::Replace( long from, long to, const wxString &value )
{ {
wxCHECK_RET( m_text != NULL, "invalid text ctrl" ); wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to ); gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to );
if (value.IsNull()) return; if (value.IsNull()) return;
gint pos = (gint)to; gint pos = (gint)to;
gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &pos ); gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &pos );
} }
void wxTextCtrl::Cut() void wxTextCtrl::Cut()
{ {
wxCHECK_RET( m_text != NULL, "invalid text ctrl" ); wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
#if (GTK_MINOR_VERSION == 1) #if (GTK_MINOR_VERSION == 1)
gtk_editable_cut_clipboard( GTK_EDITABLE(m_text) ); gtk_editable_cut_clipboard( GTK_EDITABLE(m_text) );
#else #else
gtk_editable_cut_clipboard( GTK_EDITABLE(m_text), 0 ); gtk_editable_cut_clipboard( GTK_EDITABLE(m_text), 0 );
#endif #endif
} }
void wxTextCtrl::Copy() void wxTextCtrl::Copy()
{ {
wxCHECK_RET( m_text != NULL, "invalid text ctrl" ); wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
#if (GTK_MINOR_VERSION == 1) #if (GTK_MINOR_VERSION == 1)
gtk_editable_copy_clipboard( GTK_EDITABLE(m_text) ); gtk_editable_copy_clipboard( GTK_EDITABLE(m_text) );
#else #else
gtk_editable_copy_clipboard( GTK_EDITABLE(m_text), 0 ); gtk_editable_copy_clipboard( GTK_EDITABLE(m_text), 0 );
#endif #endif
} }
void wxTextCtrl::Paste() void wxTextCtrl::Paste()
{ {
wxCHECK_RET( m_text != NULL, "invalid text ctrl" ); wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
#if (GTK_MINOR_VERSION == 1) #if (GTK_MINOR_VERSION == 1)
gtk_editable_paste_clipboard( GTK_EDITABLE(m_text) ); gtk_editable_paste_clipboard( GTK_EDITABLE(m_text) );
#else #else
gtk_editable_paste_clipboard( GTK_EDITABLE(m_text), 0 ); gtk_editable_paste_clipboard( GTK_EDITABLE(m_text), 0 );
#endif #endif
} }
void wxTextCtrl::Clear() void wxTextCtrl::Clear()
{ {
SetValue( "" ); SetValue( "" );
} }
void wxTextCtrl::OnChar( wxKeyEvent &key_event ) void wxTextCtrl::OnChar( wxKeyEvent &key_event )
{ {
if ((key_event.KeyCode() == WXK_RETURN) && (m_windowStyle & wxPROCESS_ENTER)) wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
{
wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId); if ((key_event.KeyCode() == WXK_RETURN) && (m_windowStyle & wxPROCESS_ENTER))
event.SetEventObject(this); {
if (GetEventHandler()->ProcessEvent(event)) return; wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
} event.SetEventObject(this);
else if (key_event.KeyCode() == WXK_TAB) if (GetEventHandler()->ProcessEvent(event)) return;
{ }
wxNavigationKeyEvent event; else if (key_event.KeyCode() == WXK_TAB)
event.SetDirection( key_event.m_shiftDown ); {
event.SetWindowChange(FALSE); wxNavigationKeyEvent event;
event.SetEventObject(this); event.SetDirection( key_event.m_shiftDown );
event.SetWindowChange(FALSE);
event.SetEventObject(this);
if (GetEventHandler()->ProcessEvent(event)) return; if (GetEventHandler()->ProcessEvent(event)) return;
} }
key_event.Skip(); key_event.Skip();
} }
int wxTextCtrl::overflow( int WXUNUSED(c) ) int wxTextCtrl::overflow( int WXUNUSED(c) )
{ {
int len = pptr() - pbase(); int len = pptr() - pbase();
char *txt = new char[len+1]; char *txt = new char[len+1];
strncpy(txt, pbase(), len); strncpy(txt, pbase(), len);
txt[len] = '\0'; txt[len] = '\0';
(*this) << txt; (*this) << txt;
setp(pbase(), epptr()); setp(pbase(), epptr());
delete[] txt; delete[] txt;
return EOF; return EOF;
} }
int wxTextCtrl::sync() int wxTextCtrl::sync()
{ {
int len = pptr() - pbase(); int len = pptr() - pbase();
char *txt = new char[len+1]; char *txt = new char[len+1];
strncpy(txt, pbase(), len); strncpy(txt, pbase(), len);
txt[len] = '\0'; txt[len] = '\0';
(*this) << txt; (*this) << txt;
setp(pbase(), epptr()); setp(pbase(), epptr());
delete[] txt; delete[] txt;
return 0; return 0;
} }
int wxTextCtrl::underflow() int wxTextCtrl::underflow()
{ {
return EOF; return EOF;
} }
wxTextCtrl& wxTextCtrl::operator<<(const wxString& s) wxTextCtrl& wxTextCtrl::operator<<(const wxString& s)
{ {
WriteText(s); WriteText(s);
return *this; return *this;
} }
wxTextCtrl& wxTextCtrl::operator<<(float f) wxTextCtrl& wxTextCtrl::operator<<(float f)
{ {
static char buf[100]; static char buf[100];
sprintf(buf, "%.2f", f); sprintf(buf, "%.2f", f);
WriteText(buf); WriteText(buf);
return *this; return *this;
} }
wxTextCtrl& wxTextCtrl::operator<<(double d) wxTextCtrl& wxTextCtrl::operator<<(double d)
{ {
static char buf[100]; static char buf[100];
sprintf(buf, "%.2f", d); sprintf(buf, "%.2f", d);
WriteText(buf); WriteText(buf);
return *this; return *this;
} }
wxTextCtrl& wxTextCtrl::operator<<(int i) wxTextCtrl& wxTextCtrl::operator<<(int i)
{ {
static char buf[100]; static char buf[100];
sprintf(buf, "%i", i); sprintf(buf, "%i", i);
WriteText(buf); WriteText(buf);
return *this; return *this;
} }
wxTextCtrl& wxTextCtrl::operator<<(long i) wxTextCtrl& wxTextCtrl::operator<<(long i)
{ {
static char buf[100]; static char buf[100];
sprintf(buf, "%ld", i); sprintf(buf, "%ld", i);
WriteText(buf); WriteText(buf);
return *this; return *this;
} }
wxTextCtrl& wxTextCtrl::operator<<(const char c) wxTextCtrl& wxTextCtrl::operator<<(const char c)
{ {
char buf[2]; char buf[2];
buf[0] = c; buf[0] = c;
buf[1] = 0; buf[1] = 0;
WriteText(buf); WriteText(buf);
return *this; return *this;
} }
GtkWidget* wxTextCtrl::GetConnectWidget() GtkWidget* wxTextCtrl::GetConnectWidget()
@@ -700,6 +752,7 @@ void wxTextCtrl::ApplyWidgetStyle()
{ {
if (m_windowStyle & wxTE_MULTILINE) if (m_windowStyle & wxTE_MULTILINE)
{ {
// how ?
} }
else else
{ {