corrected WX_DEFINE_VARARG_FUNC_NOP usage

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

diff --git a/include/wx/univ/checkbox.h b/include/wx/univ/checkbox.h
index 7d419022272dc52640a4a65dfdb248f71e2c9c49..c7ffee5be975317eac7bbc94bf5305809dbed739 100644 (file)
--- a/include/wx/univ/checkbox.h
+++ b/include/wx/univ/checkbox.h
@@ -6,24 +6,20 @@
 // 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__
-    #pragma interface "univcheckbox.h"
-#endif
-

 #include "wx/button.h" // for wxStdButtonInputHandler
 
 // ----------------------------------------------------------------------------
 // the actions supported by wxCheckBox
 // ----------------------------------------------------------------------------
 
 #include "wx/button.h" // for wxStdButtonInputHandler
 
 // ----------------------------------------------------------------------------
 // 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


@@ -32,11 +28,6 @@
 // wxCheckBox
 // ----------------------------------------------------------------------------
 
 // wxCheckBox
 // ----------------------------------------------------------------------------
 

-// X11 headers may define this
-#ifdef Status
-#undef Status
-#endif
-

 class WXDLLEXPORT wxCheckBox : public wxCheckBoxBase
 {
 public:
 class WXDLLEXPORT wxCheckBox : public wxCheckBoxBase
 {
 public:


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

-        Status_Unknown,
+        Status_3rdState,

         Status_Max
     };
 
         Status_Max
     };
 


@@ -101,15 +92,24 @@ public:
     // overridden base class virtuals
     virtual bool IsPressed() const { return m_isPressed; }
 
     // overridden base class virtuals
     virtual bool IsPressed() const { return m_isPressed; }
 

-protected:

     virtual bool PerformAction(const wxControlAction& action,
                                long numArg = -1,
                                const wxString& strArg = wxEmptyString);
     virtual bool PerformAction(const wxControlAction& action,
                                long numArg = -1,
                                const wxString& strArg = wxEmptyString);

+
+    virtual bool CanBeHighlighted() const { return true; }
+    virtual wxInputHandler *CreateStdInputHandler(wxInputHandler *handlerDef);
+    virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef)
+    {
+        return CreateStdInputHandler(handlerDef);
+    }
+
+protected:
+    virtual void DoSet3StateValue(wxCheckBoxState WXUNUSED(state));
+    virtual wxCheckBoxState DoGet3StateValue() const;
+

     virtual void DoDraw(wxControlRenderer *renderer);
     virtual wxSize DoGetBestClientSize() const;
 
     virtual void DoDraw(wxControlRenderer *renderer);
     virtual wxSize DoGetBestClientSize() const;
 

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

     // get the size of the bitmap using either the current one or the default
     // one (query renderer then)
     virtual wxSize GetBitmapSize() const;
     // get the size of the bitmap using either the current one or the default
     // one (query renderer then)
     virtual wxSize GetBitmapSize() const;


@@ -147,20 +147,4 @@ private:
     DECLARE_DYNAMIC_CLASS(wxCheckBox)
 };
 
     DECLARE_DYNAMIC_CLASS(wxCheckBox)
 };
 

-// ----------------------------------------------------------------------------
-// wxStdCheckboxInputHandler: handles the mouse events for the check and radio
-// boxes (handling the keyboard input is simple, but its handling differs a
-// lot between GTK and MSW, so a new class should be derived for this)
-// ----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxStdCheckboxInputHandler : public wxStdButtonInputHandler
-{
-public:
-    wxStdCheckboxInputHandler(wxInputHandler *inphand);
-
-    // we have to override this one as wxStdButtonInputHandler version works
-    // only with the buttons
-    virtual bool HandleActivation(wxInputConsumer *consumer, bool activated);
-};
-

 #endif // _WX_UNIV_CHECKBOX_H_
 #endif // _WX_UNIV_CHECKBOX_H_