Don't crash on malformed HTML in wxHTML font tag handler.

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

diff --git a/src/common/pickerbase.cpp b/src/common/pickerbase.cpp
index 412ddc39e0ec1b0c19f921cd2bb95f051d9d30f7..1d3dbbc30d1a1d4a128ecbfe3df9a20297440be2 100644 (file)
--- a/src/common/pickerbase.cpp
+++ b/src/common/pickerbase.cpp
@@ -66,13 +66,13 @@ bool wxPickerBase::CreateBase(wxWindow *parent,
     // remove any border style from our style as wxPickerBase's window must be
     // invisible (user styles must be set on the textctrl or the platform-dependent picker)
     style &= ~wxBORDER_MASK;
     // remove any border style from our style as wxPickerBase's window must be
     // invisible (user styles must be set on the textctrl or the platform-dependent picker)
     style &= ~wxBORDER_MASK;

-    
+

     if (!wxControl::Create(parent, id, pos, size, style | wxNO_BORDER | wxTAB_TRAVERSAL,
                            validator, name))
         return false;
     if (!wxControl::Create(parent, id, pos, size, style | wxNO_BORDER | wxTAB_TRAVERSAL,
                            validator, name))
         return false;

-        
+

     SetMinSize( size );
     SetMinSize( size );

-        
+

     m_sizer = new wxBoxSizer(wxHORIZONTAL);
 
     if (HasFlag(wxPB_USE_TEXTCTRL))
     m_sizer = new wxBoxSizer(wxHORIZONTAL);
 
     if (HasFlag(wxPB_USE_TEXTCTRL))


@@ -94,7 +94,7 @@ bool wxPickerBase::CreateBase(wxWindow *parent,
         // the m_picker; for very long strings, this real-time synchronization could
         // become a CPU-blocker and thus should be avoided.
         // 32 characters will be more than enough for all common uses.
         // the m_picker; for very long strings, this real-time synchronization could
         // become a CPU-blocker and thus should be avoided.
         // 32 characters will be more than enough for all common uses.

-        // m_text->SetMaxLength(32);
+        m_text->SetMaxLength(32);

 
         // set the initial contents of the textctrl
         m_text->SetValue(text);
 
         // set the initial contents of the textctrl
         m_text->SetValue(text);


@@ -113,7 +113,7 @@ bool wxPickerBase::CreateBase(wxWindow *parent,
         // the text control's proportion values defaults to 2
         m_sizer->Add(m_text, 2, GetDefaultTextCtrlFlag(), 5);
     }
         // the text control's proportion values defaults to 2
         m_sizer->Add(m_text, 2, GetDefaultTextCtrlFlag(), 5);
     }

-    
+

     return true;
 }
 
     return true;
 }
 


@@ -124,7 +124,7 @@ void wxPickerBase::PostCreation()
     m_sizer->Add(m_picker, HasTextCtrl() ? 0 : 1, GetDefaultPickerCtrlFlag(), 5);
 
     SetSizer(m_sizer);
     m_sizer->Add(m_picker, HasTextCtrl() ? 0 : 1, GetDefaultPickerCtrlFlag(), 5);
 
     SetSizer(m_sizer);

-    
+

     SetInitialSize( GetMinSize() );
 }
 
     SetInitialSize( GetMinSize() );
 }