X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2837271a5b526faed2cd876808b4a44a1eb69ac7..1674c73a431c156222766865560bab06d9d5c020:/include/wx/mac/carbon/private.h

diff --git a/include/wx/mac/carbon/private.h b/include/wx/mac/carbon/private.h
index ba81c9ecfc..0d84f0ee92 100644
--- a/include/wx/mac/carbon/private.h
+++ b/include/wx/mac/carbon/private.h
@@ -333,37 +333,51 @@ public :
     {
         m_controlRef = (ControlRef) control ;
     }
+    virtual ~wxMacControl()
+    {
+    }
     
-    bool Ok() const { return m_controlRef != NULL ; }
+    virtual void Dispose() ;
+
+    bool Ok() const { return GetControlRef() != NULL ; }
     
+    virtual ControlRef * GetControlRefAddr() { return &m_controlRef; } 
+    virtual ControlRef GetControlRef() const { return m_controlRef ; }  
+
+    virtual void SetReference( SInt32 data ) ; 
+    /*
     void operator= (ControlRef c) { m_controlRef = c ; }
     operator ControlRef () { return m_controlRef; }   
     operator ControlRef * () { return &m_controlRef; }   
-
+    */
     // accessing data and values
 
     virtual OSStatus SetData( ControlPartCode inPartCode , ResType inTag , Size inSize , const void * inData ) ;
-    virtual OSStatus GetData( ControlPartCode inPartCode , ResType inTag , Size inBufferSize , void * inOutBuffer , Size * outActualSize ) ;
-    virtual OSStatus GetDataSize( ControlPartCode inPartCode , ResType inTag , Size * outActualSize ) ;
+    virtual OSStatus GetData( ControlPartCode inPartCode , ResType inTag , Size inBufferSize , void * inOutBuffer , Size * outActualSize ) const ;
+    virtual OSStatus GetDataSize( ControlPartCode inPartCode , ResType inTag , Size * outActualSize ) const ;
     virtual OSStatus SendEvent(  EventRef ref , OptionBits inOptions = 0 ) ;
     virtual OSStatus SendHICommand( HICommand &command , OptionBits inOptions = 0 ) ;
 
-    OSStatus SendHICommand( UInt32 commandID , OptionBits inOptions = 0 ) ;
+    virtual OSStatus SendHICommand( UInt32 commandID , OptionBits inOptions = 0 ) ;
 
-    SInt32 GetValue() const ;
-    SInt32 GetMaximum() const ;
-    SInt32 GetMinimum() const ;
+    virtual SInt32 GetValue() const ;
+    virtual SInt32 GetMaximum() const ;
+    virtual SInt32 GetMinimum() const ;
     
-    void SetValue( SInt32 v ) ;
-    void SetMinimum( SInt32 v ) ;
-    void SetMaximum( SInt32 v ) ;
+    virtual void SetValue( SInt32 v ) ;
+    virtual void SetMinimum( SInt32 v ) ;
+    virtual void SetMaximum( SInt32 v ) ;
 
-    void SetValueAndRange( SInt32 value , SInt32 minimum , SInt32 maximum ) ;
-    void SetRange( SInt32 minimum , SInt32 maximum ) ;
+    virtual void SetValueAndRange( SInt32 value , SInt32 minimum , SInt32 maximum ) ;
+    virtual void SetRange( SInt32 minimum , SInt32 maximum ) ;
+    
+    virtual OSStatus SetFocus( ControlFocusPart focusPart ) ;
+    virtual bool HasFocus() const ;
+    virtual bool NeedsFocusRect() const ;
     
     // templated helpers
 
