wxUSE_STATTEXT fixes

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

diff --git a/src/common/valgen.cpp b/src/common/valgen.cpp
index 7119e95c4a864bb8c7b215639d6c5caeb4cc1d70..e9aaf19e38386f7a6057edb67a8c58d319e26cee 100644 (file)
--- a/src/common/valgen.cpp
+++ b/src/common/valgen.cpp
@@ -252,6 +252,7 @@ bool wxGenericValidator::TransferToWindow(void)
         }
     } else
 #endif
         }
     } else
 #endif

+#if wxUSE_STATTEXT

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


@@ -261,6 +262,7 @@ bool wxGenericValidator::TransferToWindow(void)
             return true;
         }
     } else
             return true;
         }
     } else

+#endif

 #if wxUSE_TEXTCTRL
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )
     {
 #if wxUSE_TEXTCTRL
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )
     {


@@ -474,6 +476,7 @@ bool wxGenericValidator::TransferFromWindow(void)
     }
   } else
 #endif
     }
   } else
 #endif

+#if wxUSE_STATTEXT

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


@@ -483,6 +486,7 @@ bool wxGenericValidator::TransferFromWindow(void)
       return true;
     }
   } else
       return true;
     }
   } else

+#endif

 #if wxUSE_TEXTCTRL
   if (m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )
   {
 #if wxUSE_TEXTCTRL
   if (m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )
   {

diff --git a/src/generic/numdlgg.cpp b/src/generic/numdlgg.cpp
index 0fb413c1ad14c53a8bddb2c3d018452f3fba4cc9..3fc475e4c5eb67f726795585107f01b6e3e457f2 100644 (file)
--- a/src/generic/numdlgg.cpp
+++ b/src/generic/numdlgg.cpp
@@ -105,7 +105,7 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent,
     wxBeginBusyCursor();
 
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
     wxBeginBusyCursor();
 
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );

-
+#if wxUSE_STATTEXT

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


@@ -114,6 +114,8 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent,
     // 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        
+        

     // spin ctrl
     wxString valStr;
     valStr.Printf(wxT("%ld"), m_value);
     // spin ctrl
     wxString valStr;
     valStr.Printf(wxT("%ld"), m_value);


@@ -121,9 +123,11 @@ 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__