Compile fix for prop.

[wxWidgets.git] / src / common / valgen.cpp

diff --git a/src/common/valgen.cpp b/src/common/valgen.cpp
index ee65e02c47fd54022d5b4d4ddaa30c5ce3c1ea16..d6fc453323d64d6516233fbca9e27f03f7cf5476 100644 (file)
--- a/src/common/valgen.cpp
+++ b/src/common/valgen.cpp
@@ -81,6 +81,7 @@ wxGenericValidator::wxGenericValidator(wxArrayInt *val)
 }
 
 wxGenericValidator::wxGenericValidator(const wxGenericValidator& val)
 }
 
 wxGenericValidator::wxGenericValidator(const wxGenericValidator& val)

+    : wxValidator()

 {
     Copy(val);
 }
 {
     Copy(val);
 }


@@ -224,6 +225,10 @@ bool wxGenericValidator::TransferToWindow(void)
             {
                 pControl->SetStringSelection(* m_pString);
             }
             {
                 pControl->SetStringSelection(* m_pString);
             }

+            else
+            {
+                pControl->SetValue(* m_pString);
+            }

             return TRUE;
         }
     } else
             return TRUE;
         }
     } else


@@ -442,7 +447,7 @@ bool wxGenericValidator::TransferFromWindow(void)
     }
     else if (m_pString)
     {
     }
     else if (m_pString)
     {

-        *m_pString = pControl->GetStringSelection();
+        *m_pString = pControl->GetValue();

         return TRUE;
     }
   } else
         return TRUE;
     }
   } else