Sorry, should be a __UNIX__ test

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

diff --git a/include/wx/univ/checkbox.h b/include/wx/univ/checkbox.h
index 7d419022272dc52640a4a65dfdb248f71e2c9c49..b2c7b4ec4f1c4d6923a464bbc7259349e23dbed2 100644 (file)
--- a/include/wx/univ/checkbox.h
+++ b/include/wx/univ/checkbox.h
@@ -6,13 +6,13 @@
 // Created:     07.09.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
 // Created:     07.09.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_CHECKBOX_H_
 #define _WX_UNIV_CHECKBOX_H_
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_CHECKBOX_H_
 #define _WX_UNIV_CHECKBOX_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "univcheckbox.h"
 #endif
 
     #pragma interface "univcheckbox.h"
 #endif
 


@@ -22,8 +22,8 @@
 // the actions supported by wxCheckBox
 // ----------------------------------------------------------------------------
 
 // the actions supported by wxCheckBox
 // ----------------------------------------------------------------------------
 

-#define wxACTION_CHECKBOX_CHECK   _T("check")   // SetValue(TRUE)
-#define wxACTION_CHECKBOX_CLEAR   _T("clear")   // SetValue(FALSE)
+#define wxACTION_CHECKBOX_CHECK   _T("check")   // SetValue(true)
+#define wxACTION_CHECKBOX_CLEAR   _T("clear")   // SetValue(false)

 #define wxACTION_CHECKBOX_TOGGLE  _T("toggle")  // toggle the check state
 
 // additionally it accepts wxACTION_BUTTON_PRESS and RELEASE
 #define wxACTION_CHECKBOX_TOGGLE  _T("toggle")  // toggle the check state
 
 // additionally it accepts wxACTION_BUTTON_PRESS and RELEASE


@@ -54,7 +54,7 @@ public:
     {
         Status_Checked,
         Status_Unchecked,
     {
         Status_Checked,
         Status_Unchecked,

-        Status_Unknown,
+        Status_3rdState,

         Status_Max
     };
 
         Status_Max
     };
 


@@ -102,13 +102,16 @@ public:
     virtual bool IsPressed() const { return m_isPressed; }
 
 protected:
     virtual bool IsPressed() const { return m_isPressed; }
 
 protected:

+    virtual void DoSet3StateValue(wxCheckBoxState WXUNUSED(state));
+    virtual wxCheckBoxState DoGet3StateValue() const;
+

     virtual bool PerformAction(const wxControlAction& action,
                                long numArg = -1,
                                const wxString& strArg = wxEmptyString);
     virtual void DoDraw(wxControlRenderer *renderer);
     virtual wxSize DoGetBestClientSize() const;
 
     virtual bool PerformAction(const wxControlAction& action,
                                long numArg = -1,
                                const wxString& strArg = wxEmptyString);
     virtual void DoDraw(wxControlRenderer *renderer);
     virtual wxSize DoGetBestClientSize() const;
 

-    virtual bool CanBeHighlighted() const { return TRUE; }
+    virtual bool CanBeHighlighted() const { return true; }

 
     // get the size of the bitmap using either the current one or the default
     // one (query renderer then)
 
     // get the size of the bitmap using either the current one or the default
     // one (query renderer then)