Applied patch [ 637982 ] wxComboBox needs margin

[wxWidgets.git] / src / generic / prop.cpp

diff --git a/src/generic/prop.cpp b/src/generic/prop.cpp
index 9b3792b717f1612b659948f533c8a62a1e822003..ae8170a5abce62ce951c867304ae54bbfe20c48b 100644 (file)
--- a/src/generic/prop.cpp
+++ b/src/generic/prop.cpp
@@ -23,7 +23,6 @@
 #if wxUSE_PROPSHEET
 
 #ifndef WX_PRECOMP
-#include "wx/wx.h"
 #endif
 
 #include "wx/debug.h"
@@ -48,6 +47,7 @@ wxPropertyValue::wxPropertyValue(void)
 }
 
 wxPropertyValue::wxPropertyValue(const wxPropertyValue& copyFrom)
+    : wxObject()
 {
   m_value.string = (wxChar*) NULL;
   m_modifiedFlag = FALSE;
@@ -835,6 +835,7 @@ wxProperty::wxProperty(void)
 }
 
 wxProperty::wxProperty(wxProperty& copyFrom)
+    : wxObject()
 {
   m_value = copyFrom.GetValue();
   m_name = copyFrom.GetName();
@@ -1140,13 +1141,13 @@ bool wxPropertyValidator::StringToLong (wxChar *s, long *number) {
 
 wxChar *wxPropertyValidator::FloatToString (float number) {
     static wxChar buf[20];
-    wxSprintf (buf, wxT("%.6g"), number);
+    wxSnprintf (buf, 20, wxT("%.6g"), number);
     return buf;
 }
 
 wxChar *wxPropertyValidator::DoubleToString (double number) {
     static wxChar buf[20];
-    wxSprintf (buf, wxT("%.6g"), number);
+    wxSnprintf (buf, 20, wxT("%.6g"), number);
     return buf;
 }