Better place for coordinate mirroring and removal

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

diff --git a/src/common/valgen.cpp b/src/common/valgen.cpp
index f1b5a10e455f06a5e2db842df21be9ba3d6e44cd..4b05f6d4f29d1ea31c7dd7f1e0dd94122ea8a651 100644 (file)
--- a/src/common/valgen.cpp
+++ b/src/common/valgen.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        valgen.cpp
+// Name:        src/common/valgen.cpp

 // Purpose:     wxGenericValidator class
 // Author:      Kevin Smith
 // Modified by:
 // Purpose:     wxGenericValidator class
 // Author:      Kevin Smith
 // Modified by:


@@ -9,49 +9,41 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "valgen.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-  #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-  #include "wx/defs.h"
+    #pragma hdrstop

 #endif
 
 #if wxUSE_VALIDATORS
 
 #ifndef WX_PRECOMP
 #endif
 
 #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
-
-
-  #include "wx/spinctrl.h"
+    #include "wx/dynarray.h"
+    #include "wx/utils.h"
+    #include "wx/intl.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"
+    #include "wx/checklst.h"
+#endif
+
+#include "wx/spinctrl.h"

 
 #if wxUSE_SPINBTN
 
 #if wxUSE_SPINBTN

-  #include "wx/spinbutt.h"
+    #include "wx/spinbutt.h"

 #endif
 #endif

-#if wxUSE_CHECKLISTBOX
-  #include "wx/checklst.h"
+#if wxUSE_TOGGLEBTN
+    #include "wx/tglbtn.h"

 #endif
 
 #include "wx/valgen.h"
 #endif
 
 #include "wx/valgen.h"


@@ -129,6 +121,17 @@ bool wxGenericValidator::TransferToWindow(void)
         }
     } else
 #endif
         }
     } else
 #endif

+#if wxUSE_TOGGLEBTN
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxToggleButton)) )
+    {
+        wxToggleButton * pControl = (wxToggleButton *) m_validatorWindow;
+        if (m_pBool)
+        {
+            pControl->SetValue(*m_pBool);
+            return true;
+        }
+    } else
+#endif

 
     // int controls
 #if wxUSE_GAUGE
 
     // int controls
 #if wxUSE_GAUGE


@@ -281,6 +284,7 @@ bool wxGenericValidator::TransferToWindow(void)
         }
     } else
 #endif
         }
     } else
 #endif

+

     // array controls
 #if wxUSE_CHECKLISTBOX
     // NOTE: wxCheckListBox is a wxListBox, so wxCheckListBox MUST come first:
     // array controls
 #if wxUSE_CHECKLISTBOX
     // NOTE: wxCheckListBox is a wxListBox, so wxCheckListBox MUST come first:


@@ -362,6 +366,17 @@ bool wxGenericValidator::TransferFromWindow(void)
         }
     } else
 #endif
         }
     } else
 #endif

+#if wxUSE_TOGGLEBTN
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxToggleButton)) )
+    {
+        wxToggleButton *pControl = (wxToggleButton *) m_validatorWindow;
+        if (m_pBool)
+        {
+            *m_pBool = pControl->GetValue() ;
+            return true;
+        }
+    } else
+#endif

 
     // INT CONTROLS ***************************************
 #if wxUSE_GAUGE
 
     // INT CONTROLS ***************************************
 #if wxUSE_GAUGE


@@ -546,7 +561,7 @@ bool wxGenericValidator::TransferFromWindow(void)
                    count = pControl->GetCount();
             for ( i = 0; i < count; i++ )
             {
                    count = pControl->GetCount();
             for ( i = 0; i < count; i++ )
             {

-                if (pControl->Selected(i))
+                if (pControl->IsSelected(i))

                     m_pArrayInt->Add(i);
             }
 
                     m_pArrayInt->Add(i);
             }
 


@@ -574,4 +589,3 @@ void wxGenericValidator::Initialize()
 
 #endif
   // wxUSE_VALIDATORS
 
 #endif
   // wxUSE_VALIDATORS

-