VisualAge C++ V4.0 configuration files

[wxWidgets.git] / src / common / dlgcmn.cpp

diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp
index f9d62a3b2f25981886c6f2e2c6dbde09c9119830..faf707489121158516170b063230e59a4f9387af 100644 (file)
--- a/src/common/dlgcmn.cpp
+++ b/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
         {
@@ -89,6 +99,9 @@ wxSizer *wxDialogBase::CreateButtonSizer( long flags )
     wxButton *cancel = (wxButton *) NULL;
     wxButton *yes = (wxButton *) NULL;
     wxButton *no = (wxButton *) NULL;
+
+    // always show an OK button, unless only YES_NO is given
+    if ((flags & wxYES_NO) == 0) flags = flags | wxOK;
     
     if (flags & wxYES_NO) 
     {