merged in the commit from the 2.2 branch

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

diff --git a/src/common/valgen.cpp b/src/common/valgen.cpp
index 2157d57e64888216c5cdb84f94d2e96b2985473e..5f687dd7ea5d57ca24b069314bbad412a3ba31ef 100644 (file)
--- a/src/common/valgen.cpp
+++ b/src/common/valgen.cpp
@@ -6,7 +6,7 @@
 // Created:     Jan 22 1999
 // RCS-ID:
 // Copyright:   (c) 1999 Kevin Smith
 // Created:     Jan 22 1999
 // RCS-ID:
 // Copyright:   (c) 1999 Kevin Smith

-// Licence:    wxWindows licence
+// Licence:           wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -113,21 +113,21 @@ bool wxGenericValidator::TransferToWindow(void)
     {
         wxCheckBox* pControl = (wxCheckBox*) m_validatorWindow;
         if (m_pBool)
     {
         wxCheckBox* pControl = (wxCheckBox*) m_validatorWindow;
         if (m_pBool)

-       {
-           pControl->SetValue(*m_pBool);
-           return TRUE;
-       }
+        {
+            pControl->SetValue(*m_pBool);
+            return TRUE;
+        }

     } else
 #endif
 #if wxUSE_RADIOBTN
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioButton)) )
     {
         wxRadioButton* pControl = (wxRadioButton*) m_validatorWindow;
     } else
 #endif
 #if wxUSE_RADIOBTN
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioButton)) )
     {
         wxRadioButton* pControl = (wxRadioButton*) m_validatorWindow;

-       if (m_pBool)
-       {
-           pControl->SetValue(*m_pBool) ;
-           return TRUE;
-       }
+        if (m_pBool)
+        {
+            pControl->SetValue(*m_pBool) ;
+            return TRUE;
+        }

     } else
 #endif
 
     } else
 #endif
 


@@ -136,36 +136,36 @@ bool wxGenericValidator::TransferToWindow(void)
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxGauge)) )
     {
         wxGauge* pControl = (wxGauge*) m_validatorWindow;
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxGauge)) )
     {
         wxGauge* pControl = (wxGauge*) m_validatorWindow;

-       if (m_pInt)
-       {
-           pControl->SetValue(*m_pInt);
-           return TRUE;
-       }
+        if (m_pInt)
+        {
+            pControl->SetValue(*m_pInt);
+            return TRUE;
+        }

     } else
 #endif
 #if wxUSE_RADIOBOX
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioBox)) )
     {
         wxRadioBox* pControl = (wxRadioBox*) m_validatorWindow;
     } else
 #endif
 #if wxUSE_RADIOBOX
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioBox)) )
     {
         wxRadioBox* pControl = (wxRadioBox*) m_validatorWindow;

-       if (m_pInt)
-       {
-           pControl->SetSelection(*m_pInt) ;
-           return TRUE;
-       }
+        if (m_pInt)
+        {
+            pControl->SetSelection(*m_pInt) ;
+            return TRUE;
+        }

     } else
 #endif
 #if wxUSE_SCROLLBAR
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxScrollBar)) )
     {
         wxScrollBar* pControl = (wxScrollBar*) m_validatorWindow;
     } else
 #endif
 #if wxUSE_SCROLLBAR
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxScrollBar)) )
     {
         wxScrollBar* pControl = (wxScrollBar*) m_validatorWindow;

-       if (m_pInt)
-       {
-           pControl->SetThumbPosition(*m_pInt) ;
-           return TRUE;
-       }
+        if (m_pInt)
+        {
+            pControl->SetThumbPosition(*m_pInt) ;
+            return TRUE;
+        }

     } else
 #endif
     } else
 #endif

-#if wxUSE_SPINCTRL && !defined(__WIN16__)
+#if wxUSE_SPINCTRL && !defined(__WIN16__) && !defined(__WXMOTIF__)

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


