X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/22de6a40837573d953a531fe3597669b7f9e3b35..36abe9d421ebb33873f012a63fbdb210ff771682:/src/common/valgen.cpp

diff --git a/src/common/valgen.cpp b/src/common/valgen.cpp
index 6fc3530c7d..1266e49a90 100644
--- a/src/common/valgen.cpp
+++ b/src/common/valgen.cpp
@@ -146,7 +146,7 @@ bool wxGenericValidator::TransferToWindow(void)
             return true;
         }
     } else
-#if defined(__WXMAC__) || defined(__WXGTK20__)
+#if (defined(__WXMAC__) || defined(__WXGTK20__)) && !defined(__WXUNIVERSAL__)
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxBitmapToggleButton)) )
     {
         wxBitmapToggleButton * pControl = (wxBitmapToggleButton *) m_validatorWindow;
@@ -228,7 +228,7 @@ bool wxGenericValidator::TransferToWindow(void)
 #endif
 
     // date time controls
-#if wxUSE_DATEPICKCTRL
+#if 0 // wxUSE_DATEPICKCTRL -- temporary fix for shared build linking
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxDatePickerCtrl)) )
     {
         wxDatePickerCtrl* pControl = (wxDatePickerCtrl*) m_validatorWindow;
@@ -370,7 +370,8 @@ bool wxGenericValidator::TransferToWindow(void)
         }
     } else
 #endif
-        ;   // to match the last 'else' above
+    {   // to match the last 'else' above
+    }
 
   // unrecognized control, or bad pointer
   return false;
@@ -486,7 +487,7 @@ bool wxGenericValidator::TransferFromWindow(void)
 #endif
 
     // DATE TIME CONTROLS ************************************
-#if wxUSE_DATEPICKCTRL
+#if 0 // wxUSE_DATEPICKCTRL -- temporary fix for shared build linking
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxDatePickerCtrl)) )
     {
         wxDatePickerCtrl* pControl = (wxDatePickerCtrl*) m_validatorWindow;