fix for using wxDataObjectComposite with the clipboard

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

diff --git a/src/common/valgen.cpp b/src/common/valgen.cpp
index 2c43f606481366d2445625cfb929ea022f3b7f2b..ee65e02c47fd54022d5b4d4ddaa30c5ce3c1ea16 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,33 +136,33 @@ 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
 #if wxUSE_SPINCTRL && !defined(__WIN16__) && !defined(__WXMOTIF__)
     } else
 #endif
 #if wxUSE_SPINCTRL && !defined(__WIN16__) && !defined(__WXMOTIF__)


@@ -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,52 +272,55 @@ bool wxGenericValidator::TransferToWindow(void)
             return TRUE;
         }
     } else
             return TRUE;
         }
     } else

-#if wxUSE_CHECKLISTBOX
-#ifndef __WIN16__
-  // 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)
-    {
-      // clear all selections
-      int i;
-      for (i = 0 ; i < pControl->Number(); ++i)
-        pControl->Check(i, FALSE);
-      // select each item in our array
-      unsigned u;
-      for (u = 0; u < m_pArrayInt->Count(); ++u)
-        pControl->Check(m_pArrayInt->Item(u));
-      return TRUE;
-    }
-       else
-               return FALSE;
-  } else
-#endif
+    // array controls
+#if wxUSE_CHECKLISTBOX && !defined(__WIN16__)
+    // NOTE: wxCheckListBox is a wxListBox, so wxCheckListBox MUST come first:
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckListBox)) )
+    {
+        wxCheckListBox* pControl = (wxCheckListBox*) m_validatorWindow;
+        if (m_pArrayInt)
+        {
+            // clear all selections
+            size_t i,
+                   count = pControl->GetCount();
+            for ( i = 0 ; i < count; i++ )
+                pControl->Check(i, FALSE);
+
+            // select each item in our array
+            count = m_pArrayInt->GetCount();
+            for ( i = 0 ; i < count; i++ )
+                pControl->Check(m_pArrayInt->Item(i));
+
+            return TRUE;
+        }
+        else
+            return FALSE;
+    } else

 #endif
 #if wxUSE_LISTBOX
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxListBox)) )
     {
         wxListBox* pControl = (wxListBox*) m_validatorWindow;
 #endif
 #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
+            size_t i,
+                   count = pControl->GetCount();
+            for ( i = 0 ; i < count; i++ )
+                pControl->Deselect(i);
+
+            // select each item in our array
+            count = m_pArrayInt->GetCount();
+            for ( i = 0 ; i < count; i++ )
+                pControl->SetSelection(m_pArrayInt->Item(i));
+
+            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 +335,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 +346,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 +358,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 +369,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,7 +380,7 @@ 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;
     {
       *m_pInt = pControl->GetThumbPosition() ;
       return TRUE;


@@ -399,7 +402,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;


@@ -412,7 +415,7 @@ bool wxGenericValidator::TransferFromWindow(void)
     wxSlider* pControl = (wxSlider*) m_validatorWindow;
     if (m_pInt)
     {
     wxSlider* pControl = (wxSlider*) m_validatorWindow;
     if (m_pInt)
     {

-      pControl->SetValue(*m_pInt) ;
+      *m_pInt = pControl->GetValue() ;

       return TRUE;
     }
   } else
       return TRUE;
     }
   } else


@@ -421,7 +424,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 +435,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 +451,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 +466,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 +475,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;


@@ -483,27 +486,31 @@ bool wxGenericValidator::TransferFromWindow(void)
         return TRUE;
     }
   } else
         return TRUE;
     }
   } else

+  // array controls

 #if wxUSE_CHECKLISTBOX
 #ifndef __WIN16__
 #if wxUSE_CHECKLISTBOX
 #ifndef __WIN16__

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

   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();

+

       // add each selected item to our array
       // add each selected item to our array

-      int i;
-      for (i = 0 ; i < pControl->Number(); ++i)
+      size_t i,
+             count = pControl->GetCount();
+      for ( i = 0; i < count; i++ )
+      {

         if (pControl->IsChecked(i))
           m_pArrayInt->Add(i);
         if (pControl->IsChecked(i))
           m_pArrayInt->Add(i);

+      }
+

       return TRUE;
     }
       return TRUE;
     }

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

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


@@ -511,15 +518,20 @@ 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();

+

       // add each selected item to our array
       // add each selected item to our array

-      int i;
-      for (i = 0 ; i < pControl->Number(); ++i)
+      size_t i,
+             count = pControl->GetCount();
+      for ( i = 0; i < count; i++ )
+      {

         if (pControl->Selected(i))
           m_pArrayInt->Add(i);
         if (pControl->Selected(i))
           m_pArrayInt->Add(i);

+      }
+

       return TRUE;
     }
   } else
       return TRUE;
     }
   } else


@@ -532,7 +544,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()
 {