X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1b941f2d3143c1205fc7c5b01bd254781db728b3..db71eb0640221199170ac9ea83371c2d467fa456:/src/common/valgen.cpp

diff --git a/src/common/valgen.cpp b/src/common/valgen.cpp
index f6dc6d5202..4b05f6d4f2 100644
--- a/src/common/valgen.cpp
+++ b/src/common/valgen.cpp
@@ -1,57 +1,49 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        valgen.cpp
+// Name:        src/common/valgen.cpp
 // Purpose:     wxGenericValidator class
 // Author:      Kevin Smith
 // Modified by:
 // Created:     Jan 22 1999
-// RCS-ID:
+// RCS-ID:      $Id$
 // Copyright:   (c) 1999 Kevin Smith
-// Licence:           wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "valgen.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-  #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-  #include "wx/defs.h"
+    #pragma hdrstop
 #endif
 
 #if wxUSE_VALIDATORS
 
 #ifndef WX_PRECOMP
-  #include "wx/utils.h"
-  #include "wx/intl.h"
-  #include "wx/dynarray.h"
-  #include "wx/choice.h"
-  #include "wx/combobox.h"
-  #include "wx/radiobox.h"
-  #include "wx/radiobut.h"
-  #include "wx/checkbox.h"
-  #include "wx/scrolbar.h"
-  #include "wx/gauge.h"
-  #include "wx/stattext.h"
-  #include "wx/textctrl.h"
-  #include "wx/button.h"
-  #include "wx/listbox.h"
-  #include "wx/slider.h"
-#endif
-
-
-  #include "wx/spinctrl.h"
+    #include "wx/dynarray.h"
+    #include "wx/utils.h"
+    #include "wx/intl.h"
+    #include "wx/choice.h"
+    #include "wx/combobox.h"
+    #include "wx/radiobox.h"
+    #include "wx/radiobut.h"
+    #include "wx/checkbox.h"
+    #include "wx/scrolbar.h"
+    #include "wx/gauge.h"
+    #include "wx/stattext.h"
+    #include "wx/textctrl.h"
+    #include "wx/button.h"
+    #include "wx/listbox.h"
+    #include "wx/slider.h"
+    #include "wx/checklst.h"
+#endif
+
+#include "wx/spinctrl.h"
 
 #if wxUSE_SPINBTN
-  #include "wx/spinbutt.h"
+    #include "wx/spinbutt.h"
 #endif
-#if wxUSE_CHECKLISTBOX
-  #include "wx/checklst.h"
+#if wxUSE_TOGGLEBTN
+    #include "wx/tglbtn.h"
 #endif
 
 #include "wx/valgen.h"
@@ -129,6 +121,17 @@ bool wxGenericValidator::TransferToWindow(void)
         }
     } else
 #endif
+#if wxUSE_TOGGLEBTN
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxToggleButton)) )
+    {
+        wxToggleButton * pControl = (wxToggleButton *) m_validatorWindow;
+        if (m_pBool)
+        {
+            pControl->SetValue(*m_pBool);
+            return true;
+        }
+    } else
+#endif
 
     // int controls
 #if wxUSE_GAUGE
@@ -225,7 +228,7 @@ bool wxGenericValidator::TransferToWindow(void)
             {
                 pControl->SetStringSelection(* m_pString);
             }
-            else
+            if ((m_validatorWindow->GetWindowStyle() & wxCB_READONLY) == 0)
             {
                 pControl->SetValue(* m_pString);
             }
@@ -252,6 +255,7 @@ bool wxGenericValidator::TransferToWindow(void)
         }
     } else
 #endif
+#if wxUSE_STATTEXT
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxStaticText)) )
     {
         wxStaticText* pControl = (wxStaticText*) m_validatorWindow;
@@ -261,6 +265,7 @@ bool wxGenericValidator::TransferToWindow(void)
             return true;
         }
     } else
