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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1963 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/valtext.cpp b/src/common/valtext.cpp
index d3fa339c47ff0443e4fbea7935ab20cc0ef81162..7767ae2f185d13db4716a079f2293e06d56abe94 100644 (file)
--- a/src/common/valtext.cpp
+++ b/src/common/valtext.cpp
@@ -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());
 

diff --git a/utils/dialoged/src/winprop.cpp b/utils/dialoged/src/winprop.cpp
index 193df7e390ff26bcb12a86d687d43c26d65eb02e..75bf9efc32290cc4072fbc35e878819a8a846243 100644 (file)
--- a/utils/dialoged/src/winprop.cpp
+++ b/utils/dialoged/src/winprop.cpp
@@ -2357,7 +2357,6 @@ void wxResourceSymbolValidator::OnEdit(wxProperty *property, wxPropertyListView
   {
     wxString symbolName(dialog->GetSymbol());
     long id = dialog->GetId();
   {
     wxString symbolName(dialog->GetSymbol());
     long id = dialog->GetId();

-    dialog->Destroy();

 
     wxString str;
     str.Printf("%d", id);
 
     wxString str;
     str.Printf("%d", id);


@@ -2367,6 +2366,8 @@ void wxResourceSymbolValidator::OnEdit(wxProperty *property, wxPropertyListView
     view->UpdatePropertyDisplayInList(property);
     view->OnPropertyChanged(property);
   }
     view->UpdatePropertyDisplayInList(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)

diff --git a/utils/dialoged/src/winstyle.cpp b/utils/dialoged/src/winstyle.cpp
index 8537101d721d200f2d1d2ce84feb2bd90d00bd76..47b5e92f93e88a9ff967c6af5d8c0dddb02f59ad 100644 (file)
--- a/utils/dialoged/src/winstyle.cpp
+++ b/utils/dialoged/src/winstyle.cpp
@@ -78,8 +78,8 @@ int g_WindowStylesGaugeCount = sizeof(g_WindowStylesGauge)/sizeof(wxWindowStyleP
 
   /* wxTextCtrl */
 static wxWindowStylePair g_WindowStylesTextCtrl[] = {
 
   /* wxTextCtrl */
 static wxWindowStylePair g_WindowStylesTextCtrl[] = {

-  { "wxPASSWORD", wxPASSWORD},
-  { "wxPROCESS_ENTER", wxPROCESS_ENTER},
+//  { "wxPASSWORD", wxPASSWORD},
+//  { "wxPROCESS_ENTER", wxPROCESS_ENTER},

   { "wxTE_PASSWORD", wxTE_PASSWORD},
   { "wxTE_READONLY", wxTE_READONLY},
   { "wxTE_PROCESS_ENTER", wxTE_PROCESS_ENTER},
   { "wxTE_PASSWORD", wxTE_PASSWORD},
   { "wxTE_READONLY", wxTE_READONLY},
   { "wxTE_PROCESS_ENTER", wxTE_PROCESS_ENTER},