Unicode compilation fixes

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

diff --git a/src/common/valgen.cpp b/src/common/valgen.cpp
index 76666bcdb1ef5adc8936d38422ad27dc4201458c..05134307bc4f194da69551361c832998a58a9e02 100644 (file)
--- a/src/common/valgen.cpp
+++ b/src/common/valgen.cpp
@@ -4,7 +4,7 @@
 // Author:      Kevin Smith
 // Modified by:
 // Created:     Jan 22 1999
 // Author:      Kevin Smith
 // Modified by:
 // Created:     Jan 22 1999

-// RCS-ID:      
+// RCS-ID:

 // Copyright:   (c) 1999 Kevin Smith
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1999 Kevin Smith
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -17,59 +17,79 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+  #pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx/utils.h"
-#include "wx/intl.h"
-#include "wx/wx.h"
+  #include "wx/defs.h"

 #endif
 
 #endif
 

-#include "wx/spinbutt.h"
-#include "wx/checklst.h"
+#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
+
+#ifndef __WIN16__
+  #include "wx/spinbutt.h"
+  #include "wx/checklst.h"
+#endif

 
 #include "wx/valgen.h"
 
 wxGenericValidator::wxGenericValidator(bool *val)
 {
 
 #include "wx/valgen.h"
 
 wxGenericValidator::wxGenericValidator(bool *val)
 {

-  Initialize();
-  m_pBool = val;
+    Initialize();
+    m_pBool = val;

 }
 
 wxGenericValidator::wxGenericValidator(int *val)
 {
 }
 
 wxGenericValidator::wxGenericValidator(int *val)
 {

-  Initialize();
-  m_pInt = val;
+    Initialize();
+    m_pInt = val;

 }
 
 wxGenericValidator::wxGenericValidator(wxString *val)
 {
 }
 
 wxGenericValidator::wxGenericValidator(wxString *val)
 {

-  Initialize();
-  m_pString = val;
+    Initialize();
+    m_pString = val;

 }
 
 wxGenericValidator::wxGenericValidator(wxArrayInt *val)
 {
 }
 
 wxGenericValidator::wxGenericValidator(wxArrayInt *val)
 {

-  Initialize();
-  m_pArrayInt = val;
+    Initialize();
+    m_pArrayInt = val;

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

-  Copy(val);
+    Copy(val);

 }
 
 bool wxGenericValidator::Copy(const wxGenericValidator& val)
 {
 }
 
 bool wxGenericValidator::Copy(const wxGenericValidator& val)
 {

-  wxValidator::Copy(val);
+    wxValidator::Copy(val);

 
 

-  m_pBool = val.m_pBool;
-  m_pInt = val.m_pInt;
-  m_pString = val.m_pString;
-  m_pArrayInt = val.m_pArrayInt;
+    m_pBool = val.m_pBool;
+    m_pInt = val.m_pInt;
+    m_pString = val.m_pString;
+    m_pArrayInt = val.m_pArrayInt;

 
 

-  return TRUE;
+    return TRUE;

 }
 
 wxGenericValidator::~wxGenericValidator()
 }
 
 wxGenericValidator::~wxGenericValidator()


