Defer loading of character sets, and some anti-crash checks related to

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

diff --git a/src/common/valgen.cpp b/src/common/valgen.cpp
index 76666bcdb1ef5adc8936d38422ad27dc4201458c..091c2b9db4de22a0887995f455e48185db3566b5 100644 (file)
--- a/src/common/valgen.cpp
+++ b/src/common/valgen.cpp
@@ -24,10 +24,13 @@
 #include "wx/utils.h"
 #include "wx/intl.h"
 #include "wx/wx.h"
+#include "wx/dynarray.h"
 #endif
 
+#ifndef __WIN16__
 #include "wx/spinbutt.h"
 #include "wx/checklst.h"
+#endif
 
 #include "wx/valgen.h"
 
@@ -129,6 +132,7 @@ bool wxGenericValidator::TransferToWindow(void)
       return TRUE;
     }
   }
+#ifndef __WIN16__
   else if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinButton)) )
   {
     wxSpinButton* pControl = (wxSpinButton*) m_validatorWindow;
@@ -138,6 +142,7 @@ bool wxGenericValidator::TransferToWindow(void)
       return TRUE;
     }
   }
+#endif
   // string controls
   else if (m_validatorWindow->IsKindOf(CLASSINFO(wxButton)) )
   {
@@ -184,6 +189,7 @@ bool wxGenericValidator::TransferToWindow(void)
       return TRUE;
     }
   }
+#ifndef __WIN16__
   // array controls
   // NOTE: wxCheckListBox isa wxListBox, so wxCheckListBox
   // MUST come first:
@@ -205,6 +211,7 @@ bool wxGenericValidator::TransferToWindow(void)
        else
                return FALSE;
   }
+#endif
   else if (m_validatorWindow->IsKindOf(CLASSINFO(wxListBox)) )
   {
     wxListBox* pControl = (wxListBox*) m_validatorWindow;
@@ -279,6 +286,7 @@ bool wxGenericValidator::TransferFromWindow(void)
       return TRUE;
     }
   }
+#ifndef __WIN16__
   else if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinButton)) )
   {
     wxSpinButton* pControl = (wxSpinButton*) m_validatorWindow;
@@ -288,6 +296,7 @@ bool wxGenericValidator::TransferFromWindow(void)
       return TRUE;
     }
   }
+#endif
   // string controls
   else if (m_validatorWindow->IsKindOf(CLASSINFO(wxButton)) )
   {
@@ -334,6 +343,7 @@ bool wxGenericValidator::TransferFromWindow(void)
       return TRUE;
     }
   }
+#ifndef __WIN16__
   // array controls
   // NOTE: wxCheckListBox isa wxListBox, so wxCheckListBox
   // MUST come first:
@@ -354,6 +364,7 @@ bool wxGenericValidator::TransferFromWindow(void)
        else
          return FALSE;
   }
+#endif
   else if (m_validatorWindow->IsKindOf(CLASSINFO(wxListBox)) )
   {
     wxListBox* pControl = (wxListBox*) m_validatorWindow;