+#endif
 #if wxUSE_TEXTCTRL
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )
     {
@@ -279,6 +284,7 @@ bool wxGenericValidator::TransferToWindow(void)
         }
     } else
 #endif
+
     // array controls
 #if wxUSE_CHECKLISTBOX
     // NOTE: wxCheckListBox is a wxListBox, so wxCheckListBox MUST come first:
@@ -334,65 +340,77 @@ bool wxGenericValidator::TransferToWindow(void)
 // Called to transfer data from the window
 bool wxGenericValidator::TransferFromWindow(void)
 {
-  if ( !m_validatorWindow )
-    return false;
+    if ( !m_validatorWindow )
+        return false;
 
-  // bool controls
+    // BOOL CONTROLS **************************************
 #if wxUSE_CHECKBOX
-  if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckBox)) )
-  {
-    wxCheckBox* pControl = (wxCheckBox*) m_validatorWindow;
-        if (m_pBool)
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckBox)) )
     {
-      *m_pBool = pControl->GetValue() ;
-      return true;
-    }
-  } else
+        wxCheckBox* pControl = (wxCheckBox*) m_validatorWindow;
+        if (m_pBool)
+        {
+            *m_pBool = pControl->GetValue() ;
+            return true;
+        }
+    } else
 #endif
 #if wxUSE_RADIOBTN
-  if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioButton)) )
-  {
-    wxRadioButton* pControl = (wxRadioButton*) m_validatorWindow;
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioButton)) )
+    {
+        wxRadioButton* pControl = (wxRadioButton*) m_validatorWindow;
         if (m_pBool)
+        {
+            *m_pBool = pControl->GetValue() ;
+            return true;
+        }
+    } else
+#endif
+#if wxUSE_TOGGLEBTN
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxToggleButton)) )
     {
-      *m_pBool = pControl->GetValue() ;
-      return true;
-    }
-  } else
+        wxToggleButton *pControl = (wxToggleButton *) m_validatorWindow;
+        if (m_pBool)
+        {
+            *m_pBool = pControl->GetValue() ;
+            return true;
+        }
+    } else
 #endif
-  // int controls
+
+    // INT CONTROLS ***************************************
 #if wxUSE_GAUGE
-  if (m_validatorWindow->IsKindOf(CLASSINFO(wxGauge)) )
-  {
-    wxGauge* pControl = (wxGauge*) m_validatorWindow;
-        if (m_pInt)
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxGauge)) )
     {
-      *m_pInt = pControl->GetValue() ;
-      return true;
-    }
-  } else
+        wxGauge* pControl = (wxGauge*) m_validatorWindow;
+        if (m_pInt)
+        {
+            *m_pInt = pControl->GetValue() ;
+            return true;
+        }
+    } else
 #endif
 #if wxUSE_RADIOBOX
-  if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioBox)) )
-  {
-    wxRadioBox* pControl = (wxRadioBox*) m_validatorWindow;
-        if (m_pInt)
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioBox)) )
     {
-      *m_pInt = pControl->GetSelection() ;
-      return true;
-    }
-  } else
+        wxRadioBox* pControl = (wxRadioBox*) m_validatorWindow;
+        if (m_pInt)
+        {
+            *m_pInt = pControl->GetSelection() ;
+            return true;
+        }
+    } else
 #endif
 #if wxUSE_SCROLLBAR
-  if (m_validatorWindow->IsKindOf(CLASSINFO(wxScrollBar)) )
-  {
-    wxScrollBar* pControl = (wxScrollBar*) m_validatorWindow;
-        if (m_pInt)
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxScrollBar)) )
     {
-      *m_pInt = pControl->GetThumbPosition() ;
-      return true;
-    }
-  } else
+        wxScrollBar* pControl = (wxScrollBar*) m_validatorWindow;
+        if (m_pInt)
+        {
+            *m_pInt = pControl->GetThumbPosition() ;
+            return true;
+        }
+    } else
 #endif
 #if wxUSE_SPINCTRL && !defined(__WXMOTIF__)
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinCtrl)) )
@@ -406,148 +424,156 @@ bool wxGenericValidator::TransferFromWindow(void)
     } else
 #endif
 #if wxUSE_SPINBTN