@@ -79,115 +99,150 @@ wxGenericValidator::~wxGenericValidator()
 // Called to transfer data to the window
 bool wxGenericValidator::TransferToWindow(void)
 {
 // Called to transfer data to the window
 bool wxGenericValidator::TransferToWindow(void)
 {

-  if ( !m_validatorWindow )
-    return FALSE;
+    if ( !m_validatorWindow )
+        return FALSE;

 
 

-  // bool controls
-  if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckBox)) )
-  {
-    wxCheckBox* pControl = (wxCheckBox*) m_validatorWindow;
-       if (m_pBool)
+    // bool controls
+#if wxUSE_CHECKBOX
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckBox)) )

     {
     {

-      pControl->SetValue(*m_pBool) ;
-      return TRUE;
-    }
-  }
-  else if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioButton)) )
-  {
-    wxRadioButton* pControl = (wxRadioButton*) m_validatorWindow;
+        wxCheckBox* pControl = (wxCheckBox*) m_validatorWindow;
+        if (m_pBool)
+       {
+           pControl->SetValue(*m_pBool);
+           return TRUE;
+       }
+    } else
+#endif
+#if wxUSE_RADIOBTN
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioButton)) )
+    {
+        wxRadioButton* pControl = (wxRadioButton*) m_validatorWindow;

        if (m_pBool)
        if (m_pBool)

+       {
+           pControl->SetValue(*m_pBool) ;
+           return TRUE;
+       }
+    } else
+#endif
+
+    // int controls
+#if wxUSE_GAUGE
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxGauge)) )

     {
     {

-      pControl->SetValue(*m_pBool) ;
-      return TRUE;
-    }
-  }
-  // int controls
-  else if (m_validatorWindow->IsKindOf(CLASSINFO(wxGauge)) )
-  {
-    wxGauge* pControl = (wxGauge*) m_validatorWindow;
+        wxGauge* pControl = (wxGauge*) m_validatorWindow;

        if (m_pInt)
        if (m_pInt)

+       {
+           pControl->SetValue(*m_pInt);
+           return TRUE;
+       }
+    } else
+#endif
+#if wxUSE_RADIOBOX
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioBox)) )

     {
     {

-      pControl->SetValue(*m_pInt) ;
-      return TRUE;
-    }
-  }
-  else if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioBox)) )
-  {
-    wxRadioBox* pControl = (wxRadioBox*) m_validatorWindow;
+        wxRadioBox* pControl = (wxRadioBox*) m_validatorWindow;

        if (m_pInt)
        if (m_pInt)

+       {
+           pControl->SetSelection(*m_pInt) ;
+           return TRUE;
+       }
+    } else
+#endif
+#if wxUSE_SCROLLBAR
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxScrollBar)) )

     {
     {

-      pControl->SetSelection(*m_pInt) ;
-      return TRUE;
-    }
-  }
-  else if (m_validatorWindow->IsKindOf(CLASSINFO(wxScrollBar)) )
-  {
-    wxScrollBar* pControl = (wxScrollBar*) m_validatorWindow;
+        wxScrollBar* pControl = (wxScrollBar*) m_validatorWindow;

        if (m_pInt)
        if (m_pInt)

+       {
+           pControl->SetThumbPosition(*m_pInt) ;
+           return TRUE;
+       }
+    } else
+#endif
+#if wxUSE_SPINBTN
+#ifndef __WIN16__
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinButton)) )

     {
     {

-      pControl->SetThumbPosition(*m_pInt) ;
-      return TRUE;
-    }
-  }
-  else if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinButton)) )
-  {
-    wxSpinButton* pControl = (wxSpinButton*) m_validatorWindow;
+        wxSpinButton* pControl = (wxSpinButton*) m_validatorWindow;

        if (m_pInt)
        if (m_pInt)

+       {
+           pControl->SetValue(*m_pInt) ;
+           return TRUE;
+       }
+    } else
+#endif
+#endif
+#if wxUSE_SLIDER
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxSlider)) )

     {
     {

-      pControl->SetValue(*m_pInt) ;
-      return TRUE;
-    }
-  }
+        wxSlider* pControl = (wxSlider*) m_validatorWindow;
+        if (m_pInt)
+        {
+           pControl->SetValue(*m_pInt) ;
+           return TRUE;
+       }
+    } else
+#endif
+

   // string controls
   // string controls

