moving userpane attribute into implementation

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67233 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/osx/carbon/private.h b/include/wx/osx/carbon/private.h
index bfcbd7132e2b2b5a83440f341a0a65e7081e99c7..071ddbe384a754d5dfd0de9f6cb1cd117a55bb5c 100644 (file)
--- a/include/wx/osx/carbon/private.h
+++ b/include/wx/osx/carbon/private.h
@@ -279,7 +279,7 @@ enum {
 class WXDLLIMPEXP_CORE wxMacControl : public wxWidgetImpl
 {
 public :
-    wxMacControl( wxWindowMac* peer , bool isRootControl = false );
+    wxMacControl( wxWindowMac* peer , bool isRootControl = false, bool isUserPane = false );
     wxMacControl() ;
     virtual ~wxMacControl();
 

diff --git a/include/wx/osx/cocoa/private.h b/include/wx/osx/cocoa/private.h
index 96a0fc4e7731faa06593b3b0097896fb48e10df8..d6b3d57abda41320fa85b15b9a6e5ea5cafdb530 100644 (file)
--- a/include/wx/osx/cocoa/private.h
+++ b/include/wx/osx/cocoa/private.h
@@ -48,7 +48,7 @@ class WXDLLIMPEXP_FWD_CORE wxDialog;
 class WXDLLIMPEXP_CORE wxWidgetCocoaImpl : public wxWidgetImpl
 {
 public :
-    wxWidgetCocoaImpl( wxWindowMac* peer , WXWidget w, bool isRootControl = false ) ;
+    wxWidgetCocoaImpl( wxWindowMac* peer , WXWidget w, bool isRootControl = false, bool isUserPane = false ) ;
     wxWidgetCocoaImpl() ;
     ~wxWidgetCocoaImpl();
 

diff --git a/include/wx/osx/core/private.h b/include/wx/osx/core/private.h
index cd1e5344725f6b0eba14da496cfa66db176b68aa..568ad1e16766fa8824eca521d8ea163681453179 100644 (file)
--- a/include/wx/osx/core/private.h
+++ b/include/wx/osx/core/private.h
@@ -193,13 +193,15 @@ protected :
 class WXDLLIMPEXP_CORE wxWidgetImpl : public wxObject
 {
 public :
-    wxWidgetImpl( wxWindowMac* peer , bool isRootControl = false );
+    wxWidgetImpl( wxWindowMac* peer , bool isRootControl = false, bool isUserPane = false );
     wxWidgetImpl();
     virtual ~wxWidgetImpl();
 
     void Init();
 
     bool                IsRootControl() const { return m_isRootControl; }
+    
+    bool                IsUserPane() const { return m_isUserPane; }
 
     wxWindowMac*        GetWXPeer() const { return m_wxPeer; }
 
@@ -520,6 +522,7 @@ public :
     static void Convert( wxPoint *pt , wxWidgetImpl *from , wxWidgetImpl *to );
 protected :
     bool                m_isRootControl;
+    bool                m_isUserPane;
     wxWindowMac*        m_wxPeer;
     bool                m_needsFocusRect;
     bool                m_needsFrame;

diff --git a/include/wx/osx/iphone/private.h b/include/wx/osx/iphone/private.h
index f2a7c59e9918e4393ffdcb9db60ba03e24cd15fe..a65f3ee2bf93269acd3129c9451ab4b6e8f4f954 100644 (file)
--- a/include/wx/osx/iphone/private.h
+++ b/include/wx/osx/iphone/private.h
@@ -31,7 +31,7 @@ wxBitmap WXDLLIMPEXP_CORE wxOSXCreateSystemBitmap(const wxString& id, const wxSt
 class WXDLLIMPEXP_CORE wxWidgetIPhoneImpl : public wxWidgetImpl
 {
 public :
-    wxWidgetIPhoneImpl( wxWindowMac* peer , WXWidget w, bool isRootControl = false ) ;
+    wxWidgetIPhoneImpl( wxWindowMac* peer , WXWidget w, bool isRootControl = false, bool isUserPane = false ) ;
     wxWidgetIPhoneImpl() ;
     ~wxWidgetIPhoneImpl();
 

diff --git a/src/osx/carbon/window.cpp b/src/osx/carbon/window.cpp
index b7ccb7cc434394fbdcf84b3b224347c13c25355c..52e02398a96a8e2ec91475aea80fd2535b5ba95f 100644 (file)
--- a/src/osx/carbon/window.cpp
+++ b/src/osx/carbon/window.cpp
@@ -868,8 +868,8 @@ wxMacControl::wxMacControl()
     Init();
 }
 
-wxMacControl::wxMacControl(wxWindowMac* peer , bool isRootControl ) :
-    wxWidgetImpl( peer, isRootControl )
+wxMacControl::wxMacControl(wxWindowMac* peer , bool isRootControl, bool isUserPane ) :
+    wxWidgetImpl( peer, isRootControl, isUserPane )
 {
     Init();
 }

diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm
index 4f9a9c8e005c23070418b40954d89706d39542bc..5326ae550e8c9f191d9b399c653320b92cc8bff0 100644 (file)
--- a/src/osx/cocoa/window.mm
+++ b/src/osx/cocoa/window.mm
@@ -1345,8 +1345,8 @@ void wxOSXCocoaClassAddWXMethods(Class c)
 
 IMPLEMENT_DYNAMIC_CLASS( wxWidgetCocoaImpl , wxWidgetImpl )
 
-wxWidgetCocoaImpl::wxWidgetCocoaImpl( wxWindowMac* peer , WXWidget w, bool isRootControl ) :
-    wxWidgetImpl( peer, isRootControl )
+wxWidgetCocoaImpl::wxWidgetCocoaImpl( wxWindowMac* peer , WXWidget w, bool isRootControl, bool isUserPane ) :
+    wxWidgetImpl( peer, isRootControl, isUserPane )
 {
     Init();
     m_osxView = w;

diff --git a/src/osx/iphone/window.mm b/src/osx/iphone/window.mm
index c9658b295197ab3fbc50f6c3c3531ed1a2dd812b..558e90d7920d9cb04d26db79c8a7f88aa40f1913 100644 (file)
--- a/src/osx/iphone/window.mm
+++ b/src/osx/iphone/window.mm
@@ -329,8 +329,8 @@ void wxOSXIPhoneClassAddWXMethods(Class c)
 
 IMPLEMENT_DYNAMIC_CLASS( wxWidgetIPhoneImpl , wxWidgetImpl )
 
-wxWidgetIPhoneImpl::wxWidgetIPhoneImpl( wxWindowMac* peer , WXWidget w, bool isRootControl ) :
-    wxWidgetImpl( peer, isRootControl ), m_osxView(w)
+wxWidgetIPhoneImpl::wxWidgetIPhoneImpl( wxWindowMac* peer , WXWidget w, bool isRootControl, bool isUserPane ) :
+    wxWidgetImpl( peer, isRootControl, isUserPane ), m_osxView(w)
 {
 }
 

diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp
index 9ae46ce412af370d03da43da4ebdbc573c514641..3cec4eb59b6c5f69faf17de4cedac2bd0337f17f 100644 (file)
--- a/src/osx/window_osx.cpp
+++ b/src/osx/window_osx.cpp
@@ -2607,10 +2607,11 @@ void wxWidgetImpl::RemoveAssociations(wxWidgetImpl* impl)
 
 IMPLEMENT_ABSTRACT_CLASS( wxWidgetImpl , wxObject )
 
-wxWidgetImpl::wxWidgetImpl( wxWindowMac* peer , bool isRootControl )
+wxWidgetImpl::wxWidgetImpl( wxWindowMac* peer , bool isRootControl, bool isUserPane )
 {
     Init();
     m_isRootControl = isRootControl;
+    m_isUserPane = isUserPane;
     m_wxPeer = peer;
     m_shouldSendEvents = true;
 }