correcting import/export (_adv gave linking errors)

[wxWidgets.git] / include / wx / mac / carbon / window.h

diff --git a/include/wx/mac/carbon/window.h b/include/wx/mac/carbon/window.h
index aee0e91ffaf9675cda4ea38c130831c09de12a42..2ea9b499908a8e60307faf8b57885fd27871e03f 100644 (file)
--- a/include/wx/mac/carbon/window.h
+++ b/include/wx/mac/carbon/window.h
@@ -55,8 +55,6 @@ public:
     virtual void Lower();
 
     virtual bool Show( bool show = true );
     virtual void Lower();
 
     virtual bool Show( bool show = true );

-    virtual void DoEnable( bool enable );
-    virtual void OnEnabled( bool enabled );

 
     virtual void SetFocus();
 
 
     virtual void SetFocus();
 


@@ -67,7 +65,7 @@ public:
     virtual void Freeze();
     virtual void Thaw();
     virtual bool IsFrozen() const;
     virtual void Freeze();
     virtual void Thaw();
     virtual bool IsFrozen() const;

-    
+

     virtual void Update() ;
     virtual void ClearBackground();
 
     virtual void Update() ;
     virtual void ClearBackground();
 


@@ -85,7 +83,10 @@ public:
                                const wxFont *theFont = NULL )
                                const;
 protected:
                                const wxFont *theFont = NULL )
                                const;
 protected:

+    virtual void DoEnable( bool enable );
+    virtual void OnEnabled( bool enabled );

     virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
     virtual bool DoPopupMenu( wxMenu *menu, int x, int y );

+

 public:
     virtual void SetScrollbar( int orient, int pos, int thumbVisible,
                                int range, bool refresh = true );
 public:
     virtual void SetScrollbar( int orient, int pos, int thumbVisible,
                                int range, bool refresh = true );


@@ -95,6 +96,13 @@ public:
     virtual int GetScrollRange( int orient ) const;
     virtual void ScrollWindow( int dx, int dy,
                                const wxRect* rect = (wxRect *) NULL );
     virtual int GetScrollRange( int orient ) const;
     virtual void ScrollWindow( int dx, int dy,
                                const wxRect* rect = (wxRect *) NULL );

+    virtual void AlwaysShowScrollbars(bool horz = true, bool vert = true);
+    virtual bool IsScrollbarAlwaysShown(int orient) const
+    {
+        return orient == wxHORIZONTAL ? m_hScrollBarAlwaysShown
+                                      : m_vScrollBarAlwaysShown;
+    }
+

     virtual bool Reparent( wxWindowBase *newParent );
 
 #if wxUSE_DRAG_AND_DROP
     virtual bool Reparent( wxWindowBase *newParent );
 
 #if wxUSE_DRAG_AND_DROP


@@ -126,7 +134,7 @@ public:
     virtual bool SetTransparent(wxByte alpha);
     virtual bool CanSetTransparent();
     virtual wxByte GetTransparent() const ;
     virtual bool SetTransparent(wxByte alpha);
     virtual bool CanSetTransparent();
     virtual wxByte GetTransparent() const ;

-    
+

     // event handlers
     // --------------
     void OnSetFocus( wxFocusEvent& event );
     // event handlers
     // --------------
     void OnSetFocus( wxFocusEvent& event );


@@ -137,7 +145,7 @@ public:
 
     void MacOnScroll( wxScrollEvent&event );
 
 
     void MacOnScroll( wxScrollEvent&event );
 

-    bool AcceptsFocus() const;
+    virtual bool AcceptsFocus() const;

 
     virtual bool IsDoubleBuffered() const { return true; }
 
 
     virtual bool IsDoubleBuffered() const { return true; }
 


@@ -162,6 +170,7 @@ public:
     // because it is called from its destructor via DeleteChildren
     virtual void        RemoveChild( wxWindowBase *child );
     virtual void        MacPaintBorders( int left , int top ) ;
     // because it is called from its destructor via DeleteChildren
     virtual void        RemoveChild( wxWindowBase *child );
     virtual void        MacPaintBorders( int left , int top ) ;

+    void                MacPaintGrowBox();

 
     // invalidates the borders and focus area around the control;
     // must not be virtual as it will be called during destruction
 
     // invalidates the borders and focus area around the control;
     // must not be virtual as it will be called during destruction


@@ -302,6 +311,8 @@ protected:
 
     wxScrollBar*        m_hScrollBar ;
     wxScrollBar*        m_vScrollBar ;
 
     wxScrollBar*        m_hScrollBar ;
     wxScrollBar*        m_vScrollBar ;

+    bool                m_hScrollBarAlwaysShown;
+    bool                m_vScrollBarAlwaysShown;

     wxString            m_label ;
 
     // set to true if we do a sharp clip at the content area of this window
     wxString            m_label ;
 
     // set to true if we do a sharp clip at the content area of this window


@@ -311,11 +322,13 @@ protected:
 
     virtual bool        MacIsChildOfClientArea( const wxWindow* child ) const ;
 
 
     virtual bool        MacIsChildOfClientArea( const wxWindow* child ) const ;
 

+    bool                MacHasScrollBarCorner() const;

     void                MacCreateScrollBars( long style ) ;
     void                MacRepositionScrollBars() ;
     void                MacUpdateControlFont() ;
 
     void                MacPropagateVisibilityChanged() ;
     void                MacCreateScrollBars( long style ) ;
     void                MacRepositionScrollBars() ;
     void                MacUpdateControlFont() ;
 
     void                MacPropagateVisibilityChanged() ;

+    void                MacPropagateEnabledStateChanged() ;

     void                MacPropagateHiliteChanged() ;
 
     // implement the base class pure virtuals
     void                MacPropagateHiliteChanged() ;
 
     // implement the base class pure virtuals


@@ -349,6 +362,11 @@ private:
     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();
 

+    // show/hide scrollbars as needed, common part of SetScrollbar() and
+    // AlwaysShowScrollbars()
+    void DoUpdateScrollbarVisibility();
+
+

     WXEVENTHANDLERREF    m_macControlEventHandler ;
 
     DECLARE_NO_COPY_CLASS(wxWindowMac)
     WXEVENTHANDLERREF    m_macControlEventHandler ;
 
     DECLARE_NO_COPY_CLASS(wxWindowMac)