summaryrefslogtreecommitdiff
path: root/wx+/popup_dlg_generated.cpp
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2020-12-08 13:14:11 +0000
committerB Stack <bgstack15@gmail.com>2020-12-08 13:14:11 +0000
commit35adf35f7d3b7744d58d7ff27fcaf1bb843060aa (patch)
tree8e5414c3b8a914f57a1d4dc92ee0e55ae1f6e9ee /wx+/popup_dlg_generated.cpp
parentMerge branch '11.3' into 'master' (diff)
parentadd upstream 11.4 (diff)
downloadFreeFileSync-35adf35f7d3b7744d58d7ff27fcaf1bb843060aa.tar.gz
FreeFileSync-35adf35f7d3b7744d58d7ff27fcaf1bb843060aa.tar.bz2
FreeFileSync-35adf35f7d3b7744d58d7ff27fcaf1bb843060aa.zip
Merge branch '11.4' into 'master'11.4
add upstream 11.4 See merge request opensource-tracking/FreeFileSync!28
Diffstat (limited to 'wx+/popup_dlg_generated.cpp')
-rw-r--r--wx+/popup_dlg_generated.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/wx+/popup_dlg_generated.cpp b/wx+/popup_dlg_generated.cpp
index 8933b135..22e3d02c 100644
--- a/wx+/popup_dlg_generated.cpp
+++ b/wx+/popup_dlg_generated.cpp
@@ -36,11 +36,8 @@ PopupDialogGenerated::PopupDialogGenerated( wxWindow* parent, wxWindowID id, con
m_staticTextMain->Wrap( -1 );
bSizer16->Add( m_staticTextMain, 0, wxRIGHT, 10 );
-
- bSizer16->Add( 0, 5, 0, 0, 5 );
-
- m_textCtrlTextDetail = new wxTextCtrl( m_panel33, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxBORDER_NONE );
- bSizer16->Add( m_textCtrlTextDetail, 1, wxEXPAND, 5 );
+ m_richTextDetail = new wxRichTextCtrl( m_panel33, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY|wxBORDER_NONE|wxVSCROLL|wxWANTS_CHARS );
+ bSizer16->Add( m_richTextDetail, 1, wxEXPAND, 5 );
bSizer165->Add( bSizer16, 1, wxEXPAND, 5 );
bgstack15