fix harmless warnings about uninitialized (not really) variables in MSVC release...

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

diff --git a/src/common/valgen.cpp b/src/common/valgen.cpp
index 6fc3530c7d91d2d6068b33987ae5d5b717cd3663..47f6f230d6bbfaa00067c3c76ff850714b94daee 100644 (file)
--- a/src/common/valgen.cpp
+++ b/src/common/valgen.cpp
@@ -146,7 +146,7 @@ bool wxGenericValidator::TransferToWindow(void)
             return true;
         }
     } else
             return true;
         }
     } else

-#if defined(__WXMAC__) || defined(__WXGTK20__)
+#if (defined(__WXMAC__) || defined(__WXMSW__) || defined(__WXGTK20__)) && !defined(__WXUNIVERSAL__)

     if (m_validatorWindow->IsKindOf(CLASSINFO(wxBitmapToggleButton)) )
     {
         wxBitmapToggleButton * pControl = (wxBitmapToggleButton *) m_validatorWindow;
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxBitmapToggleButton)) )
     {
         wxBitmapToggleButton * pControl = (wxBitmapToggleButton *) m_validatorWindow;


@@ -228,7 +228,7 @@ bool wxGenericValidator::TransferToWindow(void)
 #endif
 
     // date time controls
 #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;
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxDatePickerCtrl)) )
     {
         wxDatePickerCtrl* pControl = (wxDatePickerCtrl*) m_validatorWindow;


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


@@ -415,6 +416,17 @@ bool wxGenericValidator::TransferFromWindow(void)
             return true;
         }
     } else
             return true;
         }
     } else

+#if (defined(__WXMAC__) || defined(__WXMSW__) || defined(__WXGTK20__)) && !defined(__WXUNIVERSAL__)
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxBitmapToggleButton)) )
+    {
+        wxBitmapToggleButton *pControl = (wxBitmapToggleButton *) m_validatorWindow;
+        if (m_pBool)
+        {
+            *m_pBool = pControl->GetValue() ;
+            return true;
+        }
+    } else
+#endif

 #endif
 
     // INT CONTROLS ***************************************
 #endif
 
     // INT CONTROLS ***************************************


@@ -486,7 +498,7 @@ bool wxGenericValidator::TransferFromWindow(void)
 #endif
 
     // DATE TIME CONTROLS ************************************
 #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;
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxDatePickerCtrl)) )
     {
         wxDatePickerCtrl* pControl = (wxDatePickerCtrl*) m_validatorWindow;