More wxUSE_STATTEXT fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -108,9 +108,12 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent,
|
|||||||
#if wxUSE_STATTEXT
|
#if wxUSE_STATTEXT
|
||||||
// 1) text message
|
// 1) text message
|
||||||
topsizer->Add( CreateTextSizer( message ), 0, wxALL, 10 );
|
topsizer->Add( CreateTextSizer( message ), 0, wxALL, 10 );
|
||||||
|
#endif
|
||||||
|
|
||||||
// 2) prompt and text ctrl
|
// 2) prompt and text ctrl
|
||||||
wxBoxSizer *inputsizer = new wxBoxSizer( wxHORIZONTAL );
|
wxBoxSizer *inputsizer = new wxBoxSizer( wxHORIZONTAL );
|
||||||
|
|
||||||
|
#if wxUSE_STATTEXT
|
||||||
// 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 );
|
||||||
@@ -123,11 +126,9 @@ 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__
|
||||||
|
@@ -97,8 +97,10 @@ wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent,
|
|||||||
|
|
||||||
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, wxLARGESMALL(10,0) );
|
topsizer->Add( CreateTextSizer( message ), 0, wxALL, wxLARGESMALL(10,0) );
|
||||||
|
#endif
|
||||||
|
|
||||||
// 2) text ctrl
|
// 2) text ctrl
|
||||||
m_textctrl = new wxTextCtrl(this, wxID_TEXT, value,
|
m_textctrl = new wxTextCtrl(this, wxID_TEXT, value,
|
||||||
|
Reference in New Issue
Block a user