X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d84afea9d1ec41ee4e2ebb3bf6b87926cf5f04d1..30e671a59f943a03b2aea6b3b7880a221a422a19:/include/wx/mac/control.h

diff --git a/include/wx/mac/control.h b/include/wx/mac/control.h
index cef07af9c5..d39c5c624a 100644
--- a/include/wx/mac/control.h
+++ b/include/wx/mac/control.h
@@ -1,18 +1,18 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        control.h
 // Purpose:     wxControl class
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:   	wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CONTROL_H_
 #define _WX_CONTROL_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "control.h"
 #endif
 
@@ -55,32 +55,34 @@ public:
    
    void OnEraseBackground(wxEraseEvent& event);
    
-   virtual bool	         Enable(bool enable = TRUE) ;
-   virtual bool	         Show(bool show = TRUE) ;
-   
-   virtual void		 MacRedrawControl () ;
-   virtual void 	 MacHandleControlClick( WXWidget control , short controlpart ) ;
-   virtual void	         MacPreControlCreate( wxWindow *parent, wxWindowID id, wxString label , 
-					      const wxPoint& pos,
-					      const wxSize& size, long style,
-					      const wxValidator& validator,
-					      const wxString& name ,
-					      WXRECTPTR outBounds ,
-					      unsigned char* maclabel ) ;
-   virtual void		 MacPostControlCreate() ;
-   virtual void		 MacAdjustControlRect() ;
+   virtual bool             Enable(bool enable = TRUE) ;
+   virtual bool             Show(bool show = TRUE) ;
+
+   virtual void         MacRedrawControl () ;
+   virtual void      MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
+   virtual void             MacPreControlCreate( wxWindow *parent, wxWindowID id, wxString label ,
+                          const wxPoint& pos,
+                          const wxSize& size, long style,
+                          const wxValidator& validator,
+                          const wxString& name ,
+                          WXRECTPTR outBounds ,
+                          unsigned char* maclabel ) ;
+   virtual void         MacPostControlCreate() ;
+   virtual void         MacAdjustControlRect() ;
    virtual WXWidget MacGetContainerForEmbedding() ;
-   virtual void 	 MacSuperChangedPosition() ;
-   virtual void 	 MacSuperEnabled( bool enabled ) ;
-   virtual void 	 MacSuperShown( bool show ) ;
-   virtual bool		 MacCanFocus() const ;
+   virtual void      MacSuperChangedPosition() ;
+   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) ;
-   virtual void		 Refresh(bool eraseBack = TRUE, const wxRect *rect = NULL) ;
-   WXWidget	 GetMacControl() { return m_macControl ;}
+   virtual void       DoSetSize(int x, int y,int width, int height,int sizeFlags = wxSIZE_AUTO ) ;
+   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 ;}
 
 #if WXWIN_COMPATIBILITY
    virtual void SetButtonColour(const wxColour& WXUNUSED(col)) { }
@@ -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 ;