@@ -180,11 +180,11 @@ bool wxGenericValidator::TransferToWindow(void)
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinButton)) )
     {
         wxSpinButton* pControl = (wxSpinButton*) m_validatorWindow;
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinButton)) )
     {
         wxSpinButton* pControl = (wxSpinButton*) m_validatorWindow;

-       if (m_pInt)
-       {
-           pControl->SetValue(*m_pInt) ;
-           return TRUE;
-       }
+        if (m_pInt)
+        {
+            pControl->SetValue(*m_pInt) ;
+            return TRUE;
+        }

     } else
 #endif
 #if wxUSE_SLIDER
     } else
 #endif
 #if wxUSE_SLIDER


@@ -193,21 +193,21 @@ bool wxGenericValidator::TransferToWindow(void)
         wxSlider* pControl = (wxSlider*) m_validatorWindow;
         if (m_pInt)
         {
         wxSlider* pControl = (wxSlider*) m_validatorWindow;
         if (m_pInt)
         {

-           pControl->SetValue(*m_pInt) ;
-           return TRUE;
-       }
+            pControl->SetValue(*m_pInt) ;
+            return TRUE;
+        }

     } else
 #endif
 
     } else
 #endif
 

-  // string controls
+    // string controls

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

-       if (m_pString)
-       {
-           pControl->SetLabel(*m_pString) ;
-           return TRUE;
-       }
+        if (m_pString)
+        {
+            pControl->SetLabel(*m_pString) ;
+            return TRUE;
+        }

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


@@ -255,7 +255,7 @@ bool wxGenericValidator::TransferToWindow(void)
             pControl->SetLabel(*m_pString) ;
             return TRUE;
         }
             pControl->SetLabel(*m_pString) ;
             return TRUE;
         }

-    } else 
+    } else

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


@@ -272,15 +272,14 @@ bool wxGenericValidator::TransferToWindow(void)
             return TRUE;
         }
     } else
             return TRUE;
         }
     } else

-#if wxUSE_CHECKLISTBOX
-#ifndef __WIN16__
+#if wxUSE_CHECKLISTBOX && !defined(__WIN16__)

   // array controls
   // NOTE: wxCheckListBox isa wxListBox, so wxCheckListBox
   // MUST come first:
   if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckListBox)) )
   {
     wxCheckListBox* pControl = (wxCheckListBox*) m_validatorWindow;
   // array controls
   // NOTE: wxCheckListBox isa wxListBox, so wxCheckListBox
   // MUST come first:
   if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckListBox)) )
   {
     wxCheckListBox* pControl = (wxCheckListBox*) m_validatorWindow;

-       if (m_pArrayInt)
+        if (m_pArrayInt)

     {
       // clear all selections
       int i;
     {
       // clear all selections
       int i;


@@ -292,32 +291,31 @@ bool wxGenericValidator::TransferToWindow(void)
         pControl->Check(m_pArrayInt->Item(u));
       return TRUE;
     }
         pControl->Check(m_pArrayInt->Item(u));
       return TRUE;
     }

-       else
-               return FALSE;
+        else
+                return FALSE;

   } else
 #endif
   } else
 #endif

-#endif

 #if wxUSE_LISTBOX
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxListBox)) )
     {
         wxListBox* pControl = (wxListBox*) m_validatorWindow;
 #if wxUSE_LISTBOX
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxListBox)) )
     {
         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;
-       }
+        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
     } else
 #endif

+        ;   // to match the last 'else' above

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

-    return FALSE;

   return FALSE;
 }
 
   return FALSE;
 }
 


