projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Try to enable some WGL stuff.
[dcpomatic.git]
/
src
/
wx
/
content_sub_panel.cc
diff --git
a/src/wx/content_sub_panel.cc
b/src/wx/content_sub_panel.cc
index 2fe104563eb16db5d0d35908649bcab1c8f4e50c..bdb365158c7e743e51506792ca4d2e7b078d5f9f 100644
(file)
--- a/
src/wx/content_sub_panel.cc
+++ b/
src/wx/content_sub_panel.cc
@@
-39,8
+39,6
@@
ContentSubPanel::ContentSubPanel (ContentPanel* p, wxString name)
{
SetScrollRate (8, 8);
SetSizer (_sizer);
{
SetScrollRate (8, 8);
SetSizer (_sizer);
- /* This stops the notebook collapsing to near-zero size. The 600 is a guess. */
- SetMinSize (wxSize(-1, 600));
_grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
_sizer->Add (_grid, 0, wxALL, 8);
_grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
_sizer->Add (_grid, 0, wxALL, 8);
@@
-48,7
+46,6
@@
ContentSubPanel::ContentSubPanel (ContentPanel* p, wxString name)
_config_connection = Config::instance()->Changed.connect (boost::bind (&ContentSubPanel::config_changed, this, _1));
}
_config_connection = Config::instance()->Changed.connect (boost::bind (&ContentSubPanel::config_changed, this, _1));
}
-
void
ContentSubPanel::config_changed (Config::Property p)
{
void
ContentSubPanel::config_changed (Config::Property p)
{
@@
-77,7
+74,7
@@
ContentSubPanel::setup_refer_button (wxCheckBox* button, wxStaticText* note, sha
note->SetLabel (s);
note->Wrap (400);
note->SetLabel (s);
note->Wrap (400);
- if (s.IsEmpty
()
) {
+ if (s.IsEmpty
() || Config::instance()->interface_complexity() == Config::INTERFACE_SIMPLE
) {
note->Hide ();
} else {
note->Show ();
note->Hide ();
} else {
note->Show ();