Work around wxFinite() definition conflict with <cmath>.

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

diff --git a/include/wx/motif/checkbox.h b/include/wx/motif/checkbox.h
index 9f9ca5851e3cff873121580eda3059846af85f35..d8c33323d3ae7e12d9d880398a17a319671d239a 100644 (file)
--- a/include/wx/motif/checkbox.h
+++ b/include/wx/motif/checkbox.h
@@ -1,30 +1,22 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        checkbox.h
+// Name:        wx/motif/checkbox.h
 // Purpose:     wxCheckBox class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CHECKBOX_H_
 #define _WX_CHECKBOX_H_
 
-#ifdef __GNUG__
-#pragma interface "checkbox.h"
-#endif
-
-#include "wx/control.h"
-
-WXDLLEXPORT_DATA(extern const char*) wxCheckBoxNameStr;
-
 // Checkbox item (single checkbox)
-class WXDLLEXPORT wxCheckBox: public wxCheckBoxBase
+class WXDLLIMPEXP_CORE wxCheckBox: public wxCheckBoxBase
 {
     DECLARE_DYNAMIC_CLASS(wxCheckBox)
-        
+
 public:
     inline wxCheckBox() { Init(); }
     inline wxCheckBox(wxWindow *parent, wxWindowID id, const wxString& label,
@@ -37,7 +29,7 @@ public:
 
         Create(parent, id, label, pos, size, style, validator, name);
     }
-    
+
     bool Create(wxWindow *parent, wxWindowID id, const wxString& label,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, long style = 0,
@@ -46,19 +38,23 @@ public:
     virtual void SetValue(bool);
     virtual bool GetValue() const ;
     virtual void Command(wxCommandEvent& event);
-    
+
     // Implementation
     virtual void ChangeBackgroundColour();
 private:
     // common part of all constructors
     void Init()
     {
-        m_evtType = wxEVT_COMMAND_CHECKBOX_CLICKED;
+        m_evtType = wxEVT_CHECKBOX;
     }
 
+    virtual void DoSet3StateValue(wxCheckBoxState state);
+
+    virtual wxCheckBoxState DoGet3StateValue() const;
+
     // public for the callback
 public:
-    // either exEVT_COMMAND_CHECKBOX_CLICKED or ..._TOGGLEBUTTON_CLICKED
+    // either wxEVT_CHECKBOX or ..._TOGGLEBUTTON
     wxEventType m_evtType;
 };