More makefiles

Corrected two thing in wxDialogBase (empty lines) and
    msgdlg (wrong flags)


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

src/common/dlgcmn.cpp

@@ -47,6 +47,12 @@ wxSizer *wxDialogBase::CreateTextSizer( const wxString &message )
 {
     wxBoxSizer *box = new wxBoxSizer( wxVERTICAL );
     
+    // get line height for empty lines
+    int y = 0;
+    wxFont new_font( GetFont() );
+    if (!new_font.Ok()) new_font = *wxSWISS_FONT;
+    GetTextExtent( "H", (int*)NULL, &y, (int*)NULL, (int*)NULL, &new_font );
+    
     wxString line;
     for (size_t pos = 0; pos < message.Len(); pos++)
     {
@@ -58,6 +64,10 @@ wxSizer *wxDialogBase::CreateTextSizer( const wxString &message )
 		box->Add( s1 );
                 line = _T("");
             }
+	    else
+	    {
+	        box->Add( 5, y );
+	    }
         }
         else
         {

src/generic/msgdlgg.cpp

@@ -90,7 +90,7 @@ wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent,
 #endif
 
     // 4) buttons
-    topsizer->Add( CreateButtonSizer( wxOK|wxCANCEL ), 0, wxCENTRE | wxALL, 10 );
+    topsizer->Add( CreateButtonSizer( style ), 0, wxCENTRE | wxALL, 10 );
 
     topsizer->SetSizeHints( this );
     topsizer->Fit( this );

src/make.env.in

@@ -26,12 +26,6 @@ WX_MAJOR_VERSION_NUMBER = @WX_MAJOR_VERSION_NUMBER@
 WX_MINOR_VERSION_NUMBER = @WX_MINOR_VERSION_NUMBER@
 WX_RELEASE_NUMBER = @WX_RELEASE_NUMBER@
 
-########################### Misc #################################
-
-
-#@SHELL@ not supported by my autoconf version Is this really needed?
-#SHELL = @SHELL@
-SHELL=/bin/sh
 ########################### Programs #################################
 
 # C++ compiler