Allow specification of border spacing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38709 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -106,6 +106,14 @@ public:
|
||||
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)
|
||||
@@ -136,6 +144,8 @@ protected:
|
||||
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)
|
||||
|
@@ -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 );
|
||||
|
||||
int extraSpace = 2;
|
||||
#if defined(__SMARTPHONE__) || defined(__POCKETPC__)
|
||||
extraSpace=0;
|
||||
m_sheetOuterBorder = 0;
|
||||
#endif
|
||||
topSizer->Add(m_innerSizer, 1, wxGROW|wxALL, extraSpace);
|
||||
topSizer->Add(m_innerSizer, 1, wxGROW|wxALL, m_sheetOuterBorder);
|
||||
|
||||
m_bookCtrl = CreateBookCtrl();
|
||||
AddBookCtrl(m_innerSizer);
|
||||
@@ -87,6 +86,8 @@ void wxPropertySheetDialog::Init()
|
||||
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
|
||||
@@ -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
|
||||
sizer->Add( m_bookCtrl, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
|
||||
sizer->Add( m_bookCtrl, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, m_sheetInnerBorder );
|
||||
#endif
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user