X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e75491071dbefcada61175e3eb89ce4edf335983..3d0c4d2e7bcedb4599c3cce0af19adf73b2f8ecd:/include/wx/mac/control.h?ds=sidebyside

diff --git a/include/wx/mac/control.h b/include/wx/mac/control.h
index 6f7c964c95..441d823d20 100644
--- 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
@@ -41,7 +57,8 @@ public:
 
 	 	virtual bool						Enable(bool enabled) ;
 	 	virtual bool						Show(bool show) ;
-	 		 	
+	 		
+	 	virtual void						MacRedrawControl () ; 	
 		virtual void 						MacHandleControlClick( ControlHandle control , SInt16 controlpart ) ;
 		virtual	void						MacPreControlCreate( wxWindow *parent, wxWindowID id, wxString label , 
 				           					 const wxPoint& pos,
@@ -56,7 +73,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) ;
@@ -83,12 +100,12 @@ 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 ;
+   	wxList m_subControls;
+	int							m_macHorizontalBorder ;
+	int							m_macVerticalBorder ;
 
-   virtual wxSize DoGetBestSize();
+   virtual wxSize DoGetBestSize() const;
 
 private:
    DECLARE_EVENT_TABLE()