Fix build for macOS.

This commit is contained in:
John Preston 2017-10-10 09:01:19 +01:00
parent f107866b42
commit a08dd1f6e1
5 changed files with 15 additions and 7 deletions

View File

@ -115,7 +115,7 @@ public:
const Window::SectionShow &params) override; const Window::SectionShow &params) override;
std::unique_ptr<Window::SectionMemento> createMemento() override; std::unique_ptr<Window::SectionMemento> createMemento() override;
rpl::producer<int> desiredHeightValue() const; rpl::producer<int> desiredHeightValue() const override;
void updateInternalState(not_null<Memento*> memento); void updateInternalState(not_null<Memento*> memento);
void saveState(not_null<Memento*> memento); void saveState(not_null<Memento*> memento);
@ -127,7 +127,7 @@ public:
~WrapWidget(); ~WrapWidget();
protected: protected:
void resizeEvent(QResizeEvent *e); void resizeEvent(QResizeEvent *e) override;
void doSetInnerFocus() override; void doSetInnerFocus() override;
void showFinishedHook() override; void showFinishedHook() override;

View File

@ -189,7 +189,7 @@ private:
BaseLayout *_itemUnderCursor = nullptr; BaseLayout *_itemUnderCursor = nullptr;
BaseLayout *_itemUnderPress = nullptr; BaseLayout *_itemUnderPress = nullptr;
HistoryCursorState _mouseCursorState = HistoryDefaultCursorState; HistoryCursorState _mouseCursorState = HistoryDefaultCursorState;
uint16 _mouseTextSymbol = 0; // uint16 _mouseTextSymbol = 0;
bool _pressWasInactive = false; bool _pressWasInactive = false;
using SelectedItems = std::map< using SelectedItems = std::map<
UniversalMsgId, UniversalMsgId,
@ -199,7 +199,7 @@ private:
style::cursor _cursor = style::cur_default; style::cursor _cursor = style::cur_default;
BaseLayout *_dragSelFrom = nullptr; BaseLayout *_dragSelFrom = nullptr;
BaseLayout *_dragSelTo = nullptr; BaseLayout *_dragSelTo = nullptr;
bool _dragSelecting = false; // bool _dragSelecting = false;
bool _wasSelectedText = false; // was some text selected in current drag action bool _wasSelectedText = false; // was some text selected in current drag action
Ui::PopupMenu *_contextMenu = nullptr; Ui::PopupMenu *_contextMenu = nullptr;
ClickHandlerPtr _contextMenuLink; ClickHandlerPtr _contextMenuLink;

View File

@ -332,6 +332,8 @@ void Photo::invalidateCache() {
} }
} }
Photo::~Photo() = default;
Video::Video( Video::Video(
not_null<HistoryItem*> parent, not_null<HistoryItem*> parent,
not_null<DocumentData*> video) not_null<DocumentData*> video)
@ -537,6 +539,8 @@ void Video::updateStatusText() {
} }
} }
Video::~Video() = default;
Voice::Voice( Voice::Voice(
not_null<HistoryItem*> parent, not_null<HistoryItem*> parent,
not_null<DocumentData*> voice, not_null<DocumentData*> voice,

View File

@ -90,7 +90,7 @@ public:
void clickHandlerPressedChanged(const ClickHandlerPtr &action, bool pressed) override; void clickHandlerPressedChanged(const ClickHandlerPtr &action, bool pressed) override;
protected: protected:
not_null<HistoryItem*> _parent = nullptr; not_null<HistoryItem*> _parent;
int _position = 0; int _position = 0;
}; };
@ -196,6 +196,8 @@ public:
void invalidateCache() override; void invalidateCache() override;
~Photo();
private: private:
void ensureCheckboxCreated(); void ensureCheckboxCreated();
@ -225,6 +227,8 @@ public:
void invalidateCache() override; void invalidateCache() override;
~Video();
protected: protected:
float64 dataProgress() const override; float64 dataProgress() const override;
bool dataFinished() const override; bool dataFinished() const override;

View File

@ -29,8 +29,8 @@ FadeWrap<RpWidget>::FadeWrap(
object_ptr<RpWidget> &&child, object_ptr<RpWidget> &&child,
bool scaled) bool scaled)
: Parent(parent, std::move(child)) : Parent(parent, std::move(child))
, _duration(st::fadeWrapDuration) , _animation(this, scaled)
, _animation(this, scaled) { , _duration(st::fadeWrapDuration) {
if (auto weak = wrapped()) { if (auto weak = wrapped()) {
weak->show(); weak->show();
} }