-  if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinButton)) )
-  {
-    wxSpinButton* pControl = (wxSpinButton*) m_validatorWindow;
-        if (m_pInt)
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinButton)) )
     {
-      *m_pInt = pControl->GetValue() ;
-      return true;
-    }
-  } else
+        wxSpinButton* pControl = (wxSpinButton*) m_validatorWindow;
+        if (m_pInt)
+        {
+            *m_pInt = pControl->GetValue() ;
+            return true;
+        }
+    } else
 #endif
 #if wxUSE_SLIDER
-  if (m_validatorWindow->IsKindOf(CLASSINFO(wxSlider)) )
-  {
-    wxSlider* pControl = (wxSlider*) m_validatorWindow;
-    if (m_pInt)
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxSlider)) )
     {
-      *m_pInt = pControl->GetValue() ;
-      return true;
-    }
-  } else
+        wxSlider* pControl = (wxSlider*) m_validatorWindow;
+        if (m_pInt)
+        {
+            *m_pInt = pControl->GetValue() ;
+            return true;
+        }
+    } else
 #endif
-  // string controls
+
+    // STRING CONTROLS ************************************
 #if wxUSE_BUTTON
-  if (m_validatorWindow->IsKindOf(CLASSINFO(wxButton)) )
-  {
-    wxButton* pControl = (wxButton*) m_validatorWindow;
-        if (m_pString)
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxButton)) )
     {
-      *m_pString = pControl->GetLabel() ;
-      return true;
-    }
-  } else
+        wxButton* pControl = (wxButton*) m_validatorWindow;
+        if (m_pString)
+        {
+            *m_pString = pControl->GetLabel() ;
+            return true;
+        }
+    } else
 #endif
 #if wxUSE_COMBOBOX
-  if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox)) )
-  {
-    wxComboBox* pControl = (wxComboBox*) m_validatorWindow;
-    if (m_pInt)
-    {
-      *m_pInt = pControl->GetSelection() ;
-      return true;
-    }
-    else if (m_pString)
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox)) )
     {
-        *m_pString = pControl->GetValue();
-        return true;
-    }
-  } else
+        wxComboBox* pControl = (wxComboBox*) m_validatorWindow;
+        if (m_pInt)
+        {
+            *m_pInt = pControl->GetSelection() ;
+            return true;
+        }
+        else if (m_pString)
+        {
+            if (m_validatorWindow->GetWindowStyle() & wxCB_READONLY)
+                *m_pString = pControl->GetStringSelection();
+            else
+                *m_pString = pControl->GetValue();
+            return true;
+        }
+    } else
 #endif
 #if wxUSE_CHOICE
- if (m_validatorWindow->IsKindOf(CLASSINFO(wxChoice)) )
-  {
-    wxChoice* pControl = (wxChoice*) m_validatorWindow;
-        if (m_pInt)
-    {
-      *m_pInt = pControl->GetSelection() ;
-      return true;
-    }
-    else if (m_pString)
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxChoice)) )
     {
-        *m_pString = pControl->GetStringSelection();
-        return true;
-    }
-  } else
+        wxChoice* pControl = (wxChoice*) m_validatorWindow;
+        if (m_pInt)
+        {
+            *m_pInt = pControl->GetSelection() ;
+            return true;
+        }
+        else if (m_pString)
+        {
+            *m_pString = pControl->GetStringSelection();
+            return true;
+        }
+    } else
 #endif
