wxUSE_STATTEXT fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -252,6 +252,7 @@ bool wxGenericValidator::TransferToWindow(void)
|
|||||||
}
|
}
|
||||||
} else
|
} else
|
||||||
#endif
|
#endif
|
||||||
|
#if wxUSE_STATTEXT
|
||||||
if (m_validatorWindow->IsKindOf(CLASSINFO(wxStaticText)) )
|
if (m_validatorWindow->IsKindOf(CLASSINFO(wxStaticText)) )
|
||||||
{
|
{
|
||||||
wxStaticText* pControl = (wxStaticText*) m_validatorWindow;
|
wxStaticText* pControl = (wxStaticText*) m_validatorWindow;
|
||||||
@@ -261,6 +262,7 @@ bool wxGenericValidator::TransferToWindow(void)
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
} else
|
} else
|
||||||
|
#endif
|
||||||
#if wxUSE_TEXTCTRL
|
#if wxUSE_TEXTCTRL
|
||||||
if (m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )
|
if (m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )
|
||||||
{
|
{
|
||||||
@@ -474,6 +476,7 @@ bool wxGenericValidator::TransferFromWindow(void)
|
|||||||
}
|
}
|
||||||
} else
|
} else
|
||||||
#endif
|
#endif
|
||||||
|
#if wxUSE_STATTEXT
|
||||||
if (m_validatorWindow->IsKindOf(CLASSINFO(wxStaticText)) )
|
if (m_validatorWindow->IsKindOf(CLASSINFO(wxStaticText)) )
|
||||||
{
|
{
|
||||||
wxStaticText* pControl = (wxStaticText*) m_validatorWindow;
|
wxStaticText* pControl = (wxStaticText*) m_validatorWindow;
|
||||||
@@ -483,6 +486,7 @@ bool wxGenericValidator::TransferFromWindow(void)
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
} else
|
} else
|
||||||
|
#endif
|
||||||
#if wxUSE_TEXTCTRL
|
#if wxUSE_TEXTCTRL
|
||||||
if (m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )
|
if (m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )
|
||||||
{
|
{
|
||||||
|
@@ -105,7 +105,7 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent,
|
|||||||
wxBeginBusyCursor();
|
wxBeginBusyCursor();
|
||||||
|
|
||||||
wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
|
wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
|
||||||
|
#if wxUSE_STATTEXT
|
||||||
// 1) text message
|
// 1) text message
|
||||||
topsizer->Add( CreateTextSizer( message ), 0, wxALL, 10 );
|
topsizer->Add( CreateTextSizer( message ), 0, wxALL, 10 );
|
||||||
|
|
||||||
@@ -114,6 +114,8 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent,
|
|||||||
// prompt if any
|
// prompt if any
|
||||||
if (!prompt.IsEmpty())
|
if (!prompt.IsEmpty())
|
||||||
inputsizer->Add( new wxStaticText( this, wxID_ANY, prompt ), 0, wxCENTER | wxLEFT, 10 );
|
inputsizer->Add( new wxStaticText( this, wxID_ANY, prompt ), 0, wxCENTER | wxLEFT, 10 );
|
||||||
|
#endif
|
||||||
|
|
||||||
// spin ctrl
|
// spin ctrl
|
||||||
wxString valStr;
|
wxString valStr;
|
||||||
valStr.Printf(wxT("%ld"), m_value);
|
valStr.Printf(wxT("%ld"), m_value);
|
||||||
@@ -121,9 +123,11 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent,
|
|||||||
#if wxUSE_SPINCTRL
|
#if wxUSE_SPINCTRL
|
||||||
m_spinctrl->SetRange((int)m_min, (int)m_max);
|
m_spinctrl->SetRange((int)m_min, (int)m_max);
|
||||||
#endif
|
#endif
|
||||||
|
#if wxUSE_STATTEXT
|
||||||
inputsizer->Add( m_spinctrl, 1, wxCENTER | wxLEFT | wxRIGHT, 10 );
|
inputsizer->Add( m_spinctrl, 1, wxCENTER | wxLEFT | wxRIGHT, 10 );
|
||||||
// add both
|
// add both
|
||||||
topsizer->Add( inputsizer, 1, wxEXPAND | wxLEFT|wxRIGHT, 5 );
|
topsizer->Add( inputsizer, 1, wxEXPAND | wxLEFT|wxRIGHT, 5 );
|
||||||
|
#endif
|
||||||
|
|
||||||
// smart phones does not support or do not waste space for wxButtons
|
// smart phones does not support or do not waste space for wxButtons
|
||||||
#ifdef __SMARTPHONE__
|
#ifdef __SMARTPHONE__
|
||||||
|
Reference in New Issue
Block a user