X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/03e11df5470fd64d9d9a669d0b50b84c2d714736..5d644707ca96dcaa63dc5a24c9eb5c2b7ee0b50d:/include/wx/mac/control.h

diff --git a/include/wx/mac/control.h b/include/wx/mac/control.h
index fb05068161..cef07af9c5 100644
--- a/include/wx/mac/control.h
+++ b/include/wx/mac/control.h
@@ -55,32 +55,32 @@ public:
    
    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 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 ,
-					      Rect *outBounds ,
-					      StringPtr maclabel ) ;
+					      WXRECTPTR outBounds ,
+					      unsigned char* maclabel ) ;
    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  	 DoSetSize(int x, int y,int width, int height,int sizeFlags ) ;
+   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) ;
-   ControlHandle	 GetMacControl() { return m_macControl ;}
+   WXWidget	 GetMacControl() { return m_macControl ;}
 
 #if WXWIN_COMPATIBILITY
    virtual void SetButtonColour(const wxColour& WXUNUSED(col)) { }
@@ -102,10 +102,11 @@ protected:
 
 protected:
    // For controls like radiobuttons which are really composite
-	ControlHandle		m_macControl ;
-   	wxList m_subControls;
-	int							m_macHorizontalBorder ;
-	int							m_macVerticalBorder ;
+   WXWidget m_macControl ;
+   bool     m_macControlIsShown ;
+   wxList   m_subControls;
+   int      m_macHorizontalBorder ;
+   int      m_macVerticalBorder ;
 
    virtual wxSize DoGetBestSize() const;
 
@@ -122,8 +123,8 @@ private:
     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