X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/510bf1ec20bfe60e801a89974e6371535e338abc..01c6f3724ed22b2b2a0851b358532ed5c37b1bb0:/include/wx/motif/control.h diff --git a/include/wx/motif/control.h b/include/wx/motif/control.h index 33e5fcf509..84afdf5eae 100644 --- a/include/wx/motif/control.h +++ b/include/wx/motif/control.h @@ -12,7 +12,7 @@ #ifndef _WX_CONTROL_H_ #define _WX_CONTROL_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "control.h" #endif @@ -54,12 +54,6 @@ public: virtual void SetLabel(const wxString& label); virtual wxString GetLabel() const ; -#if WXWIN_COMPATIBILITY - void Callback(const wxFunction function) { m_callback = function; }; // Adds callback - - wxFunction GetCallback() { return m_callback; } -#endif // WXWIN_COMPATIBILITY - bool InSetValue() const { return m_inSetValue; } protected: @@ -73,15 +67,11 @@ protected: const wxValidator& validator, const wxString& name); -#if WXWIN_COMPATIBILITY - wxFunction m_callback; // Callback associated with the window -#endif // WXWIN_COMPATIBILITY - - bool m_inSetValue; // Motif: prevent callbacks being called while - // in SetValue + // Motif: prevent callbacks being called while in SetValue + bool m_inSetValue; DECLARE_EVENT_TABLE() }; -#endif -// _WX_CONTROL_H_ +#endif // _WX_CONTROL_H_ +