Rework IE virtual file system support to use new syntax. Remove now unused code for...

[wxWidgets.git] / src / univ / checkbox.cpp

diff --git a/src/univ/checkbox.cpp b/src/univ/checkbox.cpp
index 966e9f580db678dc8ede6ecb48508f1f97f554ed..2c070024f6971e7bf16a9a369064eb40a8797dc7 100644 (file)
--- a/src/univ/checkbox.cpp
+++ b/src/univ/checkbox.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        univ/checkbox.cpp
+// Name:        src/univ/checkbox.cpp

 // Purpose:     wxCheckBox implementation
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     wxCheckBox implementation
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "univcheckbox.h"
-#endif
-

 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__


@@ -29,9 +25,10 @@
 
 #if wxUSE_CHECKBOX
 
 
 #if wxUSE_CHECKBOX
 

+#include "wx/checkbox.h"
+

 #ifndef WX_PRECOMP
     #include "wx/dcclient.h"
 #ifndef WX_PRECOMP
     #include "wx/dcclient.h"

-    #include "wx/checkbox.h"

     #include "wx/validate.h"
 
     #include "wx/button.h" // for wxACTION_BUTTON_XXX
     #include "wx/validate.h"
 
     #include "wx/button.h" // for wxACTION_BUTTON_XXX


@@ -42,42 +39,33 @@
 #include "wx/univ/inphand.h"
 #include "wx/univ/colschem.h"
 
 #include "wx/univ/inphand.h"
 #include "wx/univ/colschem.h"
 

-// ============================================================================
-// implementation
-// ============================================================================
-
-IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
-

 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------

-// 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)

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-wxCheckBoxBase::wxCheckBoxBase()
+class WXDLLEXPORT wxStdCheckboxInputHandler : public wxStdInputHandler

 {
 {

-}
+public:
+    wxStdCheckboxInputHandler(wxInputHandler *inphand);

 
 

-wxCheckBox::wxCheckBox()
-{
-    Init();
-}
+    // we have to override this one as wxStdButtonInputHandler version works
+    // only with the buttons
+    virtual bool HandleActivation(wxInputConsumer *consumer, bool activated);
+};

 
 

-wxCheckBox::wxCheckBox(wxWindow *parent,
-                       wxWindowID id,
-                       const wxString& label,
-                       const wxPoint& pos,
-                       const wxSize& size,
-                       long style,
-                       const wxValidator& validator,
-                       const wxString& name)
-{
-    Init();
+// ============================================================================
+// implementation
+// ============================================================================

 
 

-    Create(parent, id, label, pos, size, style, validator, name);
-}
+// ----------------------------------------------------------------------------
+// wxCheckBox
+// ----------------------------------------------------------------------------

 
 void wxCheckBox::Init()
 {
 
 void wxCheckBox::Init()
 {

-    m_isPressed = FALSE;
+    m_isPressed = false;

     m_status = Status_Unchecked;
 }
 
     m_status = Status_Unchecked;
 }
 


@@ -90,15 +78,16 @@ bool wxCheckBox::Create(wxWindow *parent,
                         const wxValidator& validator,
                         const wxString &name)
 {
                         const wxValidator& validator,
                         const wxString &name)
 {

+    WXValidateStyle( &style );

     if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
     if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )

-        return FALSE;
+        return false;

 
     SetLabel(label);
 
     SetLabel(label);