@@ -332,7 +330,7 @@ bool wxGenericValidator::TransferFromWindow(void)
   if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckBox)) )
   {
     wxCheckBox* pControl = (wxCheckBox*) m_validatorWindow;
   if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckBox)) )
   {
     wxCheckBox* pControl = (wxCheckBox*) m_validatorWindow;

-       if (m_pBool)
+        if (m_pBool)

     {
       *m_pBool = pControl->GetValue() ;
       return TRUE;
     {
       *m_pBool = pControl->GetValue() ;
       return TRUE;


@@ -343,7 +341,7 @@ bool wxGenericValidator::TransferFromWindow(void)
   if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioButton)) )
   {
     wxRadioButton* pControl = (wxRadioButton*) m_validatorWindow;
   if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioButton)) )
   {
     wxRadioButton* pControl = (wxRadioButton*) m_validatorWindow;

-       if (m_pBool)
+        if (m_pBool)

     {
       *m_pBool = pControl->GetValue() ;
       return TRUE;
     {
       *m_pBool = pControl->GetValue() ;
       return TRUE;


@@ -355,7 +353,7 @@ bool wxGenericValidator::TransferFromWindow(void)
   if (m_validatorWindow->IsKindOf(CLASSINFO(wxGauge)) )
   {
     wxGauge* pControl = (wxGauge*) m_validatorWindow;
   if (m_validatorWindow->IsKindOf(CLASSINFO(wxGauge)) )
   {
     wxGauge* pControl = (wxGauge*) m_validatorWindow;

-       if (m_pInt)
+        if (m_pInt)

     {
       *m_pInt = pControl->GetValue() ;
       return TRUE;
     {
       *m_pInt = pControl->GetValue() ;
       return TRUE;


@@ -366,7 +364,7 @@ bool wxGenericValidator::TransferFromWindow(void)
   if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioBox)) )
   {
     wxRadioBox* pControl = (wxRadioBox*) m_validatorWindow;
   if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioBox)) )
   {
     wxRadioBox* pControl = (wxRadioBox*) m_validatorWindow;

-       if (m_pInt)
+        if (m_pInt)

     {
       *m_pInt = pControl->GetSelection() ;
       return TRUE;
     {
       *m_pInt = pControl->GetSelection() ;
       return TRUE;


@@ -377,14 +375,14 @@ bool wxGenericValidator::TransferFromWindow(void)
   if (m_validatorWindow->IsKindOf(CLASSINFO(wxScrollBar)) )
   {
     wxScrollBar* pControl = (wxScrollBar*) m_validatorWindow;
   if (m_validatorWindow->IsKindOf(CLASSINFO(wxScrollBar)) )
   {
     wxScrollBar* pControl = (wxScrollBar*) m_validatorWindow;

-       if (m_pInt)
+        if (m_pInt)

     {
       *m_pInt = pControl->GetThumbPosition() ;
       return TRUE;
     }
   } else
 #endif
     {
       *m_pInt = pControl->GetThumbPosition() ;
       return TRUE;
     }
   } else
 #endif

-#if wxUSE_SPINCTRL && !defined(__WIN16__)
+#if wxUSE_SPINCTRL && !defined(__WIN16__) && !defined(__WXMOTIF__)

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


@@ -399,7 +397,7 @@ bool wxGenericValidator::TransferFromWindow(void)
   if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinButton)) )
   {
     wxSpinButton* pControl = (wxSpinButton*) m_validatorWindow;
   if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinButton)) )
   {
     wxSpinButton* pControl = (wxSpinButton*) m_validatorWindow;

-       if (m_pInt)
+        if (m_pInt)

     {
       *m_pInt = pControl->GetValue() ;
       return TRUE;
     {
       *m_pInt = pControl->GetValue() ;
       return TRUE;


@@ -421,7 +419,7 @@ bool wxGenericValidator::TransferFromWindow(void)
   if (m_validatorWindow->IsKindOf(CLASSINFO(wxButton)) )
   {
     wxButton* pControl = (wxButton*) m_validatorWindow;
   if (m_validatorWindow->IsKindOf(CLASSINFO(wxButton)) )
   {
     wxButton* pControl = (wxButton*) m_validatorWindow;

-       if (m_pString)
+        if (m_pString)

     {
       *m_pString = pControl->GetLabel() ;
       return TRUE;
     {
       *m_pString = pControl->GetLabel() ;
       return TRUE;


@@ -432,9 +430,9 @@ bool wxGenericValidator::TransferFromWindow(void)
   if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox)) )
   {
     wxComboBox* pControl = (wxComboBox*) m_validatorWindow;
   if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox)) )
   {
     wxComboBox* pControl = (wxComboBox*) m_validatorWindow;

-       if (m_pString)
+    if (m_pInt)

     {
     {

-      *m_pString = pControl->GetValue() ;
+      *m_pInt = pControl->GetSelection() ;

       return TRUE;
     }
     else if (m_pString)
       return TRUE;
     }
     else if (m_pString)


@@ -448,7 +446,7 @@ bool wxGenericValidator::TransferFromWindow(void)
  if (m_validatorWindow->IsKindOf(CLASSINFO(wxChoice)) )
   {
     wxChoice* pControl = (wxChoice*) m_validatorWindow;
  if (m_validatorWindow->IsKindOf(CLASSINFO(wxChoice)) )
   {
     wxChoice* pControl = (wxChoice*) m_validatorWindow;

-       if (m_pInt)
+        if (m_pInt)

     {
       *m_pInt = pControl->GetSelection() ;
       return TRUE;
     {
       *m_pInt = pControl->GetSelection() ;
       return TRUE;


@@ -463,7 +461,7 @@ bool wxGenericValidator::TransferFromWindow(void)
   if (m_validatorWindow->IsKindOf(CLASSINFO(wxStaticText)) )
   {
     wxStaticText* pControl = (wxStaticText*) m_validatorWindow;
   if (m_validatorWindow->IsKindOf(CLASSINFO(wxStaticText)) )
   {
     wxStaticText* pControl = (wxStaticText*) m_validatorWindow;

-       if (m_pString)
+        if (m_pString)

     {
       *m_pString = pControl->GetLabel() ;
       return TRUE;
     {
       *m_pString = pControl->GetLabel() ;
       return TRUE;


@@ -472,7 +470,7 @@ bool wxGenericValidator::TransferFromWindow(void)
   if (m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )
   {
     wxTextCtrl* pControl = (wxTextCtrl*) m_validatorWindow;
   if (m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )
   {
     wxTextCtrl* pControl = (wxTextCtrl*) m_validatorWindow;

-       if (m_pString)
+        if (m_pString)

     {
       *m_pString = pControl->GetValue() ;
       return TRUE;
     {
       *m_pString = pControl->GetValue() ;
       return TRUE;


@@ -491,7 +489,7 @@ bool wxGenericValidator::TransferFromWindow(void)
   if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckListBox)) )
   {
     wxCheckListBox* pControl = (wxCheckListBox*) m_validatorWindow;
   if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckListBox)) )
   {
     wxCheckListBox* pControl = (wxCheckListBox*) m_validatorWindow;

-       if (m_pArrayInt)
+        if (m_pArrayInt)

     {
       // clear our array
       m_pArrayInt->Clear();
     {
       // clear our array
       m_pArrayInt->Clear();


@@ -502,8 +500,8 @@ bool wxGenericValidator::TransferFromWindow(void)
           m_pArrayInt->Add(i);
       return TRUE;
     }
           m_pArrayInt->Add(i);
       return TRUE;
     }

-       else
-         return FALSE;
+        else
+          return FALSE;

   } else
 #endif
 #endif
   } else
 #endif
 #endif


@@ -511,7 +509,7 @@ bool wxGenericValidator::TransferFromWindow(void)
   if (m_validatorWindow->IsKindOf(CLASSINFO(wxListBox)) )
   {
     wxListBox* pControl = (wxListBox*) m_validatorWindow;
   if (m_validatorWindow->IsKindOf(CLASSINFO(wxListBox)) )
   {
     wxListBox* pControl = (wxListBox*) m_validatorWindow;

-       if (m_pArrayInt)
+    if (m_pArrayInt)

     {
       // clear our array
       m_pArrayInt->Clear();
     {
       // clear our array
       m_pArrayInt->Clear();


@@ -532,7 +530,6 @@ bool wxGenericValidator::TransferFromWindow(void)
 
 /*
   Called by constructors to initialize ALL data members
 
 /*
   Called by constructors to initialize ALL data members

-       Last change:  JAC  21 Jul 100    5:00 pm

 */
 void wxGenericValidator::Initialize()
 {
 */
 void wxGenericValidator::Initialize()
 {