Improve standard button spacing on Windows

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

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index 703882151eb955b5b9e70b0984580ebc77bf8d9a..51fb38a92629a8a1dd27e891c2f0d2411987ae84 100644 (file)
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -1754,7 +1754,7 @@ void wxStdDialogButtonSizer::Realize()
     // do the same thing for GTK1 and Windows platforms
     // and assume any platform not accounted for here will use
     // Windows style
     // do the same thing for GTK1 and Windows platforms
     // and assume any platform not accounted for here will use
     // Windows style

-        Add(0, 0, 0, wxLEFT, 9);
+        // Add(0, 0, 0, wxLEFT, 5); // Not sure what this was for but it unbalances the dialog

         if (m_buttonHelp)
             Add((wxWindow*)m_buttonHelp, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonHelp->ConvertDialogToPixels(wxSize(4, 0)).x);
 
         if (m_buttonHelp)
             Add((wxWindow*)m_buttonHelp, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonHelp->ConvertDialogToPixels(wxSize(4, 0)).x);
 


@@ -1773,7 +1773,7 @@ void wxStdDialogButtonSizer::Realize()
         }
 
         if (m_buttonCancel){
         }
 
         if (m_buttonCancel){

-            Add((wxWindow*)m_buttonCancel, 0, wxALIGN_CENTRE | wxLEFT, m_buttonCancel->ConvertDialogToPixels(wxSize(4, 0)).x);
+            Add((wxWindow*)m_buttonCancel, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonCancel->ConvertDialogToPixels(wxSize(4, 0)).x);

             // Cancel or help should be default
             // m_buttonCancel->SetDefaultButton();
         }
             // Cancel or help should be default
             // m_buttonCancel->SetDefaultButton();
         }