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 fb050681615c34a86f40558e5e8b5bdf39ad30c2..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
 


@@ -55,32 +55,34 @@ public:
    
    void OnEraseBackground(wxEraseEvent& event);
    
    
    void OnEraseBackground(wxEraseEvent& event);
    

-   virtual bool                 Enable(bool enabled) ;
+   virtual bool                 Enable(bool enable = TRUE) ;

    virtual bool                 Show(bool show = TRUE) ;
    
    virtual void                 MacRedrawControl () ;
    virtual bool                 Show(bool show = TRUE) ;
    
    virtual void                 MacRedrawControl () ;

-   virtual void         MacHandleControlClick( ControlHandle control , SInt16 controlpart ) ;
+   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 ,
    virtual void                 MacPreControlCreate( wxWindow *parent, wxWindowID id, wxString label , 
                                              const wxPoint& pos,
                                              const wxSize& size, long style,
                                              const wxValidator& validator,
                                              const wxString& name ,

-                                             Rect *outBounds ,
-                                             StringPtr maclabel ) ;
+                                             WXRECTPTR outBounds ,
+                                             unsigned char* maclabel ) ;

    virtual void                 MacPostControlCreate() ;
    virtual void                 MacAdjustControlRect() ;
    virtual void                 MacPostControlCreate() ;
    virtual void                 MacAdjustControlRect() ;

-   virtual ControlHandle MacGetContainerForEmbedding() ;
+   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 ) ;
-   virtual void         OnKeyDown( wxKeyEvent &event ) ;
-   virtual void                 OnMouseEvent( wxMouseEvent &event ) ;
-   virtual void         OnPaint(wxPaintEvent& event) ;
+   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) ;
    virtual void                 Refresh(bool eraseBack = TRUE, const wxRect *rect = NULL) ;

-   ControlHandle        GetMacControl() { return m_macControl ;}
+   WXWidget     GetMacControl() { return m_macControl ;}

 
 #if WXWIN_COMPATIBILITY
    virtual void SetButtonColour(const wxColour& WXUNUSED(col)) { }
 
 #if WXWIN_COMPATIBILITY
    virtual void SetButtonColour(const wxColour& WXUNUSED(col)) { }


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

-       ControlHandle           m_macControl ;
-       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;
 


@@ -122,8 +126,8 @@ private:
     inline void wxControl::SetButtonFont(const wxFont& font) { SetFont(font); }
 #endif // WXWIN_COMPATIBILITY
 
     inline void wxControl::SetButtonFont(const wxFont& font) { SetFont(font); }
 #endif // WXWIN_COMPATIBILITY
 

-wxControl *wxFindControlFromMacControl(ControlHandle inControl ) ;
-void wxAssociateControlWithMacControl(ControlHandle inControl, wxControl *control) ;
+wxControl *wxFindControlFromMacControl(WXWidget inControl ) ;
+void wxAssociateControlWithMacControl(WXWidget inControl, wxControl *control) ;

 void wxRemoveMacControlAssociation(wxControl *control) ;
 
 #endif
 void wxRemoveMacControlAssociation(wxControl *control) ;
 
 #endif