rename various gsock* files to sock* (except for MSW where this will be done later)

[wxWidgets.git] / src / common / valgen.cpp

diff --git a/src/common/valgen.cpp b/src/common/valgen.cpp
index 0b5282829ba7c26036300219965670c544c42a54..1266e49a905cc5c69181586525aeb1d5948707e5 100644 (file)
--- a/src/common/valgen.cpp
+++ b/src/common/valgen.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        valgen.cpp
+// Name:        src/common/valgen.cpp

 // Purpose:     wxGenericValidator class
 // Author:      Kevin Smith
 // Modified by:
 // Purpose:     wxGenericValidator class
 // Author:      Kevin Smith
 // Modified by:


@@ -13,41 +13,38 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #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
 #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"
+#include "wx/datectrl.h"

 
 #if wxUSE_SPINBTN
 
 #if wxUSE_SPINBTN

-  #include "wx/spinbutt.h"
+    #include "wx/spinbutt.h"

 #endif
 #endif

-#if wxUSE_CHECKLISTBOX
-  #include "wx/checklst.h"
+#if wxUSE_TOGGLEBTN
+    #include "wx/tglbtn.h"

 #endif
 
 #include "wx/valgen.h"
 #endif
 
 #include "wx/valgen.h"


@@ -78,6 +75,16 @@ wxGenericValidator::wxGenericValidator(wxArrayInt *val)
     m_pArrayInt = val;
 }
 
     m_pArrayInt = val;
 }
 

+#if wxUSE_DATETIME
+
+wxGenericValidator::wxGenericValidator(wxDateTime *val)
+{
+    Initialize();
+    m_pDateTime = val;
+}
+
+#endif // wxUSE_DATETIME
+

 wxGenericValidator::wxGenericValidator(const wxGenericValidator& val)
     : wxValidator()
 {
 wxGenericValidator::wxGenericValidator(const wxGenericValidator& val)
     : wxValidator()
 {


@@ -92,6 +99,9 @@ bool wxGenericValidator::Copy(const wxGenericValidator& val)
     m_pInt = val.m_pInt;
     m_pString = val.m_pString;
     m_pArrayInt = val.m_pArrayInt;
     m_pInt = val.m_pInt;
     m_pString = val.m_pString;
     m_pArrayInt = val.m_pArrayInt;

+#if wxUSE_DATETIME
+    m_pDateTime = val.m_pDateTime;
+#endif // wxUSE_DATETIME

 
     return true;
 }
 
     return true;
 }


@@ -126,6 +136,29 @@ bool wxGenericValidator::TransferToWindow(void)
     } else
 #endif
 
     } 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
+#if (defined(__WXMAC__) || defined(__WXGTK20__)) && !defined(__WXUNIVERSAL__)
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxBitmapToggleButton)) )
+    {
+        wxBitmapToggleButton * pControl = (wxBitmapToggleButton *) m_validatorWindow;
+        if (m_pBool)
+        {
+            pControl->SetValue(*m_pBool);
+            return true;
+        }
+    } else
+#endif
+#endif
+

     // int controls
 #if wxUSE_GAUGE
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxGauge)) )
     // int controls
 #if wxUSE_GAUGE
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxGauge)) )


@@ -194,6 +227,19 @@ bool wxGenericValidator::TransferToWindow(void)
     } else
 #endif
 
     } else
 #endif
 

+    // date time controls
+#if 0 // wxUSE_DATEPICKCTRL -- temporary fix for shared build linking
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxDatePickerCtrl)) )
+    {
+        wxDatePickerCtrl* pControl = (wxDatePickerCtrl*) m_validatorWindow;
+        if (m_pDateTime)
+        {
+            pControl->SetValue(*m_pDateTime) ;
+            return true;
+        }
+    } else
+#endif
+

     // string controls
 #if wxUSE_BUTTON
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxButton)) )
     // string controls
 #if wxUSE_BUTTON
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxButton)) )


@@ -277,6 +323,7 @@ bool wxGenericValidator::TransferToWindow(void)
         }
     } else
 #endif
         }
     } else
 #endif

+

     // array controls
 #if wxUSE_CHECKLISTBOX
     // NOTE: wxCheckListBox is a wxListBox, so wxCheckListBox MUST come first:
     // array controls
 #if wxUSE_CHECKLISTBOX
     // NOTE: wxCheckListBox is a wxListBox, so wxCheckListBox MUST come first:


@@ -323,7 +370,8 @@ bool wxGenericValidator::TransferToWindow(void)
         }
     } else
 #endif
         }
     } else
 #endif

-        ;   // to match the last 'else' above
+    {   // to match the last 'else' above
+    }

 
   // unrecognized control, or bad pointer
   return false;
 
   // unrecognized control, or bad pointer
   return false;


@@ -358,6 +406,17 @@ bool wxGenericValidator::TransferFromWindow(void)
         }
     } else
 #endif
         }
     } else
 #endif

+#if wxUSE_TOGGLEBTN
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxToggleButton)) )
+    {
+        wxToggleButton *pControl = (wxToggleButton *) m_validatorWindow;
+        if (m_pBool)
+        {
+            *m_pBool = pControl->GetValue() ;
+            return true;
+        }
+    } else
+#endif

 
     // INT CONTROLS ***************************************
 #if wxUSE_GAUGE
 
     // INT CONTROLS ***************************************
 #if wxUSE_GAUGE


@@ -427,6 +486,19 @@ bool wxGenericValidator::TransferFromWindow(void)
     } else
 #endif
 
     } else
 #endif
 

+    // DATE TIME CONTROLS ************************************
+#if 0 // wxUSE_DATEPICKCTRL -- temporary fix for shared build linking
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxDatePickerCtrl)) )
+    {
+        wxDatePickerCtrl* pControl = (wxDatePickerCtrl*) m_validatorWindow;
+        if (m_pDateTime)
+        {
+            *m_pDateTime = pControl->GetValue() ;
+            return true;
+        }
+    } else
+#endif
+

     // STRING CONTROLS ************************************
 #if wxUSE_BUTTON
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxButton)) )
     // STRING CONTROLS ************************************
 #if wxUSE_BUTTON
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxButton)) )


@@ -542,7 +614,7 @@ bool wxGenericValidator::TransferFromWindow(void)
                    count = pControl->GetCount();
             for ( i = 0; i < count; i++ )
             {
                    count = pControl->GetCount();
             for ( i = 0; i < count; i++ )
             {

-                if (pControl->Selected(i))
+                if (pControl->IsSelected(i))

                     m_pArrayInt->Add(i);
             }
 
                     m_pArrayInt->Add(i);
             }
 


@@ -566,8 +638,9 @@ void wxGenericValidator::Initialize()
     m_pInt = 0;
     m_pString = 0;
     m_pArrayInt = 0;
     m_pInt = 0;
     m_pString = 0;
     m_pArrayInt = 0;

+#if wxUSE_DATETIME
+    m_pDateTime = 0;
+#endif // wxUSE_DATETIME

 }
 
 }
 

-#endif
-  // wxUSE_VALIDATORS
-
+#endif // wxUSE_VALIDATORS