column autosizing added

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

diff --git a/include/wx/mac/control.h b/include/wx/mac/control.h
index 6f7c964c95c17e32c5fed2c8aac472fa967f3662..713f91fd0930c391b6bb35fe712bac6ac1737502 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
 {
@@ -25,6 +27,12 @@ public:
    wxControl();
    virtual ~wxControl();
 
+    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);
+
    // Simulates an event
    virtual void Command(wxCommandEvent& event) { ProcessCommand(event); }
 
@@ -56,7 +64,7 @@ public:
                virtual void                                            MacSuperShown( bool show ) ;
                virtual bool                                            MacCanFocus() const ;
 
-               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 ) ;
                virtual void                                            OnKeyDown( wxKeyEvent &event ) ;
                virtual void                                            OnMouseEvent( wxMouseEvent &event ) ;
                virtual void                                    OnPaint(wxPaintEvent& event) ;
@@ -88,7 +96,7 @@ protected:
                int                                                     m_macVerticalBorder ;
    wxList m_subControls;
 
-   virtual wxSize DoGetBestSize();
+   virtual wxSize DoGetBestSize() const ;
 
 private:
    DECLARE_EVENT_TABLE()