Second try to add "support" for deriving from

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

diff --git a/include/wx/mac/carbon/control.h b/include/wx/mac/carbon/control.h
index cc588f3861d7816bb2ba321293379ca5abce7402..201ce9f0edb547c6909360770c215f737f2aed72 100644 (file)
--- a/include/wx/mac/carbon/control.h
+++ b/include/wx/mac/carbon/control.h
@@ -49,61 +49,9 @@ public:
 
    // Calls the callback and appropriate event handlers
    bool ProcessCommand(wxCommandEvent& event);
-   virtual void SetLabel(const wxString& title) ;
 
-   wxList& GetSubcontrols() { return m_subControls; }
-   
-   void OnEraseBackground(wxEraseEvent& event);
-   
-   virtual bool             Enable(bool enable = TRUE) ;
-   virtual bool             Show(bool show = TRUE) ;
-   virtual void             DoSetWindowVariant( wxWindowVariant variant ) ;
- 
-   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         MacUpdateDimensions() ;
-   void*             MacGetControlAction() { return m_macControlAction ; }
-   
-   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 ;}
-
-protected:
-   // For controls like radiobuttons which are really composite
-   WXWidget m_macControl ;
-   void*    m_macControlAction ;
-   bool     m_macControlIsShown ;
-   wxList   m_subControls;
-   int      m_macHorizontalBorder ;
-   int      m_macVerticalBorder ;
-
-   virtual wxSize DoGetBestSize() const;
-
-private:
-   DECLARE_EVENT_TABLE()
+   void                 OnKeyDown( wxKeyEvent &event ) ;
 };
 
-
-wxControl *wxFindControlFromMacControl(WXWidget inControl ) ;
-void wxAssociateControlWithMacControl(WXWidget inControl, wxControl *control) ;
-void wxRemoveMacControlAssociation(wxControl *control) ;
-
 #endif
     // _WX_CONTROL_H_