-  if (m_validatorWindow->IsKindOf(CLASSINFO(wxStaticText)) )
-  {
-    wxStaticText* pControl = (wxStaticText*) m_validatorWindow;
-        if (m_pString)
+#if wxUSE_STATTEXT
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxStaticText)) )
     {
-      *m_pString = pControl->GetLabel() ;
-      return true;
-    }
-  } else
-#if wxUSE_TEXTCTRL
-  if (m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )
-  {
-    wxTextCtrl* pControl = (wxTextCtrl*) m_validatorWindow;
+        wxStaticText* pControl = (wxStaticText*) m_validatorWindow;
         if (m_pString)
+        {
+            *m_pString = pControl->GetLabel() ;
+            return true;
+        }
+    } else
+#endif
+#if wxUSE_TEXTCTRL
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )
     {
-      *m_pString = pControl->GetValue() ;
-      return true;
-    }
-    else if (m_pInt)
-    {
-        *m_pInt = wxAtoi(pControl->GetValue());
-        return true;
-    }
-  } else
+        wxTextCtrl* pControl = (wxTextCtrl*) m_validatorWindow;
+        if (m_pString)
+        {
+            *m_pString = pControl->GetValue() ;
+            return true;
+        }
+        else if (m_pInt)
+        {
+            *m_pInt = wxAtoi(pControl->GetValue());
+            return true;
+        }
+    } else
 #endif
-  // array controls
+
+    // ARRAY CONTROLS *************************************
 #if wxUSE_CHECKLISTBOX
-  // NOTE: wxCheckListBox isa wxListBox, so wxCheckListBox MUST come first:
-  if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckListBox)) )
-  {
-    wxCheckListBox* pControl = (wxCheckListBox*) m_validatorWindow;
-    if (m_pArrayInt)
-    {
-      // clear our array
-      m_pArrayInt->Clear();
-
-      // add each selected item to our array
-      size_t i,
-             count = pControl->GetCount();
-      for ( i = 0; i < count; i++ )
-      {
-        if (pControl->IsChecked(i))
-          m_pArrayInt->Add(i);
-      }
-
-      return true;
-    }
-    else
-      return false;
-  } else
+    // NOTE: wxCheckListBox isa wxListBox, so wxCheckListBox MUST come first:
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckListBox)) )
+    {
+        wxCheckListBox* pControl = (wxCheckListBox*) m_validatorWindow;
+        if (m_pArrayInt)
+        {
+            // clear our array
+            m_pArrayInt->Clear();
+
+            // add each selected item to our array
+            size_t i,
+                   count = pControl->GetCount();
+            for ( i = 0; i < count; i++ )
+            {
+                if (pControl->IsChecked(i))
+                    m_pArrayInt->Add(i);
+            }
+
+            return true;
+        }
+        else
+            return false;
+    } else
 #endif
 #if wxUSE_LISTBOX
-  if (m_validatorWindow->IsKindOf(CLASSINFO(wxListBox)) )
-  {
-    wxListBox* pControl = (wxListBox*) m_validatorWindow;
-    if (m_pArrayInt)
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxListBox)) )
     {
-      // clear our array
-      m_pArrayInt->Clear();
+        wxListBox* pControl = (wxListBox*) m_validatorWindow;
+        if (m_pArrayInt)
+        {
+            // clear our array
+            m_pArrayInt->Clear();
 
-      // add each selected item to our array
-      size_t i,
-             count = pControl->GetCount();
-      for ( i = 0; i < count; i++ )
-      {
-        if (pControl->Selected(i))
-          m_pArrayInt->Add(i);
-      }
+            // add each selected item to our array
+            size_t i,
+                   count = pControl->GetCount();
+            for ( i = 0; i < count; i++ )
+            {
+                if (pControl->IsSelected(i))
+                    m_pArrayInt->Add(i);
+            }
 
-      return true;
-    }
-  } else
+            return true;
+        }
+    } else
 #endif
 
-  // unrecognized control, or bad pointer
+    // unrecognized control, or bad pointer
+        return false;
+
     return false;
-  return false;
 }
 
 /*
@@ -563,4 +589,3 @@ void wxGenericValidator::Initialize()
 
 #endif
   // wxUSE_VALIDATORS
-