X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6de7047076f388adc95b2eb5c95d5860d65f2f7d..df8c364bf488d99d6b0c305898a5289fe20a393b:/include/wx/osx/window.h diff --git a/include/wx/osx/window.h b/include/wx/osx/window.h index d81975dea5..7afe50d61a 100644 --- a/include/wx/osx/window.h +++ b/include/wx/osx/window.h @@ -17,6 +17,7 @@ class WXDLLIMPEXP_FWD_CORE wxButton; class WXDLLIMPEXP_FWD_CORE wxScrollBar; +class WXDLLIMPEXP_FWD_CORE wxPanel; class WXDLLIMPEXP_FWD_CORE wxNonOwnedWindow; #if wxOSX_USE_CARBON @@ -131,8 +132,6 @@ public: // event handlers // -------------- - void OnNcPaint( wxNcPaintEvent& event ); - void OnEraseBackground(wxEraseEvent& event ); void OnMouseEvent( wxMouseEvent &event ); void MacOnScroll( wxScrollEvent&event ); @@ -158,7 +157,7 @@ public: // this should not be overriden in classes above wxWindowMac // because it is called from its destructor via DeleteChildren virtual void RemoveChild( wxWindowBase *child ); - + virtual bool MacDoRedraw( long time ) ; virtual void MacPaintChildrenBorders(); virtual void MacPaintBorders( int left , int top ) ; @@ -237,12 +236,12 @@ public: // the 'true' OS level control for this wxWindow wxOSXWidgetImpl* GetPeer() const { return m_peer ; } - + void * MacGetCGContextRef() { return m_cgContextRef ; } void MacSetCGContextRef(void * cg) { m_cgContextRef = cg ; } // osx specific event handling common for all osx-ports - + virtual bool OSXHandleClicked( double timestampsec ); virtual bool OSXHandleKeyEvent( wxKeyEvent& event ); protected: @@ -277,6 +276,7 @@ protected: wxScrollBar* m_vScrollBar ; bool m_hScrollBarAlwaysShown; bool m_vScrollBarAlwaysShown; + wxPanel* m_growBox ; wxString m_label ; // set to true if we do a sharp clip at the content area of this window