Skip to content

WIDGET_TEXT WIP following #1544 #1552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 21, 2023
Merged

WIDGET_TEXT WIP following #1544 #1552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/gdlwidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5565,7 +5565,7 @@ bool editable_ )
wxTextAttr attr= wxTextAttr ();
attr.SetFont(font, wxTEXT_ATTR_FONT);
wxString valueWxString = wxString( lastValue.c_str( ), wxConvUTF8 );
long textStyle = wxTE_RICH2|wxTE_NOHIDESEL;
long textStyle = wxTE_PROCESS_ENTER|wxTE_RICH2|wxTE_NOHIDESEL; //PROCESS_ENTER is trapped and ignored --- check if this is OK for all platforms.

if (multiline) textStyle |= wxTE_MULTILINE;
if (!scrolled) {textStyle |= wxTE_NO_VSCROLL;} else {textStyle |= wxHSCROLL;}
Expand All @@ -5592,7 +5592,7 @@ bool editable_ )
END_ADD_EVENTUAL_FRAME
TIDY_WIDGET(gdlBORDER_SPACE)

// this->AddToDesiredEvents( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler(gdlwxFrame::OnTextEnter),text); //NOT USED
this->AddToDesiredEvents( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler(gdlwxFrame::OnTextEnter),text); //NOT USED
if( editable || report) this->AddToDesiredEvents(wxEVT_CHAR, wxKeyEventHandler(wxTextCtrlGDL::OnChar),text);
//add scrolling even if text is not scrollable since scroll is not permitted (IDL widgets are not at all the same as GTK...)
if (!scrolled) this->AddToDesiredEvents(wxEVT_MOUSEWHEEL, wxMouseEventHandler(wxTextCtrlGDL::OnMouseEvents),text);
Expand Down
2 changes: 1 addition & 1 deletion src/gdlwidget.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ class gdlwxFrame : public wxFrame {
void OnTextMouseEvents(wxMouseEvent& event);
void OnTextPaste(wxClipboardTextEvent& event);
void OnTextCut(wxClipboardTextEvent& event);
// void OnTextEnter( wxCommandEvent& event); //NOT USED
void OnTextEnter( wxCommandEvent& event); //NOT USED
void OnThumbTrack(wxScrollEvent& event);
void OnThumbRelease(wxScrollEvent& event);
void OnSize(wxSizeEvent& event); //unused.
Expand Down
24 changes: 20 additions & 4 deletions src/gdlwidgeteventhandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,6 @@ void wxTextCtrlGDL::OnChar(wxKeyEvent& event ) {
this->GetSelection( &from, &to );
long oldpos = this->GetInsertionPoint( ), newpos;
switch ( event.GetKeyCode( ) ) {
case WXK_TAB:
event.Skip(); return;
break;
case WXK_END:
newpos = this->GetLastPosition( );
this->SetInsertionPoint( newpos );
Expand Down Expand Up @@ -204,6 +201,19 @@ void wxTextCtrlGDL::OnChar(wxKeyEvent& event ) {
if (edit) event.Skip( ); //do it!
return;
break;
case WXK_TAB:
widg = new DStructGDL( "WIDGET_TEXT_CH" );
widg->InitTag( "ID", DLongGDL( event.GetId( ) ) );
widg->InitTag( "TOP", DLongGDL( baseWidgetID ) );
widg->InitTag( "HANDLER", DLongGDL( baseWidgetID ) );
widg->InitTag( "TYPE", DIntGDL( 0 ) ); // selection
widg->InitTag( "OFFSET", DLongGDL( from ) );
widg->InitTag( "CH", DByteGDL( 9 ) );
GDLWidget::PushEvent( baseWidgetID, widg );
//if (!edit) event.Skip( ); //do NOT skip
if (edit) this->WriteText("\t"); //necessary!
return;
break;
case WXK_RETURN: //important, *DL returns CH=10 instead of 13 for <CR>
widg = new DStructGDL( "WIDGET_TEXT_CH" );
widg->InitTag( "ID", DLongGDL( event.GetId( ) ) );
Expand Down Expand Up @@ -820,7 +830,13 @@ void gdlwxFrame::OnText( wxCommandEvent& event)
GDLWidget::PushEvent( baseWidgetID, widg);
}


void gdlwxFrame::OnTextEnter( wxCommandEvent& event)
{
#if (GDL_DEBUG_ALL_EVENTS || GDL_DEBUG_TEXT_EVENTS)
wxMessageOutputStderr().Printf(_T("in gdlwxFrame::OnTextEnter: %d (ignored)\n"),event.GetId());
#endif
//ignore it.
}
//NOT USED
//void gdlwxFrame::OnTextEnter( wxCommandEvent& event)
//{
Expand Down