Add wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG symbol.

[wxWidgets.git] / include / wx / checkbox.h

diff --git a/include/wx/checkbox.h b/include/wx/checkbox.h
index d17a5b60d1dbdcc62242dc4074c81207dc76d698..6177aeb5d469ad404c49622d859a7388f6efb910 100644 (file)
--- a/include/wx/checkbox.h
+++ b/include/wx/checkbox.h
@@ -140,14 +140,18 @@ protected:
     {
         long& style = *stylePtr;
 
     {
         long& style = *stylePtr;
 

-        if ( style == 0 )
+        if ( !(style & (wxCHK_2STATE | wxCHK_3STATE)) )

         {
             // For compatibility we use absence of style flags as wxCHK_2STATE
             // because wxCHK_2STATE used to have the value of 0 and some
         {
             // For compatibility we use absence of style flags as wxCHK_2STATE
             // because wxCHK_2STATE used to have the value of 0 and some

-            // existing code may use 0 instead of it.
-            style = wxCHK_2STATE;
+            // existing code uses 0 instead of it. Moreover, some code even
+            // uses some non-0 style, e.g. wxBORDER_XXX, but doesn't specify
+            // neither wxCHK_2STATE nor wxCHK_3STATE -- to avoid breaking it,
+            // assume (much more common) 2 state checkbox by default.
+            style |= wxCHK_2STATE;

         }
         }

-        else if ( style & wxCHK_3STATE )
+
+        if ( style & wxCHK_3STATE )

         {
             if ( style & wxCHK_2STATE )
             {
         {
             if ( style & wxCHK_2STATE )
             {


@@ -158,13 +162,6 @@ protected:
         }
         else // No wxCHK_3STATE
         {
         }
         else // No wxCHK_3STATE
         {

-            if ( !(style & wxCHK_2STATE) )
-            {
-                wxFAIL_MSG( "Either wxCHK_2STATE or wxCHK_3STATE must be "
-                            "specified" );
-                style |= wxCHK_2STATE;
-            }
-

             if ( style & wxCHK_ALLOW_3RD_STATE_FOR_USER )
             {
                 wxFAIL_MSG( "wxCHK_ALLOW_3RD_STATE_FOR_USER doesn't make sense "
             if ( style & wxCHK_ALLOW_3RD_STATE_FOR_USER )
             {
                 wxFAIL_MSG( "wxCHK_ALLOW_3RD_STATE_FOR_USER doesn't make sense "