Applied patch [ 1196679 ] wxIMPLEMENT_CLASS_COMMON2 bad parameter count compil fix.

[wxWidgets.git] / src / generic / propdlg.cpp

diff --git a/src/generic/propdlg.cpp b/src/generic/propdlg.cpp
index ecbaf34ed363c673a7f18dad14d9b17a152d4d65..abfc87723d9bdab007ec75ae7c4aeb6c3393264b 100644 (file)
--- a/src/generic/propdlg.cpp
+++ b/src/generic/propdlg.cpp
@@ -56,7 +56,7 @@ bool wxPropertySheetDialog::Create(wxWindow* parent, wxWindowID id, const wxStri
     // This gives more space around the edges
     m_innerSizer = new wxBoxSizer( wxVERTICAL );
 
     // This gives more space around the edges
     m_innerSizer = new wxBoxSizer( wxVERTICAL );
 

-    int extraSpace = 5;
+    int extraSpace = 2;

 #if defined(__SMARTPHONE__) || defined(__POCKETPC__)
     extraSpace=0;
 #endif
 #if defined(__SMARTPHONE__) || defined(__POCKETPC__)
     extraSpace=0;
 #endif


@@ -79,6 +79,7 @@ void wxPropertySheetDialog::LayoutDialog()
 {
 #if !defined(__SMARTPHONE__) && !defined(__POCKETPC__)
     GetSizer()->Fit(this);
 {
 #if !defined(__SMARTPHONE__) && !defined(__POCKETPC__)
     GetSizer()->Fit(this);

+    GetSizer()->SetSizeHints(this);

     Centre(wxBOTH);
 #endif
 #if defined(__SMARTPHONE__)
     Centre(wxBOTH);
 #endif
 #if defined(__SMARTPHONE__)


@@ -95,11 +96,14 @@ void wxPropertySheetDialog::CreateButtons(int flags)
     // Perhaps that could be embedded in CreateButtonSizer() directly.
     SetRightMenu(wxID_CANCEL);
     SetLeftMenu(wxID_OK);
     // Perhaps that could be embedded in CreateButtonSizer() directly.
     SetRightMenu(wxID_CANCEL);
     SetLeftMenu(wxID_OK);

+    wxUnusedVar(flags);

 #elif defined(__POCKETPC__)
     // Do nothing
 #elif defined(__POCKETPC__)
     // Do nothing

+    wxUnusedVar(flags);

 #else
     wxSizer* sizer = CreateButtonSizer(flags);
 #else
     wxSizer* sizer = CreateButtonSizer(flags);

-    m_innerSizer->Add( sizer, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5);
+    m_innerSizer->Add( sizer, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT|wxRIGHT, 2);
+    m_innerSizer->AddSpacer(2);

 #endif
 }
 
 #endif
 }