-  else if (m_validatorWindow->IsKindOf(CLASSINFO(wxButton)) )
-  {
-    wxButton* pControl = (wxButton*) m_validatorWindow;
+#if 1
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxButton)) )
+    {
+        wxButton* pControl = (wxButton*) m_validatorWindow;

        if (m_pString)
        if (m_pString)

+       {
+           pControl->SetLabel(*m_pString) ;
+           return TRUE;
+       }
+    } else
+#endif
+#if wxUSE_COMBOBOX
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox)) )

     {
     {

-      pControl->SetLabel(*m_pString) ;
-      return TRUE;
-    }
-  }
-  else if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox)) )
-  {
-    wxComboBox* pControl = (wxComboBox*) m_validatorWindow;
+        wxComboBox* pControl = (wxComboBox*) m_validatorWindow;

        if (m_pString)
        if (m_pString)

+       {
+           pControl->SetValue(*m_pString) ;
+           return TRUE;
+       }
+    } else
+#endif
+#if wxUSE_CHOICE
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxChoice)) )

     {
     {

-      pControl->SetValue(*m_pString) ;
-      return TRUE;
-    }
-  }
-  else if (m_validatorWindow->IsKindOf(CLASSINFO(wxChoice)) )
-  {
-    wxChoice* pControl = (wxChoice*) m_validatorWindow;
+        wxChoice* pControl = (wxChoice*) m_validatorWindow;

        if (m_pInt)
        if (m_pInt)

+       {
+           pControl->SetSelection(*m_pInt) ;
+           return TRUE;
+       }
+    } else
+#endif
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxStaticText)) )

     {
     {

-      pControl->SetSelection(*m_pInt) ;
-      return TRUE;
-    }
-  }
-  else if (m_validatorWindow->IsKindOf(CLASSINFO(wxStaticText)) )
-  {
-    wxStaticText* pControl = (wxStaticText*) m_validatorWindow;
+        wxStaticText* pControl = (wxStaticText*) m_validatorWindow;

        if (m_pString)
        if (m_pString)

+       {
+           pControl->SetLabel(*m_pString) ;
+           return TRUE;
+       }
+    } else 
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )

     {
     {

-      pControl->SetLabel(*m_pString) ;
-      return TRUE;
-    }
-  }
-  else if (m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )
-  {
-    wxTextCtrl* pControl = (wxTextCtrl*) m_validatorWindow;
+        wxTextCtrl* pControl = (wxTextCtrl*) m_validatorWindow;

        if (m_pString)
        if (m_pString)

-    {
-      pControl->SetValue(*m_pString) ;
-      return TRUE;
-    }
-  }
+       {
+           pControl->SetValue(*m_pString) ;
+           return TRUE;
+       }
+    } else
+#if wxUSE_CHECKLISTBOX
+#ifndef __WIN16__

   // array controls
   // NOTE: wxCheckListBox isa wxListBox, so wxCheckListBox
   // MUST come first:
   // array controls
   // NOTE: wxCheckListBox isa wxListBox, so wxCheckListBox
   // MUST come first:

-  else if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckListBox)) )
+  if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckListBox)) )

   {
     wxCheckListBox* pControl = (wxCheckListBox*) m_validatorWindow;
        if (m_pArrayInt)
   {
     wxCheckListBox* pControl = (wxCheckListBox*) m_validatorWindow;
        if (m_pArrayInt)


@@ -204,35 +259,41 @@ bool wxGenericValidator::TransferToWindow(void)
     }
        else
                return FALSE;
     }
        else
                return FALSE;

-  }
-  else if (m_validatorWindow->IsKindOf(CLASSINFO(wxListBox)) )
-  {
-    wxListBox* pControl = (wxListBox*) m_validatorWindow;
-       if (m_pArrayInt)
+  } else
+#endif
+#endif
+#if wxUSE_LISTBOX
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxListBox)) )

     {
     {

-      // clear all selections
-      int i;
-      for (i = 0 ; i < pControl->Number(); ++i)
-        pControl->Deselect(i);
-      // select each item in our array
-      unsigned u;
-      for (u = 0; u < m_pArrayInt->Count(); ++u)
-        pControl->SetSelection(m_pArrayInt->Item(u));
-      return TRUE;
-    }
-  }
+        wxListBox* pControl = (wxListBox*) m_validatorWindow;
+       if (m_pArrayInt)
+       {
+           // clear all selections
+           int i;
+           for (i = 0 ; i < pControl->Number(); ++i)
+               pControl->Deselect(i);
+           // select each item in our array
+           unsigned u;
+           for (u = 0; u < m_pArrayInt->Count(); ++u)
+               pControl->SetSelection(m_pArrayInt->Item(u));
+           return TRUE;
+       }
+    } else
+#endif

 
   // unrecognized control, or bad pointer
 
   // unrecognized control, or bad pointer

+    return FALSE;

   return FALSE;
 }
 
   return FALSE;
 }
 

-// Called to transfer data to the window
+// Called to transfer data from the window

 bool wxGenericValidator::TransferFromWindow(void)
 {
   if ( !m_validatorWindow )
     return FALSE;
 
   // bool controls
 bool wxGenericValidator::TransferFromWindow(void)
 {
   if ( !m_validatorWindow )
     return FALSE;
 
   // bool controls

+#if wxUSE_CHECKBOX

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


@@ -241,8 +302,10 @@ bool wxGenericValidator::TransferFromWindow(void)
       *m_pBool = pControl->GetValue() ;
       return TRUE;
     }
       *m_pBool = pControl->GetValue() ;
       return TRUE;
     }

-  }
-  else if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioButton)) )
+  } else
+#endif
+#if wxUSE_RADIOBTN
+  if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioButton)) )

   {
     wxRadioButton* pControl = (wxRadioButton*) m_validatorWindow;
        if (m_pBool)
   {
     wxRadioButton* pControl = (wxRadioButton*) m_validatorWindow;
        if (m_pBool)


@@ -250,9 +313,11 @@ bool wxGenericValidator::TransferFromWindow(void)
       *m_pBool = pControl->GetValue() ;
       return TRUE;
     }
       *m_pBool = pControl->GetValue() ;
       return TRUE;
     }

