Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Corrected valtext.cpp for disabled controls; added Dialog Editor fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1963 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1999-03-23 19:56:58 +00:00
parent cc385968c4
commit 6cd47507e8
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/valtext.cpp
View File

@@ -128,9 +128,9 @@ bool wxTextValidator::Validate(wxWindow *parent)
wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ; wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ;
// If window is disabled, don't validate // If window is disabled, simply return
if ( !control->Enabled() ) if ( !control->Enabled() )
return FALSE; return TRUE;
wxString val(control->GetValue()); wxString val(control->GetValue());

3
utils/dialoged/src/winprop.cpp
View File

@@ -2357,7 +2357,6 @@ void wxResourceSymbolValidator::OnEdit(wxProperty *property, wxPropertyListView
{ {
wxString symbolName(dialog->GetSymbol()); wxString symbolName(dialog->GetSymbol());
long id = dialog->GetId(); long id = dialog->GetId();
dialog->Destroy();
wxString str; wxString str;
str.Printf("%d", id); str.Printf("%d", id);
@@ -2367,6 +2366,8 @@ void wxResourceSymbolValidator::OnEdit(wxProperty *property, wxPropertyListView
view->UpdatePropertyDisplayInList(property); view->UpdatePropertyDisplayInList(property);
view->OnPropertyChanged(property); view->OnPropertyChanged(property);
} }
// Moved from the 'if' branch on suggestion of Roman Pavlov
dialog->Destroy();
} }
BEGIN_EVENT_TABLE(wxResourceSymbolDialog, wxDialog) BEGIN_EVENT_TABLE(wxResourceSymbolDialog, wxDialog)

4
utils/dialoged/src/winstyle.cpp
View File

@@ -78,8 +78,8 @@ int g_WindowStylesGaugeCount = sizeof(g_WindowStylesGauge)/sizeof(wxWindowStyleP
/* wxTextCtrl */ /* wxTextCtrl */
static wxWindowStylePair g_WindowStylesTextCtrl[] = { static wxWindowStylePair g_WindowStylesTextCtrl[] = {
{ "wxPASSWORD", wxPASSWORD}, // { "wxPASSWORD", wxPASSWORD},
{ "wxPROCESS_ENTER", wxPROCESS_ENTER}, // { "wxPROCESS_ENTER", wxPROCESS_ENTER},
{ "wxTE_PASSWORD", wxTE_PASSWORD}, { "wxTE_PASSWORD", wxTE_PASSWORD},
{ "wxTE_READONLY", wxTE_READONLY}, { "wxTE_READONLY", wxTE_READONLY},
{ "wxTE_PROCESS_ENTER", wxTE_PROCESS_ENTER}, { "wxTE_PROCESS_ENTER", wxTE_PROCESS_ENTER},