corrected crash: need to set m_frame eariler (Wlodek Szafran, closes bug 1636225)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -269,7 +269,8 @@ class SettingsPanel : public wxPanel
|
|||||||
public:
|
public:
|
||||||
|
|
||||||
SettingsPanel(wxWindow* parent, MyFrame* frame)
|
SettingsPanel(wxWindow* parent, MyFrame* frame)
|
||||||
: wxPanel(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize)
|
: wxPanel(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize),
|
||||||
|
m_frame(frame)
|
||||||
{
|
{
|
||||||
//wxBoxSizer* vert = new wxBoxSizer(wxVERTICAL);
|
//wxBoxSizer* vert = new wxBoxSizer(wxVERTICAL);
|
||||||
|
|
||||||
@@ -402,7 +403,6 @@ public:
|
|||||||
SetSizer(cont_sizer);
|
SetSizer(cont_sizer);
|
||||||
GetSizer()->SetSizeHints(this);
|
GetSizer()->SetSizeHints(this);
|
||||||
|
|
||||||
m_frame = frame;
|
|
||||||
m_border_size->SetValue(frame->GetDockArt()->GetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE));
|
m_border_size->SetValue(frame->GetDockArt()->GetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE));
|
||||||
m_sash_size->SetValue(frame->GetDockArt()->GetMetric(wxAUI_DOCKART_SASH_SIZE));
|
m_sash_size->SetValue(frame->GetDockArt()->GetMetric(wxAUI_DOCKART_SASH_SIZE));
|
||||||
m_caption_size->SetValue(frame->GetDockArt()->GetMetric(wxAUI_DOCKART_CAPTION_SIZE));
|
m_caption_size->SetValue(frame->GetDockArt()->GetMetric(wxAUI_DOCKART_CAPTION_SIZE));
|
||||||
|
Reference in New Issue
Block a user