-    SetBestSize(size);
+    SetInitialSize(size);

 
     CreateInputHandler(wxINP_HANDLER_CHECKBOX);
 
 
     CreateInputHandler(wxINP_HANDLER_CHECKBOX);
 

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -107,24 +96,12 @@ bool wxCheckBox::Create(wxWindow *parent,
 
 bool wxCheckBox::GetValue() const
 {
 
 bool wxCheckBox::GetValue() const
 {

-    return m_status == Status_Checked;
+    return (Get3StateValue() != wxCHK_UNCHECKED);

 }
 
 void wxCheckBox::SetValue(bool value)
 {
 }
 
 void wxCheckBox::SetValue(bool value)
 {

-    Status status = value ? Status_Checked : Status_Unchecked;
-    if ( status != m_status )
-    {
-        m_status = status;
-
-        if ( m_status == Status_Checked )
-        {
-            // invoke the hook
-            OnCheck();
-        }
-
-        Refresh();
-    }
+    Set3StateValue( value ? wxCHK_CHECKED : wxCHK_UNCHECKED );

 }
 
 void wxCheckBox::OnCheck()
 }
 
 void wxCheckBox::OnCheck()


@@ -139,7 +116,7 @@ void wxCheckBox::OnCheck()
 wxBitmap wxCheckBox::GetBitmap(State state, Status status) const
 {
     wxBitmap bmp = m_bitmaps[state][status];
 wxBitmap wxCheckBox::GetBitmap(State state, Status status) const
 {
     wxBitmap bmp = m_bitmaps[state][status];

-    if ( !bmp.Ok() )
+    if ( !bmp.IsOk() )

         bmp = m_bitmaps[State_Normal][status];
 
     return bmp;
         bmp = m_bitmaps[State_Normal][status];
 
     return bmp;


@@ -174,8 +151,12 @@ void wxCheckBox::DoDraw(wxControlRenderer *renderer)
     dc.SetFont(GetFont());
     dc.SetTextForeground(GetForegroundColour());
 
     dc.SetFont(GetFont());
     dc.SetTextForeground(GetForegroundColour());
 

-    if ( m_status == Status_Checked )
-        flags |= wxCONTROL_CHECKED;
+    switch ( Get3StateValue() )
+    {
+        case wxCHK_CHECKED:      flags |= wxCONTROL_CHECKED;      break;
+        case wxCHK_UNDETERMINED: flags |= wxCONTROL_UNDETERMINED; break;
+        default:                 /* do nothing */                 break;
+    }

 
     wxBitmap bitmap(GetBitmap(GetState(flags), m_status));
 
 
     wxBitmap bitmap(GetBitmap(GetState(flags), m_status));
 


@@ -197,7 +178,7 @@ void wxCheckBox::DoDraw(wxControlRenderer *renderer)
 wxSize wxCheckBox::GetBitmapSize() const
 {
     wxBitmap bmp = GetBitmap(State_Normal, Status_Checked);
 wxSize wxCheckBox::GetBitmapSize() const
 {
     wxBitmap bmp = GetBitmap(State_Normal, Status_Checked);

-    return bmp.Ok() ? wxSize(bmp.GetWidth(), bmp.GetHeight())
+    return bmp.IsOk() ? wxSize(bmp.GetWidth(), bmp.GetHeight())

                     : GetRenderer()->GetCheckBitmapSize();
 }
 
                     : GetRenderer()->GetCheckBitmapSize();
 }
 


@@ -212,7 +193,9 @@ wxSize wxCheckBox::DoGetBestClientSize() const
     if ( height < sizeBmp.y )
         height = sizeBmp.y;
 
     if ( height < sizeBmp.y )
         height = sizeBmp.y;
 

-#if wxUNIV_COMPATIBLE_MSW
+#if defined(wxUNIV_COMPATIBLE_MSW) && wxUNIV_COMPATIBLE_MSW
+    // FIXME: flag nowhere defined so perhaps should be removed?
+

     // this looks better but is different from what wxMSW does
     height += GetCharHeight()/2;
 #endif // wxUNIV_COMPATIBLE_MSW
     // this looks better but is different from what wxMSW does
     height += GetCharHeight()/2;
 #endif // wxUNIV_COMPATIBLE_MSW


@@ -226,11 +209,46 @@ wxSize wxCheckBox::DoGetBestClientSize() const
 // checkbox actions
 // ----------------------------------------------------------------------------
 
 // checkbox actions
 // ----------------------------------------------------------------------------
 

+void wxCheckBox::DoSet3StateValue(wxCheckBoxState state)
+{
+    Status status;
+    switch ( state )
+    {
+        case wxCHK_UNCHECKED:    status = Status_Unchecked;   break;
+        case wxCHK_CHECKED:      status = Status_Checked; break;
+        default:                 wxFAIL_MSG(wxT("Unknown checkbox state"));
+        case wxCHK_UNDETERMINED: status = Status_3rdState;  break;
+    }
+    if ( status != m_status )
+    {
+        m_status = status;
+
+        if ( m_status == Status_Checked )
+        {
+            // invoke the hook
+            OnCheck();
+        }
+
+        Refresh();
+    }
+}
+
+wxCheckBoxState wxCheckBox::DoGet3StateValue() const
+{
+    switch ( m_status )
+    {
+        case Status_Checked:    return wxCHK_CHECKED;
+        case Status_Unchecked:  return wxCHK_UNCHECKED;
+        default:                /* go further */ break;
+    }
+    return wxCHK_UNDETERMINED;
+}
+

 void wxCheckBox::Press()
 {
     if ( !m_isPressed )
     {
 void wxCheckBox::Press()
 {
     if ( !m_isPressed )
     {

-        m_isPressed = TRUE;
+        m_isPressed = true;

 
         Refresh();
     }
 
         Refresh();
     }


@@ -240,7 +258,7 @@ void wxCheckBox::Release()
 {
     if ( m_isPressed )
     {
 {
     if ( m_isPressed )
     {

-        m_isPressed = FALSE;
+        m_isPressed = false;

 
         Refresh();
     }
 
         Refresh();
     }


@@ -248,9 +266,27 @@ void wxCheckBox::Release()
 
 void wxCheckBox::Toggle()
 {
 
 void wxCheckBox::Toggle()
 {

-    m_isPressed = FALSE;
+    m_isPressed = false;
+
+    Status status = m_status;
+
+    switch ( Get3StateValue() )
+    {
+        case wxCHK_CHECKED:
+            Set3StateValue(Is3rdStateAllowedForUser() ? wxCHK_UNDETERMINED : wxCHK_UNCHECKED);
+            break;
+
+        case wxCHK_UNCHECKED:
+            Set3StateValue(wxCHK_CHECKED);
+            break;
+
+        case wxCHK_UNDETERMINED:
+            Set3StateValue(wxCHK_UNCHECKED);
+            break;
+    }

 
 

-    ChangeValue(!GetValue());
+    if( status != m_status )
+        SendEvent();

 }
 
 void wxCheckBox::ChangeValue(bool value)
 }
 
 void wxCheckBox::ChangeValue(bool value)


@@ -264,7 +300,17 @@ void wxCheckBox::SendEvent()
 {
     wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, GetId());
     InitCommandEvent(event);
 {
     wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, GetId());
     InitCommandEvent(event);

-    event.SetInt(IsChecked());
+    wxCheckBoxState state = Get3StateValue();
+
+    // If the style flag to allow the user setting the undetermined state
+    // is not set, then skip the undetermined state and set it to unchecked.
+    if ( state == wxCHK_UNDETERMINED && !Is3rdStateAllowedForUser() )
+    {
+        state = wxCHK_UNCHECKED;
+        Set3StateValue(state);
+    }
+
+    event.SetInt(state);

     Command(event);
 }
 
     Command(event);
 }
 


@@ -281,23 +327,31 @@ bool wxCheckBox::PerformAction(const wxControlAction& action,
     else if ( action == wxACTION_BUTTON_RELEASE )
         Release();
     if ( action == wxACTION_CHECKBOX_CHECK )
     else if ( action == wxACTION_BUTTON_RELEASE )
         Release();
     if ( action == wxACTION_CHECKBOX_CHECK )

-        ChangeValue(TRUE);
+        ChangeValue(true);

     else if ( action == wxACTION_CHECKBOX_CLEAR )
     else if ( action == wxACTION_CHECKBOX_CLEAR )

-        ChangeValue(FALSE);
+        ChangeValue(false);

     else if ( action == wxACTION_CHECKBOX_TOGGLE )
         Toggle();
     else
         return wxControl::PerformAction(action, numArg, strArg);
 
     else if ( action == wxACTION_CHECKBOX_TOGGLE )
         Toggle();
     else
         return wxControl::PerformAction(action, numArg, strArg);
 

-    return TRUE;
+    return true;
+}
+
+/* static */
+wxInputHandler *wxCheckBox::CreateStdInputHandler(wxInputHandler *handlerDef)
+{
+    static wxStdCheckboxInputHandler s_handler(handlerDef);
+
+    return &s_handler;

 }
 
 // ----------------------------------------------------------------------------
 // wxStdCheckboxInputHandler
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // wxStdCheckboxInputHandler
 // ----------------------------------------------------------------------------
 

-wxStdCheckboxInputHandler::wxStdCheckboxInputHandler(wxInputHandler *inphand)
-                         : wxStdButtonInputHandler(inphand)
+wxStdCheckboxInputHandler::wxStdCheckboxInputHandler(wxInputHandler *def)
+                         : wxStdInputHandler(wxButton::GetStdInputHandler(def))

 {
 }
 
 {
 }