Avoid flags that may clash with alignment flags

Don't try to set the string selection if not found

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

diff --git a/src/univ/button.cpp b/src/univ/button.cpp
index f41f45b6e6d7648149bbcce0e479927cbe7cd56f..995a3becaafc756434046b75cfed3584b6a4846f 100644 (file)
--- a/src/univ/button.cpp
+++ b/src/univ/button.cpp
@@ -78,9 +78,7 @@ bool wxButton::Create(wxWindow *parent,
         label = wxGetStockLabel(id);
 
     long ctrl_style = style & ~wxBU_ALIGN_MASK;
-
-    wxASSERT_MSG( (ctrl_style & wxALIGN_MASK) == 0,
-                  _T("Some style conflicts with align flags") );
+    ctrl_style = ctrl_style & ~wxALIGN_MASK;
 
     if((style & wxBU_RIGHT) == wxBU_RIGHT)
         ctrl_style |= wxALIGN_RIGHT;

diff --git a/src/univ/combobox.cpp b/src/univ/combobox.cpp
index b9b03b00c30de251da08b03efa7a242c92b9049a..8647a82611455383deeb4e03b30ac034924e0ab1 100644 (file)
--- a/src/univ/combobox.cpp
+++ b/src/univ/combobox.cpp
@@ -130,7 +130,7 @@ wxString wxComboListBox::GetStringValue() const
 
 void wxComboListBox::SetStringValue(const wxString& value)
 {
-    if ( !value.empty() )
+    if ( !value.empty() && (FindString(value) != wxNOT_FOUND) )
         wxListBox::SetStringSelection(value);
     else
         wxListBox::SetSelection(-1);