diff --git a/CMakeLists.txt b/CMakeLists.txt index 96962a0..7770164 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,7 +51,7 @@ set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -s") # $ generates 1 or 0 if CONFIG is Debug or not. Then we use the conditional # expression $, so if the previous evaluates to 1, here the string is "--debug", # otherwise nothing. -set(wxWidgets_CONFIG_OPTIONS --version=3.0 --static=no $<$:--debug>) +set(wxWidgets_CONFIG_OPTIONS --version=3.2 --static=no $<$:--debug>) # these flags are BUILD_TYPE dependent # -D__WXDEBUG__: define that wxWidgets are in debug version #set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D__WXDEBUG__") diff --git a/FasterCapMain.cpp b/FasterCapMain.cpp index 89790f1..39d03e8 100644 --- a/FasterCapMain.cpp +++ b/FasterCapMain.cpp @@ -215,7 +215,7 @@ FasterCapFrame::FasterCapFrame(wxWindow* parent, bool isAutomated, wxWindowID id FlexGridSizer1 = new wxFlexGridSizer(0, 1, 0, 0); FlexGridSizer1->AddGrowableCol(0); FlexGridSizer1->AddGrowableRow(0); - TextOutputWindow = new wxTextCtrl(Panel1, ID_TEXTCTRL1, wxEmptyString, wxDefaultPosition, wxSize(1000,400), wxTE_AUTO_SCROLL|wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB|wxTE_MULTILINE|wxTE_RICH|wxTE_RICH2, wxDefaultValidator, _T("ID_TEXTCTRL1")); + TextOutputWindow = new wxTextCtrl(Panel1, ID_TEXTCTRL1, wxEmptyString, wxDefaultPosition, wxSize(1000,400), wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB|wxTE_MULTILINE|wxTE_RICH|wxTE_RICH2, wxDefaultValidator, _T("ID_TEXTCTRL1")); wxFont TextOutputWindowFont(10,wxTELETYPE,wxFONTSTYLE_NORMAL,wxNORMAL,false,wxEmptyString,wxFONTENCODING_DEFAULT); TextOutputWindow->SetFont(TextOutputWindowFont); FlexGridSizer1->Add(TextOutputWindow, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0); diff --git a/LicenseBox.cpp b/LicenseBox.cpp index f471bd1..5c27d98 100644 --- a/LicenseBox.cpp +++ b/LicenseBox.cpp @@ -79,7 +79,7 @@ LicenseBox::LicenseBox(wxWindow* parent,wxWindowID ) StaticText_Header3 = new wxStaticText(Panel1, ID_STATICTEXT_HEADER3, _("http://www.fastfieldsolvers.com"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT_HEADER3")); BoxSizer2->Add(StaticText_Header3, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); FlexGridSizer1->Add(BoxSizer2, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); - TextCtrl_License = new wxTextCtrl(Panel1, ID_TEXTCTRL_LICENSE, _("License"), wxDefaultPosition, wxSize(400,300), wxTE_AUTO_SCROLL|wxTE_MULTILINE|wxTE_WORDWRAP, wxDefaultValidator, _T("ID_TEXTCTRL_LICENSE")); + TextCtrl_License = new wxTextCtrl(Panel1, ID_TEXTCTRL_LICENSE, _("License"), wxDefaultPosition, wxSize(400,300), wxTE_MULTILINE|wxTE_WORDWRAP, wxDefaultValidator, _T("ID_TEXTCTRL_LICENSE")); FlexGridSizer1->Add(TextCtrl_License, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); StdDialogButtonSizer1 = new wxStdDialogButtonSizer(); StdDialogButtonSizer1->AddButton(new wxButton(Panel1, wxID_OK, _("I accept"))); diff --git a/README.md b/README.md index 479cfc2..d0fcc0b 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ The following software tools and complier chains are required. Used versions are - CMake 3.6.0 - Code::Blocks, version 13.12 - TDM-GCC 64 bits, version 4.8.1 -- wxWidgets, version 3.0 +- wxWidgets, version 3.2 #### Notes @@ -39,7 +39,7 @@ The following software tools and complier chains are required. Used versions are - CMake 2.8.12 - Code::Blocks, version 13.12 - GCC, version 4.8.1 -- wxWidgets (wxGTK), version 3.0 +- wxWidgets (wxGTK), version 3.2 #### Notes @@ -57,7 +57,7 @@ Then you can open Code::Blocks, open the FasterCap.cbp project file created by C - CMake 3.5.1 - GCC, version 4.8.1 or higher (higher version tested: on 5.4.0) -- wxWidgets, version 3.0.2 or higher (higher version tested: 3.0.2) +- wxWidgets, version 3.2 or higher (higher version tested: 3.2.5) #### Notes