removed wxFunction
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21547 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -89,15 +89,6 @@ public:
|
||||
inline virtual void SetButtonFont(const wxFont& rFont);
|
||||
inline wxFont& GetLabelFont(void) const;
|
||||
inline wxFont& GetButtonFont(void) const;
|
||||
|
||||
//
|
||||
// Adds callback
|
||||
//
|
||||
inline void Callback(const wxFunction function);
|
||||
wxFunction GetCallback(void) { return m_callback; }
|
||||
|
||||
protected:
|
||||
wxFunction m_callback; // Callback associated with the window
|
||||
#endif // WXWIN_COMPATIBILITY
|
||||
|
||||
public:
|
||||
@@ -148,7 +139,6 @@ private:
|
||||
}; // end of wxControl
|
||||
|
||||
#if WXWIN_COMPATIBILITY
|
||||
inline void wxControl::Callback(const wxFunction f) { m_callback = f; };
|
||||
inline wxFont& wxControl::GetLabelFont(void) const { return GetFont(); }
|
||||
inline wxFont& wxControl::GetButtonFont(void) const { return GetFont(); }
|
||||
inline void wxControl::SetLabelFont(const wxFont& rFont) { SetFont(rFont); }
|
||||
|
@@ -63,17 +63,6 @@ public:
|
||||
virtual void Break(void);
|
||||
virtual void SetTitle(const wxString& rTitle);
|
||||
|
||||
#if wxUSE_MENU_CALLBACK
|
||||
wxMenu( const wxString& rTitle
|
||||
,const wxFunction fnFunc
|
||||
)
|
||||
: wxMenuBase(rTitle)
|
||||
{
|
||||
Init();
|
||||
Callback(fnFunc);
|
||||
}
|
||||
#endif // wxUSE_MENU_CALLBACK
|
||||
|
||||
//
|
||||
// Implementation only from now on
|
||||
// -------------------------------
|
||||
|
Reference in New Issue
Block a user