checkbox = new wxCheckBox(this,-1,wxString(_T("Show Actor")));
Connect(checkbox->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction)&wxMaracasSurfaceRenderingProp3D::onCheckBoxChange);
checkbox->SetValue(true);
- checkboxsizer->Add(checkbox,wxFIXED_MINSIZE);
- /*
- checkboxsurface = new wxCheckBox(this,-1,wxString(_T("Surface Box")));
- Connect(checkboxsurface->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction)&wxMaracasSurfaceRenderingProp3D::onCheckBoxSurfaceChange);
- checkboxsurface->SetValue(true);
- checkboxsizer->Add(checkboxsurface,wxFIXED_MINSIZE);
- */
-
- sizersurfprop->Add(checkboxsizer,wxFIXED_MINSIZE);
+ checkboxsizer->Add(checkbox,1, wxGROW);
+
+
+ if(wxMaracasSurfaceRendering::getInstance()->interactorSet()){
+ checkboxsurface = new wxCheckBox(this,-1,wxString(_T("Surface Box")));
+ Connect(checkboxsurface->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction)&wxMaracasSurfaceRenderingProp3D::onCheckBoxSurfaceChange);
+ checkboxsurface->SetValue(true);
+ checkboxsizer->Add(checkboxsurface,1, wxGROW);
+ }
+
+
+ sizersurfprop->Add(checkboxsizer,1, wxGROW);
}
//this->addControl(checkbox);
wxBitmap bitmap(Color_xpm);
_colorchoose = new wxBitmapButton(this, -1, bitmap,wxDefaultPosition,wxSize(30,30));
Connect(_colorchoose->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&wxMaracasSurfaceRenderingProp3D::onColorChange);
- sizerbut->Add(_colorchoose,wxFIXED_MINSIZE);
+ sizerbut->Add(_colorchoose,1, wxGROW);
/*
wxBitmap bitmap1(Add_xpm);
Connect(_viewimage->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&wxMaracasSurfaceRenderingProp3D::onViewImage);
sizerbut->Add(_viewimage,wxFIXED_MINSIZE);
*/
- sizersurfprop->Add(sizerbut,wxFIXED_MINSIZE);
+ sizersurfprop->Add(sizerbut,1, wxGROW);
//sizercolor->Add(checkbox,wxFIXED_MINSIZE);
//sizercolor->Add(_colorchoose,wxFIXED_MINSIZE);
//this->addControl(sizercolor);
opacity = new wxSlider(this, -1,100,0,100,wxDefaultPosition,wxDefaultSize,wxSL_HORIZONTAL|wxSL_LABELS);
Connect(opacity->GetId(), wxEVT_SCROLL_CHANGED, (wxObjectEventFunction)&wxMaracasSurfaceRenderingProp3D::onOpacityRelease);
wxFlexGridSizer* sizeropacity = new wxFlexGridSizer(1,1,1);
- sizeropacity->Add(label,wxFIXED_MINSIZE);
- sizeropacity->Add(opacity,wxFIXED_MINSIZE);
+ sizeropacity->Add(label,1, wxGROW);
+ sizeropacity->Add(opacity,1, wxGROW);
- sizersurfprop->Add(sizeropacity,wxFIXED_MINSIZE);
+ sizersurfprop->Add(sizeropacity,1, wxGROW);
this->addControl(sizersurfprop);