Make wxFileDialog even smaller under X11.

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

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index 709107cbf6bdf2fadcd71b9c5f96edd91be5ecf5..3b81bef0dc2d1f198e5210368c7cb847de9d1dc2 100644 (file)
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -1102,10 +1102,16 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
 #endif
     buttonsizer->Add( butNewDir, 0, wxALL, 5 );
 
 #endif
     buttonsizer->Add( butNewDir, 0, wxALL, 5 );
 

+#ifdef __WXX11__
+    mainsizer->Add( buttonsizer, 0, wxALL | wxEXPAND, 0 );
+#else

     mainsizer->Add( buttonsizer, 0, wxALL | wxEXPAND, 5 );
     mainsizer->Add( buttonsizer, 0, wxALL | wxEXPAND, 5 );

+#endif

 
     wxBoxSizer *staticsizer = new wxBoxSizer( wxHORIZONTAL );
 
     wxBoxSizer *staticsizer = new wxBoxSizer( wxHORIZONTAL );

+#ifndef __WXX11__

     staticsizer->Add( new wxStaticText( this, -1, _("Current directory:") ), 0, wxRIGHT, 10 );
     staticsizer->Add( new wxStaticText( this, -1, _("Current directory:") ), 0, wxRIGHT, 10 );

+#endif

     m_static = new wxStaticText( this, -1, m_dir );
     staticsizer->Add( m_static, 1 );
     mainsizer->Add( staticsizer, 0, wxEXPAND | wxLEFT|wxRIGHT|wxBOTTOM, 10 );
     m_static = new wxStaticText( this, -1, m_dir );
     staticsizer->Add( m_static, 1 );
     mainsizer->Add( staticsizer, 0, wxEXPAND | wxLEFT|wxRIGHT|wxBOTTOM, 10 );