adding wrapping possibility for native tlws
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63969 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1002,12 +1002,14 @@ class wxNonOwnedWindowCarbonImpl : public wxNonOwnedWindowImpl
|
||||
{
|
||||
public :
|
||||
wxNonOwnedWindowCarbonImpl( wxNonOwnedWindow* nonownedwnd) ;
|
||||
|
||||
wxNonOwnedWindowCarbonImpl();
|
||||
virtual ~wxNonOwnedWindowCarbonImpl();
|
||||
|
||||
virtual void WillBeDestroyed() ;
|
||||
void Create( wxWindow* parent, const wxPoint& pos, const wxSize& size,
|
||||
long style, long extraStyle, const wxString& name ) ;
|
||||
void Create( wxWindow* parent, WXWindow nativeWindow );
|
||||
|
||||
WXWindow GetWXWindow() const;
|
||||
void Raise();
|
||||
|
@@ -209,6 +209,7 @@ public :
|
||||
virtual void WillBeDestroyed() ;
|
||||
void Create( wxWindow* parent, const wxPoint& pos, const wxSize& size,
|
||||
long style, long extraStyle, const wxString& name ) ;
|
||||
void Create( wxWindow* parent, WXWindow nativeWindow );
|
||||
|
||||
WXWindow GetWXWindow() const;
|
||||
void Raise();
|
||||
|
@@ -796,6 +796,8 @@ public :
|
||||
|
||||
// static creation methods, must be implemented by all toolkits
|
||||
|
||||
static wxNonOwnedWindowImpl* CreateNonOwnedWindow( wxNonOwnedWindow* wxpeer, wxWindow* parent, WXWindow native) ;
|
||||
|
||||
static wxNonOwnedWindowImpl* CreateNonOwnedWindow( wxNonOwnedWindow* wxpeer, wxWindow* parent, const wxPoint& pos, const wxSize& size,
|
||||
long style, long extraStyle, const wxString& name ) ;
|
||||
|
||||
|
@@ -55,6 +55,8 @@ public:
|
||||
long style = 0,
|
||||
const wxString& name = wxPanelNameStr);
|
||||
|
||||
bool Create(wxWindow *parent, WXWindow nativeWindow);
|
||||
|
||||
virtual ~wxNonOwnedWindow();
|
||||
|
||||
virtual wxPoint GetClientAreaOrigin() const;
|
||||
@@ -106,7 +108,7 @@ public:
|
||||
virtual void HandleResizing( double timestampsec, wxRect* rect );
|
||||
|
||||
virtual bool Destroy();
|
||||
|
||||
|
||||
protected:
|
||||
// common part of all ctors
|
||||
void Init();
|
||||
|
@@ -263,6 +263,8 @@ public:
|
||||
|
||||
virtual bool OSXHandleClicked( double timestampsec );
|
||||
virtual bool OSXHandleKeyEvent( wxKeyEvent& event );
|
||||
|
||||
bool IsNativeWindowWrapper() const { return m_isNativeWindowWrapper; }
|
||||
protected:
|
||||
// For controls like radio buttons which are genuinely composite
|
||||
wxList m_subControls;
|
||||
@@ -297,6 +299,8 @@ protected:
|
||||
bool m_vScrollBarAlwaysShown;
|
||||
wxWindow* m_growBox ;
|
||||
wxString m_label ;
|
||||
|
||||
bool m_isNativeWindowWrapper;
|
||||
|
||||
// set to true if we do a sharp clip at the content area of this window
|
||||
// must be dynamic as eg a panel normally is not clipping precisely, but if
|
||||
|
Reference in New Issue
Block a user