projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
wx
/
content_widget.h
diff --git
a/src/wx/content_widget.h
b/src/wx/content_widget.h
index bbe16039998e9d22db60594cd5b3534d856538ef..b4d06286e46972de23b863460ec8aebceba57653 100644
(file)
--- a/
src/wx/content_widget.h
+++ b/
src/wx/content_widget.h
@@
-103,11
+103,12
@@
public:
}
/** Add this widget to a wxGridBagSizer */
}
/** Add this widget to a wxGridBagSizer */
- void add (wxGridBagSizer* sizer, wxGBPosition position)
+ void add (wxGridBagSizer* sizer, wxGBPosition position
, wxGBSpan span = wxDefaultSpan
)
{
_sizer = sizer;
_position = position;
{
_sizer = sizer;
_position = position;
- _sizer->Add (_wrapped, _position);
+ _span = span;
+ _sizer->Add (_wrapped, _position, _span);
}
/** Update the view from the model */
}
/** Update the view from the model */
@@
-151,7
+152,7
@@
private:
_sizer->Detach (_button);
_button->Hide ();
_sizer->Detach (_button);
_button->Hide ();
- _sizer->Add (_wrapped, _position);
+ _sizer->Add (_wrapped, _position
, _span
);
_wrapped->Show ();
_sizer->Layout ();
}
_wrapped->Show ();
_sizer->Layout ();
}
@@
-165,7
+166,7
@@
private:
_wrapped->Hide ();
_sizer->Detach (_wrapped);
_button->Show ();
_wrapped->Hide ();
_sizer->Detach (_wrapped);
_button->Show ();
- _sizer->Add (_button, _position);
+ _sizer->Add (_button, _position
, _span
);
_sizer->Layout ();
}
_sizer->Layout ();
}
@@
-187,6
+188,7
@@
private:
T* _wrapped;
wxGridBagSizer* _sizer;
wxGBPosition _position;
T* _wrapped;
wxGridBagSizer* _sizer;
wxGBPosition _position;
+ wxGBSpan _span;
wxButton* _button;
List _content;
int _property;
wxButton* _button;
List _content;
int _property;