Allow specification of border spacing

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

diff --git a/include/wx/generic/propdlg.h b/include/wx/generic/propdlg.h
index 5be620facae104323bb6a6ed2c6223d0b524d317..6ff7e487592b750df75a6b52ca48a45ca3f0e9ee 100644 (file)
--- a/include/wx/generic/propdlg.h
+++ b/include/wx/generic/propdlg.h
@@ -106,6 +106,14 @@ public:
     void SetSheetStyle(long sheetStyle) { m_sheetStyle = sheetStyle; }
     long GetSheetStyle() const { return m_sheetStyle ; }
 
     void SetSheetStyle(long sheetStyle) { m_sheetStyle = sheetStyle; }
     long GetSheetStyle() const { return m_sheetStyle ; }
 

+    // Set and get the border around the whole dialog
+    void SetSheetOuterBorder(int border) { m_sheetOuterBorder = border; }
+    int GetSheetOuterBorder() const { return m_sheetOuterBorder ; }
+
+    // Set and get the border around the book control only
+    void SetSheetInnerBorder(int border) { m_sheetInnerBorder = border; }
+    int GetSheetInnerBorder() const { return m_sheetInnerBorder ; }
+

 /// Operations
 
     // Creates the buttons (none on PocketPC)
 /// Operations
 
     // Creates the buttons (none on PocketPC)


@@ -136,6 +144,8 @@ protected:
     wxBookCtrlBase* m_bookCtrl;
     wxSizer*        m_innerSizer; // sizer for extra space
     long            m_sheetStyle;
     wxBookCtrlBase* m_bookCtrl;
     wxSizer*        m_innerSizer; // sizer for extra space
     long            m_sheetStyle;

+    int             m_sheetOuterBorder;
+    int             m_sheetInnerBorder;

     int             m_selectedPage;
 
     DECLARE_DYNAMIC_CLASS(wxPropertySheetDialog)
     int             m_selectedPage;
 
     DECLARE_DYNAMIC_CLASS(wxPropertySheetDialog)

diff --git a/src/generic/propdlg.cpp b/src/generic/propdlg.cpp
index d3bda2d3f3d14c9b43a91630a47cfaeafd24e194..02c23b3a8edd3f40c95fc45c68419f6b1c7d277a 100644 (file)
--- a/src/generic/propdlg.cpp
+++ b/src/generic/propdlg.cpp
@@ -70,11 +70,10 @@ 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 = 2;

 #if defined(__SMARTPHONE__) || defined(__POCKETPC__)
 #if defined(__SMARTPHONE__) || defined(__POCKETPC__)

-    extraSpace=0;
+    m_sheetOuterBorder = 0;

 #endif
 #endif

-    topSizer->Add(m_innerSizer, 1, wxGROW|wxALL, extraSpace);
+    topSizer->Add(m_innerSizer, 1, wxGROW|wxALL, m_sheetOuterBorder);

 
     m_bookCtrl = CreateBookCtrl();
     AddBookCtrl(m_innerSizer);
 
     m_bookCtrl = CreateBookCtrl();
     AddBookCtrl(m_innerSizer);


@@ -87,6 +86,8 @@ void wxPropertySheetDialog::Init()
     m_sheetStyle = wxPROPSHEET_DEFAULT;
     m_innerSizer = NULL;
     m_bookCtrl = NULL;
     m_sheetStyle = wxPROPSHEET_DEFAULT;
     m_innerSizer = NULL;
     m_bookCtrl = NULL;

+    m_sheetOuterBorder = 2;
+    m_sheetInnerBorder = 5;

 }
 
 // Layout the dialog, to be called after pages have been created
 }
 
 // Layout the dialog, to be called after pages have been created


@@ -184,7 +185,7 @@ void wxPropertySheetDialog::AddBookCtrl(wxSizer* sizer)
     int borderSize = -2;
     sizer->Add( m_bookCtrl, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxRIGHT, borderSize );
 #else
     int borderSize = -2;
     sizer->Add( m_bookCtrl, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxRIGHT, borderSize );
 #else

-    sizer->Add( m_bookCtrl, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    sizer->Add( m_bookCtrl, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, m_sheetInnerBorder );

 #endif
 }
 
 #endif
 }