More wxUSE_STATTEXT fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/numdlgg.cpp b/src/generic/numdlgg.cpp
index 3fc475e4c5eb67f726795585107f01b6e3e457f2..2c6ffa665d68dcdbe088a3f45ca66ec6caf7c158 100644 (file)
--- a/src/generic/numdlgg.cpp
+++ b/src/generic/numdlgg.cpp
@@ -108,13 +108,16 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent,
 #if wxUSE_STATTEXT
     // 1) text message
     topsizer->Add( CreateTextSizer( message ), 0, wxALL, 10 );
 #if wxUSE_STATTEXT
     // 1) text message
     topsizer->Add( CreateTextSizer( message ), 0, wxALL, 10 );

+#endif        

 
     // 2) prompt and text ctrl
     wxBoxSizer *inputsizer = new wxBoxSizer( wxHORIZONTAL );
 
     // 2) prompt and text ctrl
     wxBoxSizer *inputsizer = new wxBoxSizer( wxHORIZONTAL );

+
+#if wxUSE_STATTEXT

     // prompt if any
     if (!prompt.IsEmpty())
         inputsizer->Add( new wxStaticText( this, wxID_ANY, prompt ), 0, wxCENTER | wxLEFT, 10 );
     // prompt if any
     if (!prompt.IsEmpty())
         inputsizer->Add( new wxStaticText( this, wxID_ANY, prompt ), 0, wxCENTER | wxLEFT, 10 );

-#endif        
+#endif

         
     // spin ctrl
     wxString valStr;
         
     // spin ctrl
     wxString valStr;


@@ -123,11 +126,9 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent,
 #if wxUSE_SPINCTRL
     m_spinctrl->SetRange((int)m_min, (int)m_max);
 #endif
 #if wxUSE_SPINCTRL
     m_spinctrl->SetRange((int)m_min, (int)m_max);
 #endif

-#if wxUSE_STATTEXT

     inputsizer->Add( m_spinctrl, 1, wxCENTER | wxLEFT | wxRIGHT, 10 );
     // add both
     topsizer->Add( inputsizer, 1, wxEXPAND | wxLEFT|wxRIGHT, 5 );
     inputsizer->Add( m_spinctrl, 1, wxCENTER | wxLEFT | wxRIGHT, 10 );
     // add both
     topsizer->Add( inputsizer, 1, wxEXPAND | wxLEFT|wxRIGHT, 5 );

-#endif

 
     // smart phones does not support or do not waste space for wxButtons
 #ifdef __SMARTPHONE__
 
     // smart phones does not support or do not waste space for wxButtons
 #ifdef __SMARTPHONE__

diff --git a/src/generic/textdlgg.cpp b/src/generic/textdlgg.cpp
index 70d8a220ff9c6d784d883214310e33eafd21bfd2..32dbecd26ef4d9bca35fd6d1238cc7945709ed36 100644 (file)
--- a/src/generic/textdlgg.cpp
+++ b/src/generic/textdlgg.cpp
@@ -97,8 +97,10 @@ wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent,
 
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
 
 
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
 

+#if wxUSE_STATTEXT

     // 1) text message
     topsizer->Add( CreateTextSizer( message ), 0, wxALL, wxLARGESMALL(10,0) );
     // 1) text message
     topsizer->Add( CreateTextSizer( message ), 0, wxALL, wxLARGESMALL(10,0) );

+#endif        

 
     // 2) text ctrl
     m_textctrl = new wxTextCtrl(this, wxID_TEXT, value,
 
     // 2) text ctrl
     m_textctrl = new wxTextCtrl(this, wxID_TEXT, value,