Blob support fixes - still does not work, but getting there

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

diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp
index 73d1bcd7dcb5c44953720c990607167bcde27fbb..d16c32fd0f498d8f8d9886288d796fb7aec517a2 100644 (file)
--- a/src/common/dlgcmn.cpp
+++ b/src/common/dlgcmn.cpp
@@ -29,12 +29,14 @@
 #endif
 
 #ifndef WX_PRECOMP
 #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/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
 
 //--------------------------------------------------------------------------
 #endif
 
 //--------------------------------------------------------------------------


@@ -47,9 +49,10 @@ wxSizer *wxDialogBase::CreateTextSizer( const wxString &message )
 
     // get line height for empty lines
     int y = 0;
 
     // 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++)
 
     wxString line;
     for (size_t pos = 0; pos < message.Len(); pos++)


@@ -59,13 +62,13 @@ wxSizer *wxDialogBase::CreateTextSizer( const wxString &message )
             if (!line.IsEmpty())
             {
                 wxStaticText *s1 = new wxStaticText( this, -1, line );
             if (!line.IsEmpty())
             {
                 wxStaticText *s1 = new wxStaticText( this, -1, line );

-               box->Add( s1 );
+                box->Add( s1 );

                 line = wxT("");
             }
                 line = wxT("");
             }

-           else
-           {
-               box->Add( 5, y );
-           }
+            else
+            {
+                box->Add( 5, y );
+            }

         }
         else
         {
         }
         else
         {


@@ -77,7 +80,7 @@ wxSizer *wxDialogBase::CreateTextSizer( const wxString &message )
     if (!line.IsEmpty())
     {
         wxStaticText *s2 = new wxStaticText( this, -1, line );
     if (!line.IsEmpty())
     {
         wxStaticText *s2 = new wxStaticText( this, -1, line );

-       box->Add( s2 );
+        box->Add( s2 );

     }
 
     return box;
     }
 
     return box;


@@ -88,9 +91,9 @@ wxSizer *wxDialogBase::CreateButtonSizer( long flags )
     wxBoxSizer *box = new wxBoxSizer( wxHORIZONTAL );
 
 #if defined(__WXMSW__) || defined(__WXMAC__)
     wxBoxSizer *box = new wxBoxSizer( wxHORIZONTAL );
 
 #if defined(__WXMSW__) || defined(__WXMAC__)

-    int margin = 6;
+    static const int margin = 6;

 #else
 #else

-    int margin = 10;
+    static const int margin = 10;

 #endif
 
     wxButton *ok = (wxButton *) NULL;
 #endif
 
     wxButton *ok = (wxButton *) NULL;