removing dependany on mac headers from public wx headers

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

diff --git a/include/wx/mac/control.h b/include/wx/mac/control.h
index 3770d647f29097d4b78bbfa4f91a6bfcac043261..b7e84398be47e1d2df98e14136a4adf175fe3bc5 100644 (file)
--- a/include/wx/mac/control.h
+++ b/include/wx/mac/control.h
@@ -16,6 +16,8 @@
 #pragma interface "control.h"
 #endif
 
+WXDLLEXPORT_DATA(extern const wxChar*) wxControlNameStr;
+
 // General item class
 class WXDLLEXPORT wxControl : public wxControlBase
 {
@@ -23,6 +25,20 @@ class WXDLLEXPORT wxControl : public wxControlBase
 
 public:
    wxControl();
+   wxControl(wxWindow *parent, wxWindowID id,
+             const wxPoint& pos = wxDefaultPosition,
+             const wxSize& size = wxDefaultSize, long style = 0,
+             const wxValidator& validator = wxDefaultValidator,
+             const wxString& name = wxControlNameStr)
+    {
+        Create(parent, id, pos, size, style, validator, name);
+    }
+
+    bool Create(wxWindow *parent, wxWindowID id,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize, long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxControlNameStr);
    virtual ~wxControl();
 
    // Simulates an event
@@ -36,32 +52,35 @@ public:
    virtual void SetLabel(const wxString& title) ;
 
    wxList& GetSubcontrols() { return m_subControls; }
-
+   
    void OnEraseBackground(wxEraseEvent& event);
-
-               virtual bool                                            Enable(bool enabled) ;
-               virtual bool                                            Show(bool show) ;
-                               
-               virtual void                                            MacHandleControlClick( ControlHandle control , SInt16 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 ) ;
-               virtual void                                            MacPostControlCreate() ;
-               virtual void                                            MacAdjustControlRect() ;
-               virtual ControlHandle   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                                            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 ;}
+   
+   virtual bool                 Enable(bool enable = TRUE) ;
+   virtual bool                 Show(bool show = TRUE) ;
+   
+   virtual void                 MacRedrawControl () ;
+   virtual void         MacHandleControlClick( ControlHandle control , SInt16 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 ) ;
+   virtual void                 MacPostControlCreate() ;
+   virtual void                 MacAdjustControlRect() ;
+   virtual ControlHandle 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 = 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 ;}
 
 #if WXWIN_COMPATIBILITY
    virtual void SetButtonColour(const wxColour& WXUNUSED(col)) { }
@@ -83,12 +102,13 @@ protected:
 
 protected:
    // For controls like radiobuttons which are really composite
-               ControlHandle           m_macControl ;
-               int                                                     m_macHorizontalBorder ;
-               int                                                     m_macVerticalBorder ;
-   wxList m_subControls;
+       ControlHandle           m_macControl ;
+       bool                            m_macControlIsShown ;
+       wxList m_subControls;
+       int                                                     m_macHorizontalBorder ;
+       int                                                     m_macVerticalBorder ;
 
-   virtual wxSize DoGetBestSize();
+   virtual wxSize DoGetBestSize() const;
 
 private:
    DECLARE_EVENT_TABLE()