X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/853f8094df1f71db3c7ff27cdf57127ef07a16b0..85b657c79d32e5876ce5b8ae1e7b9519fee18247:/include/wx/mac/window.h diff --git a/include/wx/mac/window.h b/include/wx/mac/window.h index 119d88726f..c9dcce20c7 100644 --- a/include/wx/mac/window.h +++ b/include/wx/mac/window.h @@ -165,7 +165,6 @@ public: // void SetHWND(WXHWND hWnd) { m_hWnd = hWnd; } virtual WXWidget GetHandle() const { return (WXWidget) NULL ; } - bool GetUseCtl3D() const { return m_useCtl3D; } bool GetTransparentBackground() const { return m_backgroundTransparent; } void SetTransparent(bool t = TRUE) { m_backgroundTransparent = t; } @@ -174,7 +173,6 @@ public: void OnSetFocus(wxFocusEvent& event) ; void OnNcPaint(wxNcPaintEvent& event); void OnEraseBackground(wxEraseEvent& event); - void OnIdle(wxIdleEvent& event); void OnMouseEvent( wxMouseEvent &event ) ; void MacOnScroll(wxScrollEvent&event ) ; @@ -182,6 +180,8 @@ public: bool AcceptsFocus() const ; public: + void OnInternalIdle(); + // For implementation purposes - sometimes decorations make the client area // smaller virtual wxPoint GetClientAreaOrigin() const; @@ -256,8 +256,6 @@ public: static wxWindowMac* s_lastMouseWindow ; private: protected: -// RgnHandle m_macUpdateRgn ; -// bool m_macEraseOnRedraw ; wxBrush m_macBackgroundBrush ; wxRegion m_macVisibleRegion ; int m_x ; @@ -272,18 +270,7 @@ protected: void MacCreateScrollBars( long style ) ; void MacRepositionScrollBars() ; - // additional (MSW specific) flags - bool m_useCtl3D:1; // Using CTL3D for this control - bool m_backgroundTransparent:1; - bool m_mouseInWindow:1; - bool m_doubleClickAllowed:1; - bool m_winCaptured:1; - - // the size of one page for scrolling - int m_xThumbSize; - int m_yThumbSize; - -// WXHMENU m_hMenu; // Menu, if any + bool m_backgroundTransparent ; // implement the base class pure virtuals virtual void DoClientToScreen( int *x, int *y ) const;