Use wxMBConvUTF8 when G_FILENAME_ENCODING is UTF-8, and set

[wxWidgets.git] / src / generic / textdlgg.cpp

diff --git a/src/generic/textdlgg.cpp b/src/generic/textdlgg.cpp
index b89b9d5de3c1e61b2cd2819f4f351edcc4e17c26..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 );
 
+#if wxUSE_STATTEXT
     // 1) text message
     topsizer->Add( CreateTextSizer( message ), 0, wxALL, wxLARGESMALL(10,0) );
+#endif        
 
     // 2) text ctrl
     m_textctrl = new wxTextCtrl(this, wxID_TEXT, value,
@@ -125,7 +127,7 @@ wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent,
 #endif
 
     // 4) buttons
-    topsizer->Add( CreateButtonSizer( style ), 0, wxCENTRE | wxALL, 10 );
+    topsizer->Add( CreateButtonSizer( style ), 0, wxEXPAND | wxALL, 10 );
 
 #endif // !__SMARTPHONE__