X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7c74e7fe1de14f32dcd6f3c9cdd727de540bbd0e..3f4fc7967b595ea8257696baff78e1866511223d:/include/wx/mac/window.h diff --git a/include/wx/mac/window.h b/include/wx/mac/window.h index 3eac7270ce..ba8b50315f 100644 --- a/include/wx/mac/window.h +++ b/include/wx/mac/window.h @@ -86,7 +86,6 @@ public: virtual void SetFocus(); - virtual bool Reparent( wxWindow *newParent ); virtual void WarpPointer(int x, int y); virtual void CaptureMouse(); @@ -181,6 +180,8 @@ public: void OnEraseBackground(wxEraseEvent& event); void OnIdle(wxIdleEvent& event); void MacOnScroll(wxScrollEvent&event ) ; + + bool AcceptsFocus() const ; public: // For implementation purposes - sometimes decorations make the client area @@ -235,10 +236,12 @@ public : virtual void MacFireMouseEvent( EventRecord *ev ) ; virtual bool MacDispatchMouseEvent(wxMouseEvent& event ) ; virtual void MacEraseBackground( Rect *rect ) ; + virtual void MacPaint( wxPaintEvent &event ) ; WindowRef GetMacRootWindow() const ; virtual ControlHandle MacGetContainerForEmbedding() ; virtual void MacSuperChangedPosition() ; + virtual void MacSuperShown( bool show ) ; bool MacSetupFocusPort() ; bool MacSetupDrawingPort() ; @@ -297,10 +300,6 @@ protected: int sizeFlags = wxSIZE_AUTO); virtual void DoSetClientSize(int width, int height); - // get the size which best suits the window: e.g., for a static text it - // will be the width and height of the text - virtual wxSize DoGetBestSize(); - // move the window to the specified location and resize it: this is called // from both DoSetSize() and DoSetClientSize() and would usually just call // ::MoveWindow() except for composite controls which will want to arrange