-    Size GetDataSize( ControlPartCode inPartCode , ResType inTag )
+    Size GetDataSize( ControlPartCode inPartCode , ResType inTag ) const
     {
         Size sz ;
         verify_noerr( GetDataSize( inPartCode , inTag , &sz ) ) ;
@@ -377,12 +391,12 @@ public :
     {
         return SetData( inPartCode , inTag , sizeof( T ) , &data ) ;
     }
-    template <typename T> OSStatus GetData( ControlPartCode inPartCode , ResType inTag , T *data )
+    template <typename T> OSStatus GetData( ControlPartCode inPartCode , ResType inTag , T *data ) const
     {
         Size dummy ;
         return GetData( inPartCode , inTag , sizeof( T ) , data , &dummy ) ;
     }
-    template <typename T> T GetData( ControlPartCode inPartCode , ResType inTag )
+    template <typename T> T GetData( ControlPartCode inPartCode , ResType inTag ) const
     {
         T value ;
         verify_noerr( GetData<T>( inPartCode , inTag , &value ) ) ;
@@ -390,11 +404,74 @@ public :
     }
        
     // Flash the control for the specified amount of time
-    void Flash( ControlPartCode part , UInt32 ticks = 8 ) ;
+    virtual void Flash( ControlPartCode part , UInt32 ticks = 8 ) ;
+    virtual void VisibilityChanged( bool shown ) ;
+    virtual void SetFont( const wxFont & font , const wxColour& foreground , long windowStyle ) ;
+    virtual ControlPartCode HandleKey(  SInt16 keyCode,  SInt16 charCode, EventModifiers modifiers ) ;
+    void SetActionProc( ControlActionUPP   actionProc ) ;
+    void SetViewSize( SInt32 viewSize ) ;
+    SInt32 GetViewSize() const ;
     
-
+    virtual bool IsVisible() const ;
+    virtual void SetVisibility( bool visible , bool redraw ) ;
+    virtual bool IsEnabled() const ;
+    virtual bool IsActive() const ;
+    virtual void Enable( bool enable ) ;
+    
+    // invalidates this control and all children
+    virtual void InvalidateWithChildren() ;
+    virtual void SetDrawingEnabled( bool enable ) ;
+    virtual bool GetNeedsDisplay() const ;
+    virtual void SetNeedsDisplay( bool needsDisplay , RgnHandle where = NULL ) ;
+
+    virtual void ScrollRect( const wxRect &rect , int dx , int dy ) ;
+
+    virtual void GetRect( Rect *r ) ;
+    virtual void SetRect( Rect *r ) ;
+    virtual void GetRectInWindowCoords( Rect *r ) ;
+    virtual void GetBestRect( Rect *r ) ;
+    virtual void SetTitle( const wxString &title ) ;
+    // converts from Toplevel-Content relative to local
+    static void Convert( wxPoint *pt , wxMacControl *convert , wxMacControl *to ) ;
+    
+    virtual void GetFeatures( UInt32 *features ) ;
+    virtual OSStatus GetRegion( ControlPartCode partCode , RgnHandle region ) ;
+    virtual OSStatus SetZOrder( bool above , wxMacControl* other ) ;
+    // to be moved into a databrowser subclass
+    
+    virtual OSStatus SetSelectionFlags( DataBrowserSelectionFlags ) ;
+    virtual OSStatus AddListViewColumn( DataBrowserListViewColumnDesc *columnDesc,
+        DataBrowserTableViewColumnIndex position ) ;
+    virtual OSStatus AutoSizeListViewColumns() ;
+    virtual OSStatus SetHasScrollBars( bool horiz , bool vert ) ;
+    virtual OSStatus SetTableViewHiliteStyle( DataBrowserTableViewHiliteStyle hiliteStyle ) ;
+    virtual OSStatus SetListViewHeaderBtnHeight(UInt16 height) ;
+    virtual OSStatus SetCallbacks(const DataBrowserCallbacks *  callbacks) ;
+    virtual OSStatus UpdateItems( DataBrowserItemID container, UInt32 numItems,
+            const DataBrowserItemID* items,                
+            DataBrowserPropertyID preSortProperty,
+            DataBrowserPropertyID propertyID ) ;
+    virtual OSStatus AddItems( DataBrowserItemID container, UInt32 numItems,
+            const DataBrowserItemID* items,                
+            DataBrowserPropertyID preSortProperty ) ;
+    virtual OSStatus RemoveItems( DataBrowserItemID container, UInt32 numItems,
+            const DataBrowserItemID* items,                
+            DataBrowserPropertyID preSortProperty ) ;
+    virtual OSStatus RevealItem( DataBrowserItemID item,
+            DataBrowserPropertyID propertyID,
+            DataBrowserRevealOptions options ) ;
+    virtual bool IsItemSelected( DataBrowserItemID item ) ;
+    virtual OSStatus SetSelectedItems(UInt32 numItems,
+            const DataBrowserItemID * items,
+            DataBrowserSetOption operation ) ;
+            
+    // to be moved into a tab control class
+    
+    virtual OSStatus SetTabEnabled( SInt16 tabNo , bool enable ) ;
 protected :
-    ControlRef m_controlRef ;
+    ControlRef  m_controlRef ;
+    wxFont      m_font ;
+    long        m_windowStyle ; 
 } ;
 
 #endif // wxUSE_GUI