X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d84afea9d1ec41ee4e2ebb3bf6b87926cf5f04d1..f114b8580b980c54e7b6194fe6494a86cb833907:/include/wx/mac/control.h diff --git a/include/wx/mac/control.h b/include/wx/mac/control.h index cef07af9c5..c97686d258 100644 --- a/include/wx/mac/control.h +++ b/include/wx/mac/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 @@ -74,11 +74,13 @@ public: virtual void MacSuperEnabled( bool enabled ) ; virtual void MacSuperShown( bool show ) ; virtual bool MacCanFocus() const ; + virtual void MacUpdateDimensions() ; + void* MacGetControlAction() { return m_macControlAction ; } virtual void DoSetSize(int x, int y,int width, int height,int sizeFlags = wxSIZE_AUTO ) ; - virtual void OnKeyDown( wxKeyEvent &event ) ; - virtual void OnMouseEvent( wxMouseEvent &event ) ; - virtual void OnPaint(wxPaintEvent& event) ; + void OnKeyDown( wxKeyEvent &event ) ; + void OnMouseEvent( wxMouseEvent &event ) ; + void OnPaint(wxPaintEvent& event) ; virtual void Refresh(bool eraseBack = TRUE, const wxRect *rect = NULL) ; WXWidget GetMacControl() { return m_macControl ;} @@ -103,6 +105,7 @@ protected: protected: // For controls like radiobuttons which are really composite WXWidget m_macControl ; + void* m_macControlAction ; bool m_macControlIsShown ; wxList m_subControls; int m_macHorizontalBorder ;