Added virtual GetNonClientNSView()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -52,6 +52,8 @@ protected:
|
|||||||
// ------------------------------------------------------------------------
|
// ------------------------------------------------------------------------
|
||||||
public:
|
public:
|
||||||
virtual wxMenuBar* GetAppMenuBar() { return GetMenuBar(); }
|
virtual wxMenuBar* GetAppMenuBar() { return GetMenuBar(); }
|
||||||
|
// Returns the NSView for non-client drawing
|
||||||
|
virtual WX_NSView GetNonClientNSView();
|
||||||
protected:
|
protected:
|
||||||
virtual void CocoaSetWxWindowSize(int width, int height);
|
virtual void CocoaSetWxWindowSize(int width, int height);
|
||||||
|
|
||||||
|
@@ -65,6 +65,9 @@ public:
|
|||||||
WX_NSView GetNSViewForSuperview() const;
|
WX_NSView GetNSViewForSuperview() const;
|
||||||
// Returns the NSView that may be hidden/is being hidden
|
// Returns the NSView that may be hidden/is being hidden
|
||||||
WX_NSView GetNSViewForHiding() const;
|
WX_NSView GetNSViewForHiding() const;
|
||||||
|
// Returns the NSView for non-client drawing
|
||||||
|
virtual WX_NSView GetNonClientNSView() { return GetNSViewForSuperview(); }
|
||||||
|
// Add/remove children
|
||||||
void CocoaAddChild(wxWindowCocoa *child);
|
void CocoaAddChild(wxWindowCocoa *child);
|
||||||
void CocoaRemoveFromParent(void);
|
void CocoaRemoveFromParent(void);
|
||||||
protected:
|
protected:
|
||||||
|
@@ -97,6 +97,13 @@ void wxFrame::CocoaSetWxWindowSize(int width, int height)
|
|||||||
wxTopLevelWindow::CocoaSetWxWindowSize(width,height);
|
wxTopLevelWindow::CocoaSetWxWindowSize(width,height);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
WX_NSView wxFrame::GetNonClientNSView()
|
||||||
|
{
|
||||||
|
if(m_frameNSView)
|
||||||
|
return m_frameNSView;
|
||||||
|
return GetNSViewForSuperview();
|
||||||
|
}
|
||||||
|
|
||||||
void wxFrame::CocoaReplaceView(WX_NSView oldView, WX_NSView newView)
|
void wxFrame::CocoaReplaceView(WX_NSView oldView, WX_NSView newView)
|
||||||
{
|
{
|
||||||
// If we have the additional toolbar/statbar view, then the
|
// If we have the additional toolbar/statbar view, then the
|
||||||
|
Reference in New Issue
Block a user