fixes for page positioning for notebooks with wxNB_MULTILINE style (closes bugs 70909...

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

diff --git a/src/common/valgen.cpp b/src/common/valgen.cpp
index b4814ac7b05b1db33ea568245adb057f771ae0e6..4cf521922f37eb460e50adff15dbf31403eca3b1 100644 (file)
--- a/src/common/valgen.cpp
+++ b/src/common/valgen.cpp
@@ -9,7 +9,7 @@
 // Licence:           wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:           wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "valgen.h"
 #endif
 
 #pragma implementation "valgen.h"
 #endif
 


@@ -44,13 +44,13 @@
   #include "wx/slider.h"
 #endif
 
   #include "wx/slider.h"
 #endif
 

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

   #include "wx/spinctrl.h"
   #include "wx/spinctrl.h"

-#endif
-#if wxUSE_SPINBTN && !defined(__WIN16__)
+
+#if wxUSE_SPINBTN 

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

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

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


@@ -203,6 +203,7 @@ bool wxGenericValidator::TransferToWindow(void)
 #endif
 
     // string controls
 #endif
 
     // string controls

+#if wxUSE_BUTTON

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


@@ -212,6 +213,7 @@ bool wxGenericValidator::TransferToWindow(void)
             return TRUE;
         }
     } else
             return TRUE;
         }
     } else

+#endif

 #if wxUSE_COMBOBOX
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox)) )
     {
 #if wxUSE_COMBOBOX
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox)) )
     {


@@ -263,6 +265,7 @@ bool wxGenericValidator::TransferToWindow(void)
             return TRUE;
         }
     } else
             return TRUE;
         }
     } else

+#if wxUSE_TEXTCTRL

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


@@ -279,6 +282,7 @@ bool wxGenericValidator::TransferToWindow(void)
             return TRUE;
         }
     } else
             return TRUE;
         }
     } else

+#endif

     // array controls
 #if wxUSE_CHECKLISTBOX && !defined(__WIN16__)
     // NOTE: wxCheckListBox is a wxListBox, so wxCheckListBox MUST come first:
     // array controls
 #if wxUSE_CHECKLISTBOX && !defined(__WIN16__)
     // NOTE: wxCheckListBox is a wxListBox, so wxCheckListBox MUST come first:


@@ -428,6 +432,7 @@ bool wxGenericValidator::TransferFromWindow(void)
   } else
 #endif
   // string controls
   } else
 #endif
   // string controls

+#if wxUSE_BUTTON

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


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

-  }
-  else
+  } else
+#endif

 #if wxUSE_COMBOBOX
   if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox)) )
   {
 #if wxUSE_COMBOBOX
   if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox)) )
   {


@@ -479,6 +484,7 @@ bool wxGenericValidator::TransferFromWindow(void)
       return TRUE;
     }
   } else
       return TRUE;
     }
   } else

+#if wxUSE_TEXTCTRL

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


@@ -493,6 +499,7 @@ bool wxGenericValidator::TransferFromWindow(void)
         return TRUE;
     }
   } else
         return TRUE;
     }
   } else

+#endif

   // array controls
 #if wxUSE_CHECKLISTBOX
 #ifndef __WIN16__
   // array controls
 #if wxUSE_CHECKLISTBOX
 #ifndef __WIN16__