yet another fix in wxHtmlParser::DoParsing

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

diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp
index 9f74bbe3af4888d05ecfc66ba832baf242a8d0b3..d16c32fd0f498d8f8d9886288d796fb7aec517a2 100644 (file)
--- a/src/common/dlgcmn.cpp
+++ b/src/common/dlgcmn.cpp
@@ -17,10 +17,8 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if 0
 #ifdef __GNUG__
-    #pragma implementation
-#endif
+    #pragma implementation "dialogbase.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
@@ -31,12 +29,14 @@
 #endif
 
 #ifndef WX_PRECOMP
+    #include "wx/button.h"
     #include "wx/dialog.h"
     #include "wx/dcclient.h"
     #include "wx/intl.h"
     #include "wx/settings.h"
     #include "wx/stattext.h"
     #include "wx/sizer.h"
+    #include "wx/button.h"
 #endif
 
 //--------------------------------------------------------------------------
@@ -46,106 +46,118 @@
 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 );
-    
+    wxFont font( GetFont() );
+    if (!font.Ok())
+        font = *wxSWISS_FONT;
+    GetTextExtent(_T("H"), (int*)NULL, &y, (int*)NULL, (int*)NULL, &font);
+
     wxString line;
     for (size_t pos = 0; pos < message.Len(); pos++)
     {
-        if (message[pos] == _T('\n'))
+        if (message[pos] == wxT('\n'))
         {
             if (!line.IsEmpty())
             {
                 wxStaticText *s1 = new wxStaticText( this, -1, line );
-               box->Add( s1 );
-                line = _T("");
+                box->Add( s1 );
+                line = wxT("");
+            }
+            else
+            {
+                box->Add( 5, y );
             }
-           else
-           {
-               box->Add( 5, y );
-           }
         }
         else
         {
             line += message[pos];
         }
     }
-    
+
     // remaining text behind last '\n'
     if (!line.IsEmpty())
     {
         wxStaticText *s2 = new wxStaticText( this, -1, line );
-       box->Add( s2 );
+        box->Add( s2 );
     }
-    
+
     return box;
 }
-    
+
 wxSizer *wxDialogBase::CreateButtonSizer( long flags )
 {
     wxBoxSizer *box = new wxBoxSizer( wxHORIZONTAL );
 
 #if defined(__WXMSW__) || defined(__WXMAC__)
-    int margin = 6;
+    static const int margin = 6;
 #else
-    int margin = 10;
+    static const int margin = 10;
 #endif
 
     wxButton *ok = (wxButton *) NULL;
     wxButton *cancel = (wxButton *) NULL;
     wxButton *yes = (wxButton *) NULL;
     wxButton *no = (wxButton *) NULL;
-    
-    if (flags & wxYES_NO) 
+
+    // always show an OK button, unless only YES_NO is given
+    if ((flags & wxYES_NO) == 0) flags = flags | wxOK;
+
+    if (flags & wxYES_NO)
     {
         yes = new wxButton( this, wxID_YES, _("Yes") );
         box->Add( yes, 0, wxLEFT|wxRIGHT, margin );
         no = new wxButton( this, wxID_NO, _("No") );
         box->Add( no, 0, wxLEFT|wxRIGHT, margin );
-    } else 
-    if (flags & wxYES) 
+    } else
+    if (flags & wxYES)
     {
         yes = new wxButton( this, wxID_YES, _("Yes") );
         box->Add( yes, 0, wxLEFT|wxRIGHT, margin );
-    } else 
-    if (flags & wxNO) 
+    } else
+    if (flags & wxNO)
     {
         no = new wxButton( this, wxID_NO, _("No") );
         box->Add( no, 0, wxLEFT|wxRIGHT, margin );
     }
 
-    if (flags & wxOK) 
+    if (flags & wxOK)
     {
         ok = new wxButton( this, wxID_OK, _("OK") );
         box->Add( ok, 0, wxLEFT|wxRIGHT, margin );
     }
 
-    if (flags & wxFORWARD) 
-        box->Add( new wxButton( this, wxID_FORWARD, _("Forward")  ), 0, wxLEFT|wxRIGHT, margin ); 
+    if (flags & wxFORWARD)
+        box->Add( new wxButton( this, wxID_FORWARD, _("Forward")  ), 0, wxLEFT|wxRIGHT, margin );
 
-    if (flags & wxBACKWARD) 
+    if (flags & wxBACKWARD)
         box->Add( new wxButton( this, wxID_BACKWARD, _("Backward")  ), 0, wxLEFT|wxRIGHT, margin );
 
-    if (flags & wxSETUP) 
+    if (flags & wxSETUP)
         box->Add( new wxButton( this, wxID_SETUP, _("Setup")  ), 0, wxLEFT|wxRIGHT, margin );
 
-    if (flags & wxMORE) 
+    if (flags & wxMORE)
         box->Add( new wxButton( this, wxID_MORE, _("More...")  ), 0, wxLEFT|wxRIGHT, margin );
 
     if (flags & wxHELP)
         box->Add( new wxButton( this, wxID_HELP, _("Help")  ), 0, wxLEFT|wxRIGHT, margin );
 
-    if (flags & wxCANCEL) 
+    if (flags & wxCANCEL)
     {
         cancel = new wxButton( this, wxID_CANCEL, _("Cancel") );
         box->Add( cancel, 0, wxLEFT|wxRIGHT, margin );
     }
 
-    if ((flags & wxNO_DEFAULT) == 0)
+    if (flags & wxNO_DEFAULT)
+    {
+        if (no)
+        {
+            no->SetDefault();
+            no->SetFocus();
+        }
+    }
+    else
     {
         if (ok)
         {
@@ -158,7 +170,7 @@ wxSizer *wxDialogBase::CreateButtonSizer( long flags )
             yes->SetFocus();
         }
     }
-    
+
     return box;
 }