Fixed bug that was giving the wrong size of wxCustomDataObjects to the receiver.

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

diff --git a/include/wx/mac/control.h b/include/wx/mac/control.h
index 7d8f6d185d3598347c3f0320e8a5e45c6431c730..441d823d20ffa279df1630a415359d601c3f70fc 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
@@ -33,12 +49,37 @@ 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 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,
+                                                                                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 ;}
+
 #if WXWIN_COMPATIBILITY
    virtual void SetButtonColour(const wxColour& WXUNUSED(col)) { }
    wxColour* GetButtonColour() const { return NULL; }
@@ -59,17 +100,12 @@ protected:
 
 protected:
    // For controls like radiobuttons which are really composite
-   wxList m_subControls;
-
-   virtual wxSize DoGetBestSize();
-
-   // create the control of the given class with the given style, returns FALSE
-   // if creation failed
-   bool MSWCreateControl(const wxChar *classname, WXDWORD style);
+       ControlHandle           m_macControl ;
+       wxList m_subControls;
+       int                                                     m_macHorizontalBorder ;
+       int                                                     m_macVerticalBorder ;
 
-   // determine the extended styles combination for this window (may slightly
-   // modify styl parameter)
-   WXDWORD GetExStyle(WXDWORD& style) const;
+   virtual wxSize DoGetBestSize() const;
 
 private:
    DECLARE_EVENT_TABLE()