Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Corrected some combobox-related code, changed ordering and added wxSpinCtrl

Browse Source 
support as per bug report


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7804 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-07-21 15:43:14 +00:00
parent ff11fd4c62
commit fad2710181
1 changed files with 39 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/common/valgen.cpp
View File

@@ -44,11 +44,14 @@
#include "wx/slider.h" #include "wx/slider.h"
#endif #endif
#ifndef __WIN16__ #if wxUSE_SPINCTRL && !defined(__WIN16__)
#include "wx/spinbutt.h" #include "wx/spinctrl.h"
#if wxUSE_CHECKLISTBOX
#include "wx/checklst.h"
#endif #endif
#if wxUSE_SPINBTN && !defined(__WIN16__)
#include "wx/spinbutt.h"
#endif
#if wxUSE_CHECKLISTBOX && !defined(__WIN16__)
#include "wx/checklst.h"
#endif #endif
#include "wx/valgen.h" #include "wx/valgen.h"
@@ -162,6 +165,17 @@ bool wxGenericValidator::TransferToWindow(void)
} }
} else } else
#endif #endif
#if wxUSE_SPINCTRL && !defined(__WIN16__)
if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinCtrl)) )
{
wxSpinCtrl* pControl = (wxSpinCtrl*) m_validatorWindow;
if (m_pInt)
{
pControl->SetValue(*m_pInt);
return TRUE;
}
} else
#endif
#if wxUSE_SPINBTN && !defined(__WIN16__) #if wxUSE_SPINBTN && !defined(__WIN16__)
if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinButton)) ) if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinButton)) )
{ {
@@ -195,10 +209,10 @@ bool wxGenericValidator::TransferToWindow(void)
return TRUE; return TRUE;
} }
} else } else
#if wxUSE_CHOICE #if wxUSE_COMBOBOX
if (m_validatorWindow->IsKindOf(CLASSINFO(wxChoice)) ) if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox)) )
{ {
wxChoice* pControl = (wxChoice*) m_validatorWindow; wxComboBox* pControl = (wxComboBox*) m_validatorWindow;
if (m_pInt) if (m_pInt)
{ {
pControl->SetSelection(*m_pInt) ; pControl->SetSelection(*m_pInt) ;
@@ -214,10 +228,10 @@ bool wxGenericValidator::TransferToWindow(void)
} }
} else } else
#endif #endif
#if wxUSE_COMBOBOX #if wxUSE_CHOICE
if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox)) ) if (m_validatorWindow->IsKindOf(CLASSINFO(wxChoice)) )
{ {
wxComboBox* pControl = (wxComboBox*) m_validatorWindow; wxChoice* pControl = (wxChoice*) m_validatorWindow;
if (m_pInt) if (m_pInt)
{ {
pControl->SetSelection(*m_pInt) ; pControl->SetSelection(*m_pInt) ;
@@ -368,8 +382,18 @@ bool wxGenericValidator::TransferFromWindow(void)
} }
} else } else
#endif #endif
#if wxUSE_SPINBTN #if wxUSE_SPINCTRL && !defined(__WIN16__)
#ifndef __WIN16__ if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinCtrl)) )
{
wxSpinCtrl* pControl = (wxSpinCtrl*) m_validatorWindow;
if (m_pInt)
{
*m_pInt=pControl->GetValue();
return TRUE;
}
} else
#endif
#if wxUSE_SPINBTN && !defined(__WIN16__)
if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinButton)) ) if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinButton)) )
{ {
wxSpinButton* pControl = (wxSpinButton*) m_validatorWindow; wxSpinButton* pControl = (wxSpinButton*) m_validatorWindow;
@@ -380,7 +404,6 @@ bool wxGenericValidator::TransferFromWindow(void)
} }
} else } else
#endif #endif
#endif
#if wxUSE_SLIDER #if wxUSE_SLIDER
if (m_validatorWindow->IsKindOf(CLASSINFO(wxSlider)) ) if (m_validatorWindow->IsKindOf(CLASSINFO(wxSlider)) )
{ {
@@ -407,9 +430,9 @@ bool wxGenericValidator::TransferFromWindow(void)
if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox)) ) if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox)) )
{ {
wxComboBox* pControl = (wxComboBox*) m_validatorWindow; wxComboBox* pControl = (wxComboBox*) m_validatorWindow;
if (m_pString) if (m_pInt)
{ {
*m_pString = pControl->GetValue() ; *m_pInt = pControl->GetSelection() ;
return TRUE; return TRUE;
} }
else if (m_pString) else if (m_pString)
@@ -435,20 +458,6 @@ bool wxGenericValidator::TransferFromWindow(void)
} }
} else } else
#endif #endif
if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox)) )
{
wxComboBox* pControl = (wxComboBox*) m_validatorWindow;
if (m_pInt)
{
*m_pInt = pControl->GetSelection() ;
return TRUE;
}
else if (m_pString)
{
*m_pString = pControl->GetStringSelection();
return TRUE;
}
} else
if (m_validatorWindow->IsKindOf(CLASSINFO(wxStaticText)) ) if (m_validatorWindow->IsKindOf(CLASSINFO(wxStaticText)) )
{ {
wxStaticText* pControl = (wxStaticText*) m_validatorWindow; wxStaticText* pControl = (wxStaticText*) m_validatorWindow;
@@ -521,6 +530,7 @@ 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 4:58 pm
*/ */
void wxGenericValidator::Initialize() void wxGenericValidator::Initialize()
{ {