removed WXWIN_COMPATIBILITY and WXWIN_COMPATIBILITY_2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -81,16 +81,6 @@ public:
|
||||
,WXLPARAM lParam
|
||||
);
|
||||
|
||||
#if WXWIN_COMPATIBILITY
|
||||
virtual void SetButtonColour(const wxColour& WXUNUSED(rCol)) { }
|
||||
wxColour* GetButtonColour(void) const { return NULL; }
|
||||
|
||||
inline virtual void SetLabelFont(const wxFont& rFont);
|
||||
inline virtual void SetButtonFont(const wxFont& rFont);
|
||||
inline wxFont& GetLabelFont(void) const;
|
||||
inline wxFont& GetButtonFont(void) const;
|
||||
#endif // WXWIN_COMPATIBILITY
|
||||
|
||||
public:
|
||||
//
|
||||
// For controls like radiobuttons which are really composite
|
||||
@@ -138,12 +128,5 @@ private:
|
||||
DECLARE_EVENT_TABLE()
|
||||
}; // end of wxControl
|
||||
|
||||
#if WXWIN_COMPATIBILITY
|
||||
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); }
|
||||
inline void wxControl::SetButtonFont(const wxFont& rFont) { SetFont(rFont); }
|
||||
#endif // WXWIN_COMPATIBILITY
|
||||
|
||||
#endif // _WX_CONTROL_H_
|
||||
|
||||
|
Reference in New Issue
Block a user