Update to Scintilla 1.48

[wxWidgets.git] / include / wx / mac / control.h

diff --git a/include/wx/mac/control.h b/include/wx/mac/control.h
index 02f59ad05e409305c0a23dbf155b6f8a480c4344..c97686d258cc973ac3cd8099d31b6c03a96d7355 100644 (file)
--- a/include/wx/mac/control.h
+++ b/include/wx/mac/control.h
@@ -12,7 +12,7 @@
 #ifndef _WX_CONTROL_H_
 #define _WX_CONTROL_H_
 
 #ifndef _WX_CONTROL_H_
 #define _WX_CONTROL_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "control.h"
 #endif
 
 #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         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         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 ;}
 
    virtual void                 Refresh(bool eraseBack = TRUE, const wxRect *rect = NULL) ;
    WXWidget     GetMacControl() { return m_macControl ;}
 


@@ -102,11 +104,12 @@ protected:
 
 protected:
    // For controls like radiobuttons which are really composite
 
 protected:
    // For controls like radiobuttons which are really composite

-       WXWidget                m_macControl ;
-       bool                            m_macControlIsShown ;
-       wxList m_subControls;
-       int                                                     m_macHorizontalBorder ;
-       int                                                     m_macVerticalBorder ;
+   WXWidget m_macControl ;
+   void*    m_macControlAction ;
+   bool     m_macControlIsShown ;
+   wxList   m_subControls;
+   int      m_macHorizontalBorder ;
+   int      m_macVerticalBorder ;

 
    virtual wxSize DoGetBestSize() const;
 
 
    virtual wxSize DoGetBestSize() const;