X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/88d2e56706ed5851544d957f226d4a5ec8499eb4..428f4657b6c1747e28abeb3b9c2069512b2997d7:/src/univ/button.cpp diff --git a/src/univ/button.cpp b/src/univ/button.cpp index a812e9e25e..995a3becaa 100644 --- a/src/univ/button.cpp +++ b/src/univ/button.cpp @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "univbutton.h" -#endif - #include "wx/wxprec.h" #ifdef __BORLANDC__ @@ -82,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;