use 6px as the default wxSizer border in wxGTK to be a little bit closer to GNOME HIG

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

diff --git a/include/wx/univ/checkbox.h b/include/wx/univ/checkbox.h
index ba0abc8e7718a7a70c3eea09841f32d91ff5b5ed..c7ffee5be975317eac7bbc94bf5305809dbed739 100644 (file)
--- a/include/wx/univ/checkbox.h
+++ b/include/wx/univ/checkbox.h
@@ -28,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:


@@ -102,6 +97,11 @@ public:
                                const wxString& strArg = wxEmptyString);
 
     virtual bool CanBeHighlighted() const { return true; }
                                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));
 
 protected:
     virtual void DoSet3StateValue(wxCheckBoxState WXUNUSED(state));


@@ -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_