Corrected wrong initial/min size of generic wxDataViewCtrl

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling 2007-10-18 15:07:11 +00:00
parent 438fb233a0
commit b89cac3f09
2 changed files with 5 additions and 3 deletions

View File

@ -742,7 +742,7 @@ static char *small1_xpm[] = {
void MyFrame::OnTestTreeCtrl(wxCommandEvent& WXUNUSED(event) ) void MyFrame::OnTestTreeCtrl(wxCommandEvent& WXUNUSED(event) )
{ {
wxDialog dialog( this, -1, "Test wxDataViewTreeStore", wxDefaultPosition, wxDefaultSize, wxRESIZE_BORDER ); wxDialog dialog( this, -1, "Test wxDataViewTreeStore" );
wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL ); wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL );
@ -761,10 +761,10 @@ void MyFrame::OnTestTreeCtrl(wxCommandEvent& WXUNUSED(event) )
treectrl->AssociateModel( store ); treectrl->AssociateModel( store );
store->DecRef(); store->DecRef();
wxSizer *button_sizer = dialog.CreateButtonSizer( wxOK ); wxSizer *button_sizer = dialog.CreateButtonSizer( wxOK );
if (button_sizer) if (button_sizer)
main_sizer->Add( button_sizer, 0, wxGROW ); main_sizer->Add( button_sizer, 0, wxGROW|wxALL, 10 );
dialog.SetSizer( main_sizer ); dialog.SetSizer( main_sizer );
main_sizer->Fit( &dialog ); main_sizer->Fit( &dialog );

View File

@ -3696,6 +3696,8 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
style | wxScrolledWindowStyle|wxSUNKEN_BORDER, validator)) style | wxScrolledWindowStyle|wxSUNKEN_BORDER, validator))
return false; return false;
SetInitialSize(size);
Init(); Init();
#ifdef __WXMAC__ #ifdef __WXMAC__