Kaydet (Commit) 528d698f authored tarafından Noel Grandin's avatar Noel Grandin

convert Link<> to typed

Change-Id: Idc8e9b0ad0032940b98357b07f3e6caf26c5c2d7
üst 485dcc91
...@@ -324,7 +324,7 @@ public: ...@@ -324,7 +324,7 @@ public:
class SmShowSymbol : public Control class SmShowSymbol : public Control
{ {
Link<> aDblClickHdlLink; Link<SmShowSymbol&,void> aDblClickHdlLink;
virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) SAL_OVERRIDE; virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) SAL_OVERRIDE;
virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE; virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE;
...@@ -340,7 +340,7 @@ public: ...@@ -340,7 +340,7 @@ public:
} }
void SetSymbol(const SmSym *pSymbol); void SetSymbol(const SmSym *pSymbol);
void SetDblClickHdl(const Link<> &rLink) { aDblClickHdlLink = rLink; } void SetDblClickHdl(const Link<SmShowSymbol&,void> &rLink) { aDblClickHdlLink = rLink; }
}; };
...@@ -366,10 +366,11 @@ class SmSymbolDialog : public ModalDialog ...@@ -366,10 +366,11 @@ class SmSymbolDialog : public ModalDialog
DECL_LINK(SymbolSetChangeHdl, void*); DECL_LINK(SymbolSetChangeHdl, void*);
DECL_LINK_TYPED(SymbolChangeHdl, SmShowSymbolSetWindow&, void); DECL_LINK_TYPED(SymbolChangeHdl, SmShowSymbolSetWindow&, void);
DECL_LINK(SymbolDblClickHdl, void*); DECL_LINK_TYPED(SymbolDblClickHdl, SmShowSymbol&, void);
DECL_LINK_TYPED(SymbolDblClickHdl2, SmShowSymbolSetWindow&, void); DECL_LINK_TYPED(SymbolDblClickHdl2, SmShowSymbolSetWindow&, void);
DECL_LINK_TYPED(EditClickHdl, Button*, void); DECL_LINK_TYPED(EditClickHdl, Button*, void);
DECL_LINK_TYPED(GetClickHdl, Button*, void); DECL_LINK_TYPED(GetClickHdl, Button*, void);
void SymbolDblClickHdl();
void FillSymbolSets(bool bDeleteText = true); void FillSymbolSets(bool bDeleteText = true);
const SmSym *GetSymbol() const; const SmSym *GetSymbol() const;
......
...@@ -1409,7 +1409,7 @@ void SmShowSymbol::Paint(vcl::RenderContext& rRenderContext, const Rectangle &rR ...@@ -1409,7 +1409,7 @@ void SmShowSymbol::Paint(vcl::RenderContext& rRenderContext, const Rectangle &rR
void SmShowSymbol::MouseButtonDown(const MouseEvent& rMEvt) void SmShowSymbol::MouseButtonDown(const MouseEvent& rMEvt)
{ {
if (rMEvt.GetClicks() > 1) if (rMEvt.GetClicks() > 1)
aDblClickHdlLink.Call(this); aDblClickHdlLink.Call(*this);
else else
Control::MouseButtonDown (rMEvt); Control::MouseButtonDown (rMEvt);
} }
...@@ -1506,13 +1506,16 @@ IMPL_LINK_NOARG_TYPED(SmSymbolDialog, EditClickHdl, Button*, void) ...@@ -1506,13 +1506,16 @@ IMPL_LINK_NOARG_TYPED(SmSymbolDialog, EditClickHdl, Button*, void)
IMPL_LINK_NOARG_TYPED( SmSymbolDialog, SymbolDblClickHdl2, SmShowSymbolSetWindow&, void ) IMPL_LINK_NOARG_TYPED( SmSymbolDialog, SymbolDblClickHdl2, SmShowSymbolSetWindow&, void )
{ {
SymbolDblClickHdl(nullptr); SymbolDblClickHdl();
} }
IMPL_LINK_NOARG( SmSymbolDialog, SymbolDblClickHdl ) IMPL_LINK_NOARG_TYPED( SmSymbolDialog, SymbolDblClickHdl, SmShowSymbol&, void )
{
SymbolDblClickHdl();
}
void SmSymbolDialog::SymbolDblClickHdl()
{ {
GetClickHdl(m_pGetBtn); GetClickHdl(m_pGetBtn);
EndDialog(RET_OK); EndDialog(RET_OK);
return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment