]> git.saurik.com Git - wxWidgets.git/blobdiff - src/univ/button.cpp
The richtext DLL needs to also link with the html and xml DLLs.
[wxWidgets.git] / src / univ / button.cpp
index a812e9e25e3fd186cffbe9959a1698ce9a329294..995a3becaafc756434046b75cfed3584b6a4846f 100644 (file)
 // 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;