update the size of the wxGridSizer as items are added to wxGBSizer to avoid asserts...

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

diff --git a/src/common/valgen.cpp b/src/common/valgen.cpp
index 46c0a4cbb7902c92566e7901132e8fcb2e9d7b7f..1266e49a905cc5c69181586525aeb1d5948707e5 100644 (file)
--- a/src/common/valgen.cpp
+++ b/src/common/valgen.cpp
@@ -19,9 +19,9 @@
 #if wxUSE_VALIDATORS
 
 #ifndef WX_PRECOMP
 #if wxUSE_VALIDATORS
 
 #ifndef WX_PRECOMP

+    #include "wx/dynarray.h"

     #include "wx/utils.h"
     #include "wx/intl.h"
     #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/choice.h"
     #include "wx/combobox.h"
     #include "wx/radiobox.h"


@@ -34,18 +34,17 @@
     #include "wx/button.h"
     #include "wx/listbox.h"
     #include "wx/slider.h"
     #include "wx/button.h"
     #include "wx/listbox.h"
     #include "wx/slider.h"

+    #include "wx/checklst.h"

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

+#include "wx/datectrl.h"

 
 #if wxUSE_SPINBTN
 
 #if wxUSE_SPINBTN

-  #include "wx/spinbutt.h"
-#endif
-#if wxUSE_CHECKLISTBOX
-  #include "wx/checklst.h"
+    #include "wx/spinbutt.h"

 #endif
 #if wxUSE_TOGGLEBTN
 #endif
 #if wxUSE_TOGGLEBTN

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

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


@@ -76,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()
 {


@@ -90,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;
 }


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

+

 #if wxUSE_TOGGLEBTN
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxToggleButton)) )
     {
 #if wxUSE_TOGGLEBTN
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxToggleButton)) )
     {


@@ -133,6 +146,17 @@ bool wxGenericValidator::TransferToWindow(void)
             return true;
         }
     } else
             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
 #endif
 
     // int controls


@@ -203,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)) )


@@ -333,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;


@@ -448,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)) )


@@ -587,7 +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