respect wxBU_NOTEXT style in wxButton

[wxWidgets.git] / src / univ / radiobox.cpp

diff --git a/src/univ/radiobox.cpp b/src/univ/radiobox.cpp
index b51b63aecbfb78bfaa2eb10fac70288885f91bd8..cff69702fbc40408ffd9a525c94f5ea4da87d15a 100644 (file)
--- a/src/univ/radiobox.cpp
+++ b/src/univ/radiobox.cpp
@@ -25,9 +25,10 @@
 
 #if wxUSE_RADIOBOX
 
+#include "wx/radiobox.h"
+
 #ifndef WX_PRECOMP
     #include "wx/dcclient.h"
-    #include "wx/radiobox.h"
     #include "wx/radiobut.h"
     #include "wx/validate.h"
     #include "wx/arrstr.h"
@@ -146,11 +147,11 @@ bool wxRadioBox::Create(wxWindow *parent,
     if ( !(style & (wxRA_LEFTTORIGHT | wxRA_TOPTOBOTTOM)) )
     {
         // horizontal radiobox use left to right layout
-        if ( style & wxRA_HORIZONTAL )
+        if ( style & wxRA_SPECIFY_COLS )
         {
             style |= wxRA_LEFTTORIGHT;
         }
-        else if ( style & wxRA_VERTICAL )
+        else if ( style & wxRA_SPECIFY_ROWS )
         {
             style |= wxRA_TOPTOBOTTOM;
         }
@@ -159,7 +160,7 @@ bool wxRadioBox::Create(wxWindow *parent,
             wxFAIL_MSG( _T("you must specify wxRA_XXX style!") );
 
             // use default
-            style = wxRA_HORIZONTAL | wxRA_LEFTTORIGHT;
+            style = wxRA_SPECIFY_COLS | wxRA_LEFTTORIGHT;
         }
     }