Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moving userpane attribute into implementation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67233 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2011-03-18 15:45:51 +00:00
parent a9a4f22953
commit 415f4a011a
8 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/osx/carbon/private.h
View File

@@ -279,7 +279,7 @@ enum {
class WXDLLIMPEXP_CORE wxMacControl : public wxWidgetImpl class WXDLLIMPEXP_CORE wxMacControl : public wxWidgetImpl
{ {
public : public :
wxMacControl( wxWindowMac* peer , bool isRootControl = false ); wxMacControl( wxWindowMac* peer , bool isRootControl = false, bool isUserPane = false );
wxMacControl() ; wxMacControl() ;
virtual ~wxMacControl(); virtual ~wxMacControl();

2
include/wx/osx/cocoa/private.h
View File

@@ -48,7 +48,7 @@ class WXDLLIMPEXP_FWD_CORE wxDialog;
class WXDLLIMPEXP_CORE wxWidgetCocoaImpl : public wxWidgetImpl class WXDLLIMPEXP_CORE wxWidgetCocoaImpl : public wxWidgetImpl
{ {
public : public :
wxWidgetCocoaImpl( wxWindowMac* peer , WXWidget w, bool isRootControl = false ) ; wxWidgetCocoaImpl( wxWindowMac* peer , WXWidget w, bool isRootControl = false, bool isUserPane = false ) ;
wxWidgetCocoaImpl() ; wxWidgetCocoaImpl() ;
~wxWidgetCocoaImpl(); ~wxWidgetCocoaImpl();

5
include/wx/osx/core/private.h
View File

@@ -193,7 +193,7 @@ protected :
class WXDLLIMPEXP_CORE wxWidgetImpl : public wxObject class WXDLLIMPEXP_CORE wxWidgetImpl : public wxObject
{ {
public : public :
wxWidgetImpl( wxWindowMac* peer , bool isRootControl = false ); wxWidgetImpl( wxWindowMac* peer , bool isRootControl = false, bool isUserPane = false );
wxWidgetImpl(); wxWidgetImpl();
virtual ~wxWidgetImpl(); virtual ~wxWidgetImpl();
@@ -201,6 +201,8 @@ public :
bool IsRootControl() const { return m_isRootControl; } bool IsRootControl() const { return m_isRootControl; }
bool IsUserPane() const { return m_isUserPane; }
wxWindowMac* GetWXPeer() const { return m_wxPeer; } wxWindowMac* GetWXPeer() const { return m_wxPeer; }
bool IsOk() const { return GetWXWidget() != NULL; } bool IsOk() const { return GetWXWidget() != NULL; }
@@ -520,6 +522,7 @@ public :
static void Convert( wxPoint *pt , wxWidgetImpl *from , wxWidgetImpl *to ); static void Convert( wxPoint *pt , wxWidgetImpl *from , wxWidgetImpl *to );
protected : protected :
bool m_isRootControl; bool m_isRootControl;
bool m_isUserPane;
wxWindowMac* m_wxPeer; wxWindowMac* m_wxPeer;
bool m_needsFocusRect; bool m_needsFocusRect;
bool m_needsFrame; bool m_needsFrame;

2
include/wx/osx/iphone/private.h
View File

@@ -31,7 +31,7 @@ wxBitmap WXDLLIMPEXP_CORE wxOSXCreateSystemBitmap(const wxString& id, const wxSt
class WXDLLIMPEXP_CORE wxWidgetIPhoneImpl : public wxWidgetImpl class WXDLLIMPEXP_CORE wxWidgetIPhoneImpl : public wxWidgetImpl
{ {
public : public :
wxWidgetIPhoneImpl( wxWindowMac* peer , WXWidget w, bool isRootControl = false ) ; wxWidgetIPhoneImpl( wxWindowMac* peer , WXWidget w, bool isRootControl = false, bool isUserPane = false ) ;
wxWidgetIPhoneImpl() ; wxWidgetIPhoneImpl() ;
~wxWidgetIPhoneImpl(); ~wxWidgetIPhoneImpl();

4
src/osx/carbon/window.cpp
View File

@@ -868,8 +868,8 @@ wxMacControl::wxMacControl()
Init(); Init();
} }
wxMacControl::wxMacControl(wxWindowMac* peer , bool isRootControl ) : wxMacControl::wxMacControl(wxWindowMac* peer , bool isRootControl, bool isUserPane ) :
wxWidgetImpl( peer, isRootControl ) wxWidgetImpl( peer, isRootControl, isUserPane )
{ {
Init(); Init();
} }

4
src/osx/cocoa/window.mm
View File

@@ -1345,8 +1345,8 @@ void wxOSXCocoaClassAddWXMethods(Class c)
IMPLEMENT_DYNAMIC_CLASS( wxWidgetCocoaImpl , wxWidgetImpl ) IMPLEMENT_DYNAMIC_CLASS( wxWidgetCocoaImpl , wxWidgetImpl )
wxWidgetCocoaImpl::wxWidgetCocoaImpl( wxWindowMac* peer , WXWidget w, bool isRootControl ) : wxWidgetCocoaImpl::wxWidgetCocoaImpl( wxWindowMac* peer , WXWidget w, bool isRootControl, bool isUserPane ) :
wxWidgetImpl( peer, isRootControl ) wxWidgetImpl( peer, isRootControl, isUserPane )
{ {
Init(); Init();
m_osxView = w; m_osxView = w;

4
src/osx/iphone/window.mm
View File

@@ -329,8 +329,8 @@ void wxOSXIPhoneClassAddWXMethods(Class c)
IMPLEMENT_DYNAMIC_CLASS( wxWidgetIPhoneImpl , wxWidgetImpl ) IMPLEMENT_DYNAMIC_CLASS( wxWidgetIPhoneImpl , wxWidgetImpl )
wxWidgetIPhoneImpl::wxWidgetIPhoneImpl( wxWindowMac* peer , WXWidget w, bool isRootControl ) : wxWidgetIPhoneImpl::wxWidgetIPhoneImpl( wxWindowMac* peer , WXWidget w, bool isRootControl, bool isUserPane ) :
wxWidgetImpl( peer, isRootControl ), m_osxView(w) wxWidgetImpl( peer, isRootControl, isUserPane ), m_osxView(w)
{ {
} }

3
src/osx/window_osx.cpp
View File

@@ -2607,10 +2607,11 @@ void wxWidgetImpl::RemoveAssociations(wxWidgetImpl* impl)
IMPLEMENT_ABSTRACT_CLASS( wxWidgetImpl , wxObject ) IMPLEMENT_ABSTRACT_CLASS( wxWidgetImpl , wxObject )
wxWidgetImpl::wxWidgetImpl( wxWindowMac* peer , bool isRootControl ) wxWidgetImpl::wxWidgetImpl( wxWindowMac* peer , bool isRootControl, bool isUserPane )
{ {
Init(); Init();
m_isRootControl = isRootControl; m_isRootControl = isRootControl;
m_isUserPane = isUserPane;
m_wxPeer = peer; m_wxPeer = peer;
m_shouldSendEvents = true; m_shouldSendEvents = true;
} }