diff options
| author | Toni Uhlig <Toni.Uhlig@tq-group.com> | 2017-11-27 16:28:23 +0100 |
|---|---|---|
| committer | Toni Uhlig <Toni.Uhlig@tq-group.com> | 2017-11-27 16:28:23 +0100 |
| commit | cab2939d5e591216a60a03dc173fbaa676c8a7cd (patch) | |
| tree | e1f3391801dd1a0dca269b1cecedc2af76dcae26 /src | |
| parent | 55487ebb798ee8257689836778bd842fecc80a50 (diff) | |
UpdateGUI: initial windows size increased, window centered and TAB support
UpdateTool: platform checking/handling
Diffstat (limited to 'src')
| -rw-r--r-- | src/UpdateGUI.cpp | 7 | ||||
| -rw-r--r-- | src/UpdateTool.cpp | 17 |
2 files changed, 17 insertions, 7 deletions
diff --git a/src/UpdateGUI.cpp b/src/UpdateGUI.cpp index e08870d..c6c8fc9 100644 --- a/src/UpdateGUI.cpp +++ b/src/UpdateGUI.cpp @@ -75,10 +75,11 @@ UpdateGUIFrame::UpdateGUIFrame(const wxString& title, const wxPoint& pos, const subBox->Add(csvButton, 0, wxALL, 5); subBox->Add(subButton, 0, wxALL, 5); subBox->AddStretchSpacer(); - ipEntry = new wxTextCtrl(this, wxID_IP); + ipEntry = new wxTextCtrl(this, wxID_IP, wxEmptyString, wxDefaultPosition, + wxDefaultSize, wxTE_PROCESS_TAB); ipBox->Add(ipEntry, 1, wxEXPAND|wxALL, 5); pwEntry = new wxTextCtrl(this, wxID_PW, wxEmptyString, wxDefaultPosition, - wxDefaultSize, wxTE_PASSWORD); + wxDefaultSize, wxTE_PASSWORD | wxTE_PROCESS_TAB); pwBox->Add(pwEntry, 1, wxEXPAND|wxALL, 5); imgEntry = new wxTextCtrl(this, wxID_IMG, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY @@ -97,6 +98,8 @@ UpdateGUIFrame::UpdateGUIFrame(const wxString& title, const wxPoint& pos, const mainVSizer->Add(logBox, 1, wxEXPAND|wxALL|wxBOTTOM, 5); SetSizerAndFit(mainVSizer); + SetInitialSize(wxSize(600, 800)); + Centre(); jobs = new Queue(this); { for (int tid = 1; tid <= 2; ++tid) { diff --git a/src/UpdateTool.cpp b/src/UpdateTool.cpp index 55da6d4..720f429 100644 --- a/src/UpdateTool.cpp +++ b/src/UpdateTool.cpp @@ -8,10 +8,15 @@ wxIMPLEMENT_APP(UpdateGUI); -#if defined(_UNICODE) && defined(WIN32) -int wmain(int argc, wchar_t* wargv[]) +#ifdef WIN32 +/* Windoze uses UTF-16 as preferred encoding, but is not limited to .. */ +#ifdef _UNICODE +int wmain(int argc, wchar_t* argv[]) +#else +int main(int argc, char* argv[]) +#endif { - wxEntryStart(argc, wargv); + wxEntryStart(argc, argv); wxTheApp->CallOnInit(); wxTheApp->OnRun(); return 0; @@ -20,7 +25,8 @@ int wmain(int argc, wchar_t* wargv[]) #else -int main(int argc, char **argv) +/* Command Line Interface (CLI) for UNIX/WIN */ +int main(int argc, char *argv[]) { int rv; std::vector<UpdateFactory*> uf; @@ -70,13 +76,14 @@ int main(int argc, char **argv) return 0; } +/* Our Command Line Interface (CLI) wants UTF-16 support if target platform is Windoze .. */ #if defined(_UNICODE) && defined(WIN32) int wmain(int argc, wchar_t* wargv[]) { size_t len; static char **argv = new char*[argc]; - /* convert wide character argvector to ASCII */ + /* convert wide character argvector to ASCII, dirty .. */ for (int i = 0; i < argc; ++i) { len = wcslen(wargv[i]) * sizeof(wchar_t); argv[i] = (char *) calloc(len+1, sizeof(char)); |