-  }
+  } else
+#endif

   // int controls
   // int controls

-  else if (m_validatorWindow->IsKindOf(CLASSINFO(wxGauge)) )
+#if wxUSE_GAUGE
+  if (m_validatorWindow->IsKindOf(CLASSINFO(wxGauge)) )

   {
     wxGauge* pControl = (wxGauge*) m_validatorWindow;
        if (m_pInt)
   {
     wxGauge* pControl = (wxGauge*) m_validatorWindow;
        if (m_pInt)


@@ -260,8 +325,10 @@ bool wxGenericValidator::TransferFromWindow(void)
       *m_pInt = pControl->GetValue() ;
       return TRUE;
     }
       *m_pInt = pControl->GetValue() ;
       return TRUE;
     }

-  }
-  else if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioBox)) )
+  } else
+#endif
+#if wxUSE_RADIOBOX
+  if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioBox)) )

   {
     wxRadioBox* pControl = (wxRadioBox*) m_validatorWindow;
        if (m_pInt)
   {
     wxRadioBox* pControl = (wxRadioBox*) m_validatorWindow;
        if (m_pInt)


@@ -269,8 +336,10 @@ bool wxGenericValidator::TransferFromWindow(void)
       *m_pInt = pControl->GetSelection() ;
       return TRUE;
     }
       *m_pInt = pControl->GetSelection() ;
       return TRUE;
     }

-  }
-  else if (m_validatorWindow->IsKindOf(CLASSINFO(wxScrollBar)) )
+  } else
+#endif
+#if wxUSE_SCROLLBAR
+  if (m_validatorWindow->IsKindOf(CLASSINFO(wxScrollBar)) )

   {
     wxScrollBar* pControl = (wxScrollBar*) m_validatorWindow;
        if (m_pInt)
   {
     wxScrollBar* pControl = (wxScrollBar*) m_validatorWindow;
        if (m_pInt)


@@ -278,8 +347,11 @@ bool wxGenericValidator::TransferFromWindow(void)
       *m_pInt = pControl->GetThumbPosition() ;
       return TRUE;
     }
       *m_pInt = pControl->GetThumbPosition() ;
       return TRUE;
     }

-  }
-  else if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinButton)) )
+  } else
+#endif
+#if wxUSE_SPINBTN
+#ifndef __WIN16__
+  if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinButton)) )

   {
     wxSpinButton* pControl = (wxSpinButton*) m_validatorWindow;
        if (m_pInt)
   {
     wxSpinButton* pControl = (wxSpinButton*) m_validatorWindow;
        if (m_pInt)


@@ -287,9 +359,22 @@ bool wxGenericValidator::TransferFromWindow(void)
       *m_pInt = pControl->GetValue() ;
       return TRUE;
     }
       *m_pInt = pControl->GetValue() ;
       return TRUE;
     }

-  }
+  } else
+#endif
+#endif
+#if wxUSE_SLIDER
+  if (m_validatorWindow->IsKindOf(CLASSINFO(wxSlider)) )
+  {
+    wxSlider* pControl = (wxSlider*) m_validatorWindow;
+    if (m_pInt)
+    {
+      pControl->SetValue(*m_pInt) ;
+      return TRUE;
+    }
+  } else
+#endif

   // string controls
   // string controls

-  else if (m_validatorWindow->IsKindOf(CLASSINFO(wxButton)) )
+  if (m_validatorWindow->IsKindOf(CLASSINFO(wxButton)) )

   {
     wxButton* pControl = (wxButton*) m_validatorWindow;
        if (m_pString)
   {
     wxButton* pControl = (wxButton*) m_validatorWindow;
        if (m_pString)


@@ -298,7 +383,9 @@ bool wxGenericValidator::TransferFromWindow(void)
       return TRUE;
     }
   }
       return TRUE;
     }
   }

-  else if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox)) )
+  else
+#if wxUSE_COMBOBOX
+  if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox)) )

   {
     wxComboBox* pControl = (wxComboBox*) m_validatorWindow;
        if (m_pString)
   {
     wxComboBox* pControl = (wxComboBox*) m_validatorWindow;
        if (m_pString)


@@ -306,8 +393,10 @@ bool wxGenericValidator::TransferFromWindow(void)
       *m_pString = pControl->GetValue() ;
       return TRUE;
     }
       *m_pString = pControl->GetValue() ;
       return TRUE;
     }

