Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed wxFunction

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21547 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-07-01 12:19:10 +00:00
parent b28b097d59
commit 70dc287a39
16 changed files with 9 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/wx/msw/control.h
View File

@@ -71,18 +71,10 @@ public:
virtual void SetButtonColour(const wxColour& WXUNUSED(col)) { }
wxColour* GetButtonColour() const { return NULL; }
inline virtual void SetLabelFont(const wxFont& font);
inline virtual void SetButtonFont(const wxFont& font);
inline wxFont& GetLabelFont() const;
inline wxFont& GetButtonFont() const;
// Adds callback
inline void Callback(const wxFunction function);
wxFunction GetCallback() { return m_callback; }
protected:
wxFunction m_callback; // Callback associated with the window
virtual void SetLabelFont(const wxFont& font);
virtual void SetButtonFont(const wxFont& font);
wxFont& GetLabelFont() const;
wxFont& GetButtonFont() const;
#endif // WXWIN_COMPATIBILITY
protected:
@@ -131,7 +123,6 @@ private:
#if WXWIN_COMPATIBILITY
inline void wxControl::Callback(const wxFunction f) { m_callback = f; };
inline wxFont& wxControl::GetLabelFont() const { return (wxFont &)GetFont(); }
inline wxFont& wxControl::GetButtonFont() const { return (wxFont &)GetFont(); }
inline void wxControl::SetLabelFont(const wxFont& font) { SetFont(font); }