Mercurial > ecos-v3_0-branch

comparison host/tools/configtool/standalone/wxwin/configitem.cpp @ 2515:24c0267fbb70

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Utils/ChangeLog Utils/common/eCosStd.h, configtool/ChangeLog configtool/common/common/build.cxx, configtool/standalone/common/cdl_exec.cxx, configtool/standalone/common/ecosconfig.cxx, configtool/standalone/wxwin/appsettings.cpp, configtool/standalone/wxwin/configitem.cpp, configtool/standalone/wxwin/configtool.cpp, configtool/standalone/wxwin/configtool.h, configtool/standalone/wxwin/configtooldoc.cpp, configtool/standalone/wxwin/configtree.cpp, configtool/standalone/wxwin/configtree.h, configtool/standalone/wxwin/docsystem.cpp, configtool/standalone/wxwin/ecutils.cpp, configtool/standalone/wxwin/filename.cpp, configtool/standalone/wxwin/mainwin.cpp, configtool/standalone/wxwin/mainwin.h, configtool/standalone/wxwin/makefile.gnu, configtool/standalone/wxwin/packagesdlg.cpp, configtool/standalone/wxwin/propertywin.cpp, configtool/standalone/wxwin/reposdlg.cpp, configtool/standalone/wxwin/runtestsdlg.cpp, configtool/standalone/wxwin/sectiondlg.cpp, configtool/standalone/wxwin/settingsdlg.cpp, configtool/standalone/wxwin/symbols.h, ecostest/ChangeLog, ecostest/common/eCosTestUtils.cpp, ecostest/common/eCosTestUtils.h: Update for recent Cygwin and wxWidgets.
author jld
date Wed, 13 Aug 2008 09:37:07 +0000
parents b75acb19f177
children d6e76cd040e3
comparison
equal deleted inserted replaced
2514:d5dc1a185974 2515:24c0267fbb70
615 } 615 }
616 else if (window->IsKindOf(CLASSINFO(ecDoubleEditorCtrl))) 616 else if (window->IsKindOf(CLASSINFO(ecDoubleEditorCtrl)))
617 { 617 {
618 ecDoubleEditorCtrl* win = (ecDoubleEditorCtrl*) window; 618 ecDoubleEditorCtrl* win = (ecDoubleEditorCtrl*) window;
619 619
620 wxASSERT ( GetOptionType() == ecString ); 620 wxASSERT ( GetOptionType() == ecDouble );
621 621
622 // TODO: do checking 622 // TODO: do checking
623 doc->SetValue(*this, atof(win->GetValue())); 623 doc->SetValue(*this, atof(win->GetValue()));
624 } 624 }
625 else if (window->IsKindOf(CLASSINFO(ecEnumEditorCtrl))) 625 else if (window->IsKindOf(CLASSINFO(ecEnumEditorCtrl)))
1424 1424
1425 IMPLEMENT_CLASS(ecIntegerEditorCtrl, wxSpinCtrl) 1425 IMPLEMENT_CLASS(ecIntegerEditorCtrl, wxSpinCtrl)
1426 1426
1427 ecIntegerEditorCtrl::ecIntegerEditorCtrl(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, 1427 ecIntegerEditorCtrl::ecIntegerEditorCtrl(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
1428 long style): 1428 long style):
1429 wxSpinCtrl(parent, id, wxEmptyString, pos, size, style, INT_MIN, INT_MAX, 0) 1429 wxSpinCtrl(parent, id, "0", pos, size, style, INT_MIN, INT_MAX, 0)
1430 { 1430 {
1431 } 1431 }
1432 1432
1433 void ecIntegerEditorCtrl::OnEnter(wxCommandEvent& event) 1433 void ecIntegerEditorCtrl::OnEnter(wxCommandEvent& event)
1434 { 1434 {
1471 event.Skip(); 1471 event.Skip();
1472 } 1472 }
1473 1473
1474 void ecEnumEditorCtrl::OnKillFocus(wxFocusEvent& event) 1474 void ecEnumEditorCtrl::OnKillFocus(wxFocusEvent& event)
1475 { 1475 {
1476 ecValueWindow* parent = (ecValueWindow*) GetParent(); 1476 /* event may result from drop down of menu on wxGTK so
1477 parent->EndEditing(); 1477 check that the mouse is outside the window */
1478 wxPoint mouse = ScreenToClient(::wxGetMousePosition());
1479 wxSize size = GetSize();
1480 if (mouse.x < 0 || mouse.x > size.x || mouse.y < 0 || mouse.y > size.y) {
1481 ecValueWindow* parent = (ecValueWindow*) GetParent();
1482 parent->EndEditing();
1483 }
1478 } 1484 }
1479 1485
1480 /* 1486 /*
1481 * ecEditStringDialog 1487 * ecEditStringDialog
1482 * Pops up to make it easier to edit large string values 1488 * Pops up to make it easier to edit large string values
1508 1514
1509 //// Event handlers 1515 //// Event handlers
1510 1516
1511 void ecEditStringDialog::OnOK(wxCommandEvent& event) 1517 void ecEditStringDialog::OnOK(wxCommandEvent& event)
1512 { 1518 {
1513 wxDialog::OnOK(event); 1519 event.Skip();
1514 } 1520 }
1515 1521
1516 //// Operations 1522 //// Operations
1517 void ecEditStringDialog::CreateControls(wxWindow* parent) 1523 void ecEditStringDialog::CreateControls(wxWindow* parent)
1518 { 1524 {