-  }
-  else if (m_validatorWindow->IsKindOf(CLASSINFO(wxChoice)) )
+  } else
+#endif
+#if wxUSE_CHOICE
+ if (m_validatorWindow->IsKindOf(CLASSINFO(wxChoice)) )

   {
     wxChoice* pControl = (wxChoice*) m_validatorWindow;
        if (m_pInt)
   {
     wxChoice* pControl = (wxChoice*) m_validatorWindow;
        if (m_pInt)


@@ -315,8 +404,9 @@ bool wxGenericValidator::TransferFromWindow(void)
       *m_pInt = pControl->GetSelection() ;
       return TRUE;
     }
       *m_pInt = pControl->GetSelection() ;
       return TRUE;
     }

-  }
-  else if (m_validatorWindow->IsKindOf(CLASSINFO(wxStaticText)) )
+  } else
+#endif
+  if (m_validatorWindow->IsKindOf(CLASSINFO(wxStaticText)) )

   {
     wxStaticText* pControl = (wxStaticText*) m_validatorWindow;
        if (m_pString)
   {
     wxStaticText* pControl = (wxStaticText*) m_validatorWindow;
        if (m_pString)


@@ -324,8 +414,8 @@ bool wxGenericValidator::TransferFromWindow(void)
       *m_pString = pControl->GetLabel() ;
       return TRUE;
     }
       *m_pString = pControl->GetLabel() ;
       return TRUE;
     }

-  }
-  else if (m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )
+  } else
+  if (m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )

   {
     wxTextCtrl* pControl = (wxTextCtrl*) m_validatorWindow;
        if (m_pString)
   {
     wxTextCtrl* pControl = (wxTextCtrl*) m_validatorWindow;
        if (m_pString)


@@ -333,11 +423,13 @@ bool wxGenericValidator::TransferFromWindow(void)
       *m_pString = pControl->GetValue() ;
       return TRUE;
     }
       *m_pString = pControl->GetValue() ;
       return TRUE;
     }

-  }
+  } else
+#if wxUSE_CHECKLISTBOX
+#ifndef __WIN16__

   // array controls
   // NOTE: wxCheckListBox isa wxListBox, so wxCheckListBox
   // MUST come first:
   // array controls
   // NOTE: wxCheckListBox isa wxListBox, so wxCheckListBox
   // MUST come first:

-  else if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckListBox)) )
+  if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckListBox)) )

   {
     wxCheckListBox* pControl = (wxCheckListBox*) m_validatorWindow;
        if (m_pArrayInt)
   {
     wxCheckListBox* pControl = (wxCheckListBox*) m_validatorWindow;
        if (m_pArrayInt)


@@ -353,8 +445,11 @@ bool wxGenericValidator::TransferFromWindow(void)
     }
        else
          return FALSE;
     }
        else
          return FALSE;

-  }
-  else if (m_validatorWindow->IsKindOf(CLASSINFO(wxListBox)) )
+  } else
+#endif
+#endif
+#if wxUSE_LISTBOX
+  if (m_validatorWindow->IsKindOf(CLASSINFO(wxListBox)) )

   {
     wxListBox* pControl = (wxListBox*) m_validatorWindow;
        if (m_pArrayInt)
   {
     wxListBox* pControl = (wxListBox*) m_validatorWindow;
        if (m_pArrayInt)


@@ -368,9 +463,11 @@ bool wxGenericValidator::TransferFromWindow(void)
           m_pArrayInt->Add(i);
       return TRUE;
     }
           m_pArrayInt->Add(i);
       return TRUE;
     }

-  }
+  } else
+#endif

 
   // unrecognized control, or bad pointer
 
   // unrecognized control, or bad pointer

+    return FALSE;

   return FALSE;
 }
 
   return FALSE;
 }
 


@@ -379,9 +476,12 @@ bool wxGenericValidator::TransferFromWindow(void)
 */
 void wxGenericValidator::Initialize()
 {
 */
 void wxGenericValidator::Initialize()
 {

-  m_pBool = 0;
-  m_pInt = 0;
-  m_pString = 0;
-  m_pArrayInt = 0;
+    m_pBool = 0;
+    m_pInt = 0;
+    m_pString = 0;
+    m_pArrayInt = 0;

 }
 
 }
 

+#endif
+  // wxUSE_VALIDATORS
+