Switched loads of settings back on

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

diff --git a/include/wx/msw/checkbox.h b/include/wx/msw/checkbox.h
index 57603fc9a05c66995cda71ad43fde1d4b3b132ce..b281edbb7972c709b376a043cc9641deabde398f 100644 (file)
--- a/include/wx/msw/checkbox.h
+++ b/include/wx/msw/checkbox.h
@@ -12,7 +12,7 @@
 #ifndef _WX_CHECKBOX_H_
 #define _WX_CHECKBOX_H_
 
 #ifndef _WX_CHECKBOX_H_
 #define _WX_CHECKBOX_H_
 

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

 #pragma interface "checkbox.h"
 #endif
 
 #pragma interface "checkbox.h"
 #endif
 


@@ -45,16 +45,45 @@ public:
     virtual void SetValue(bool value);
     virtual bool GetValue() const;
 
     virtual void SetValue(bool value);
     virtual bool GetValue() const;
 

-    virtual void SetLabel(const wxString& label);
-
+    // override some base class virtuals

     virtual bool MSWCommand(WXUINT param, WXWORD id);
     virtual void Command(wxCommandEvent& event);
     virtual bool MSWCommand(WXUINT param, WXWORD id);
     virtual void Command(wxCommandEvent& event);

+    virtual bool SetForegroundColour(const wxColour& colour);

 
 protected:
     virtual wxSize DoGetBestSize() const;
 
 protected:
     virtual wxSize DoGetBestSize() const;

+    virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
+
+    virtual void DoSet3StateValue(wxCheckBoxState value);
+    virtual wxCheckBoxState DoGet3StateValue() const;
+
+    // make the checkbox owner drawn or reset it to normal style
+    void MakeOwnerDrawn(bool ownerDrawn);
+
+    // return true if this checkbox is owner drawn
+    bool IsOwnerDrawn() const;

 
 private:
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxCheckBox)
+    // common part of all ctors
+    void Init();
+
+    // event handlers used by owner-drawn checkbox
+    void OnMouseEnterOrLeave(wxMouseEvent& event);
+    void OnMouseLeft(wxMouseEvent& event);
+    void OnFocus(wxFocusEvent& event);
+
+
+    // current state of the checkbox
+    wxCheckBoxState m_state;
+
+    // true if the checkbox is currently pressed
+    bool m_isPressed;
+
+    // true if mouse is currently over the control
+    bool m_isHot;
+
+
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxCheckBox)

 };
 
 #endif
 };
 
 #endif