going private for m_peer to give a foundation for better encapsulation

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

diff --git a/include/wx/osx/window.h b/include/wx/osx/window.h
index 184e13591058824eae73b906343d61eb26dcd2ea..41bfb61a0ef5a897611bdf522ae99b0de03a9888 100644 (file)
--- a/include/wx/osx/window.h
+++ b/include/wx/osx/window.h
@@ -247,6 +247,7 @@ public:
 
     // the 'true' OS level control for this wxWindow
     wxOSXWidgetImpl*       GetPeer() const { return m_peer ; }
 
     // the 'true' OS level control for this wxWindow
     wxOSXWidgetImpl*       GetPeer() const { return m_peer ; }

+    void                SetPeer(wxOSXWidgetImpl* peer);

 
 #if wxOSX_USE_COCOA_OR_IPHONE
     // the NSView or NSWindow of this window: can be used for both child and
 
 #if wxOSX_USE_COCOA_OR_IPHONE
     // the NSView or NSWindow of this window: can be used for both child and


@@ -274,7 +275,6 @@ protected:
     wxList              m_subControls;
 
     // the peer object, allowing for cleaner API support
     wxList              m_subControls;
 
     // the peer object, allowing for cleaner API support

-    wxOSXWidgetImpl *   m_peer ;

 
     void *              m_cgContextRef ;
 
 
     void *              m_cgContextRef ;
 


@@ -365,6 +365,7 @@ protected:
                                    unsigned timeout);
 
 private:
                                    unsigned timeout);
 
 private:

+    wxOSXWidgetImpl *   m_peer ;

     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();
 

diff --git a/src/html/htmlctrl/webkit/webkit.mm b/src/html/htmlctrl/webkit/webkit.mm
index 5a3913d0845178f73ddf41381082806bf20c778b..c13b9699582f8451516f4d4b1bbc7af2717af1e8 100644 (file)
--- a/src/html/htmlctrl/webkit/webkit.mm
+++ b/src/html/htmlctrl/webkit/webkit.mm
@@ -448,28 +448,28 @@ bool wxWebKitCtrl::Create(wxWindow *parent,
     m_macIsUserPane = false;
     wxControl::Create(parent, winID, pos, size, style , validator , name);
 #if wxOSX_USE_CARBON
     m_macIsUserPane = false;
     wxControl::Create(parent, winID, pos, size, style , validator , name);
 #if wxOSX_USE_CARBON

-    m_peer = new wxMacControl(this);
+    SetPeer(new wxMacControl(this));

     WebInitForCarbon();
     WebInitForCarbon();

-    HIWebViewCreate( m_peer->GetControlRefAddr() );
+    HIWebViewCreate( GetPeer()->GetControlRefAddr() );

 
 

-    m_webView = (WebView*) HIWebViewGetWebView( m_peer->GetControlRef() );
+    m_webView = (WebView*) HIWebViewGetWebView( GetPeer()->GetControlRef() );

 
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
     if ( UMAGetSystemVersion() >= 0x1030 )
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
     if ( UMAGetSystemVersion() >= 0x1030 )

-        HIViewChangeFeatures( m_peer->GetControlRef() , kHIViewIsOpaque , 0 ) ;
+        HIViewChangeFeatures( GetPeer()->GetControlRef() , kHIViewIsOpaque , 0 ) ;

 #endif
 #endif

-    InstallControlEventHandler( m_peer->GetControlRef() , GetwxWebKitCtrlEventHandlerUPP(),
+    InstallControlEventHandler( GetPeer()->GetControlRef() , GetwxWebKitCtrlEventHandlerUPP(),

         GetEventTypeCount(eventList), eventList, this,
         (EventHandlerRef *)&m_webKitCtrlEventHandler);
 #else
     NSRect r = wxOSXGetFrameForControl( this, pos , size ) ;
     m_webView = [[WebView alloc] initWithFrame:r frameName:@"webkitFrame" groupName:@"webkitGroup"];
 
         GetEventTypeCount(eventList), eventList, this,
         (EventHandlerRef *)&m_webKitCtrlEventHandler);
 #else
     NSRect r = wxOSXGetFrameForControl( this, pos , size ) ;
     m_webView = [[WebView alloc] initWithFrame:r frameName:@"webkitFrame" groupName:@"webkitGroup"];
 

-    m_peer = new wxWidgetCocoaImpl( this, m_webView );
+    SetPeer(new wxWidgetCocoaImpl( this, m_webView ));

 #endif
     MacPostControlCreate(pos, size);
 #if wxOSX_USE_CARBON
 #endif
     MacPostControlCreate(pos, size);
 #if wxOSX_USE_CARBON

-    HIViewSetVisible( m_peer->GetControlRef(), true );
+    HIViewSetVisible( GetPeer()->GetControlRef(), true );

 #endif
     [m_webView setHidden:false];
 
 #endif
     [m_webView setHidden:false];
 


@@ -742,7 +742,7 @@ void wxWebKitCtrl::OnSize(wxSizeEvent &event){
     // and this tripped me up at first. But in fact, what we want is the root view, because we need to
     // make the y origin relative to the very top of the window, not its contents, since we later flip
     // the y coordinate for Cocoa.
     // and this tripped me up at first. But in fact, what we want is the root view, because we need to
     // make the y origin relative to the very top of the window, not its contents, since we later flip
     // the y coordinate for Cocoa.

-    HIViewConvertRect (&rect, m_peer->GetControlRef(),
+    HIViewConvertRect (&rect, GetPeer()->GetControlRef(),

                                 HIViewGetRoot( (WindowRef) MacGetTopLevelWindowRef() ) );
 
     x = (int)rect.origin.x;
                                 HIViewGetRoot( (WindowRef) MacGetTopLevelWindowRef() ) );
 
     x = (int)rect.origin.x;


@@ -773,7 +773,7 @@ void wxWebKitCtrl::OnSize(wxSizeEvent &event){
 
 void wxWebKitCtrl::MacVisibilityChanged(){
 #if defined(__WXMAC__) && wxOSX_USE_CARBON
 
 void wxWebKitCtrl::MacVisibilityChanged(){
 #if defined(__WXMAC__) && wxOSX_USE_CARBON

-    bool isHidden = !IsControlVisible( m_peer->GetControlRef());
+    bool isHidden = !IsControlVisible( GetPeer()->GetControlRef());

     if (!isHidden)
         [(WebView*)m_webView display];
 
     if (!isHidden)
         [(WebView*)m_webView display];
 

diff --git a/src/osx/bmpbuttn_osx.cpp b/src/osx/bmpbuttn_osx.cpp
index 4e872a906e15e4056a9da3acdadaab50aa49559d..41693cbf6ed4ddff5249a01fad22370af8c9554f 100644 (file)
--- a/src/osx/bmpbuttn_osx.cpp
+++ b/src/osx/bmpbuttn_osx.cpp
@@ -52,7 +52,7 @@ bool wxBitmapButton::Create( wxWindow *parent,
 
     m_bitmaps[State_Normal] = bitmap;
 
 
     m_bitmaps[State_Normal] = bitmap;
 

-    m_peer = wxWidgetImpl::CreateBitmapButton( this, parent, id, bitmap, pos, size, style, GetExtraStyle() );
+    SetPeer(wxWidgetImpl::CreateBitmapButton( this, parent, id, bitmap, pos, size, style, GetExtraStyle() ));

 
     MacPostControlCreate( pos, size );
 
 
     MacPostControlCreate( pos, size );
 

diff --git a/src/osx/button_osx.cpp b/src/osx/button_osx.cpp
index 358fffffd3f5a450134b483ff2edde9640dedd75..be20338e92a8596d47a2095f2efdd561e820cbfb 100644 (file)
--- a/src/osx/button_osx.cpp
+++ b/src/osx/button_osx.cpp
@@ -89,7 +89,7 @@ bool wxButton::Create(wxWindow *parent,
     m_labelOrig =
     m_label = label ;
 
     m_labelOrig =
     m_label = label ;
 

-    m_peer = wxWidgetImpl::CreateButton( this, parent, id, label, pos, size, style, GetExtraStyle() );
+    SetPeer(wxWidgetImpl::CreateButton( this, parent, id, label, pos, size, style, GetExtraStyle() ));

 
     MacPostControlCreate( pos, size );
 
 
     MacPostControlCreate( pos, size );
 


@@ -126,10 +126,10 @@ void wxButton::DoSetBitmap(const wxBitmap& bitmap, State which)
     m_bitmaps[which] = bitmap;
 
     if ( which == State_Normal )
     m_bitmaps[which] = bitmap;
 
     if ( which == State_Normal )

-        m_peer->SetBitmap(bitmap);
+        GetPeer()->SetBitmap(bitmap);

     else if ( which == State_Pressed )
     {
     else if ( which == State_Pressed )
     {

-        wxButtonImpl* bi = dynamic_cast<wxButtonImpl*> (m_peer);
+        wxButtonImpl* bi = dynamic_cast<wxButtonImpl*> (GetPeer());

         if ( bi )
             bi->SetPressedBitmap(bitmap);
     }
         if ( bi )
             bi->SetPressedBitmap(bitmap);
     }


@@ -138,7 +138,7 @@ void wxButton::DoSetBitmap(const wxBitmap& bitmap, State which)
 
 void wxButton::DoSetBitmapPosition(wxDirection dir)
 {
 
 void wxButton::DoSetBitmapPosition(wxDirection dir)
 {

-    m_peer->SetBitmapPosition(dir);
+    GetPeer()->SetBitmapPosition(dir);

     InvalidateBestSize();
 }
 
     InvalidateBestSize();
 }
 


@@ -149,7 +149,7 @@ bool wxButton::DoSetLabelMarkup(const wxString& markup)
     if ( !wxButtonBase::DoSetLabelMarkup(markup) )
         return false;
 
     if ( !wxButtonBase::DoSetLabelMarkup(markup) )
         return false;
 

-    m_peer->SetLabelMarkup(markup);
+    GetPeer()->SetLabelMarkup(markup);

 
     return true;
 }
 
     return true;
 }


@@ -165,27 +165,27 @@ wxWindow *wxButton::SetDefault()
         btnOldDefault->GetPeer()->SetDefaultButton( false );
     }
 
         btnOldDefault->GetPeer()->SetDefaultButton( false );
     }
 

-    m_peer->SetDefaultButton( true );
+    GetPeer()->SetDefaultButton( true );

 
     return btnOldDefault;
 }
 
 void wxButton::Command (wxCommandEvent & WXUNUSED(event))
 {
 
     return btnOldDefault;
 }
 
 void wxButton::Command (wxCommandEvent & WXUNUSED(event))
 {

-    m_peer->PerformClick() ;
+    GetPeer()->PerformClick() ;

     // ProcessCommand(event);
 }
 
 void wxButton::OnEnterWindow( wxMouseEvent& WXUNUSED(event))
 {
     if ( DoGetBitmap( State_Current ).IsOk() )
     // ProcessCommand(event);
 }
 
 void wxButton::OnEnterWindow( wxMouseEvent& WXUNUSED(event))
 {
     if ( DoGetBitmap( State_Current ).IsOk() )

-        m_peer->SetBitmap( DoGetBitmap( State_Current ) );
+        GetPeer()->SetBitmap( DoGetBitmap( State_Current ) );

 }
 
 void wxButton::OnLeaveWindow( wxMouseEvent& WXUNUSED(event))
 {
     if ( DoGetBitmap( State_Current ).IsOk() )
 }
 
 void wxButton::OnLeaveWindow( wxMouseEvent& WXUNUSED(event))
 {
     if ( DoGetBitmap( State_Current ).IsOk() )

-        m_peer->SetBitmap( DoGetBitmap( State_Normal ) );
+        GetPeer()->SetBitmap( DoGetBitmap( State_Normal ) );

 }
 
 bool wxButton::OSXHandleClicked( double WXUNUSED(timestampsec) )
 }
 
 bool wxButton::OSXHandleClicked( double WXUNUSED(timestampsec) )


@@ -208,7 +208,7 @@ bool wxDisclosureTriangle::Create(wxWindow *parent, wxWindowID id, const wxStrin
     if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
         return false;
 
     if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
         return false;
 

-    m_peer = wxWidgetImpl::CreateDisclosureTriangle(this, parent, id, label, pos, size, style, GetExtraStyle() );
+    SetPeer(wxWidgetImpl::CreateDisclosureTriangle(this, parent, id, label, pos, size, style, GetExtraStyle() ));

 
     MacPostControlCreate( pos, size );
     // passing the text in the param doesn't seem to work, so lets do it again
 
     MacPostControlCreate( pos, size );
     // passing the text in the param doesn't seem to work, so lets do it again


@@ -219,12 +219,12 @@ bool wxDisclosureTriangle::Create(wxWindow *parent, wxWindowID id, const wxStrin
 
 void wxDisclosureTriangle::SetOpen( bool open )
 {
 
 void wxDisclosureTriangle::SetOpen( bool open )
 {

-    m_peer->SetValue( open ? 1 : 0 );
+    GetPeer()->SetValue( open ? 1 : 0 );

 }
 
 bool wxDisclosureTriangle::IsOpen() const
 {
 }
 
 bool wxDisclosureTriangle::IsOpen() const
 {

-   return m_peer->GetValue() == 1;
+   return GetPeer()->GetValue() == 1;

 }
 
 bool wxDisclosureTriangle::OSXHandleClicked( double WXUNUSED(timestampsec) )
 }
 
 bool wxDisclosureTriangle::OSXHandleClicked( double WXUNUSED(timestampsec) )

diff --git a/src/osx/carbon/button.cpp b/src/osx/carbon/button.cpp
index ea77565438ec6650021bb88c0f863d26711c1f4c..2924a24614c9313aa4255fce5f12387567d94984 100644 (file)
--- a/src/osx/carbon/button.cpp
+++ b/src/osx/carbon/button.cpp
@@ -55,7 +55,7 @@ wxSize wxButton::DoGetBestSize() const
 
 #if wxOSX_USE_CARBON
     Rect    bestsize = { 0 , 0 , 0 , 0 } ;
 
 #if wxOSX_USE_CARBON
     Rect    bestsize = { 0 , 0 , 0 , 0 } ;

-    m_peer->GetBestRect( &bestsize ) ;
+    GetPeer()->GetBestRect( &bestsize ) ;

 
     int wBtn;
     if ( EmptyRect( &bestsize ) || ( GetWindowStyle() & wxBU_EXACTFIT) )
 
     int wBtn;
     if ( EmptyRect( &bestsize ) || ( GetWindowStyle() & wxBU_EXACTFIT) )


@@ -63,7 +63,7 @@ wxSize wxButton::DoGetBestSize() const
         Point bounds;
 
         ControlFontStyleRec controlFont;
         Point bounds;
 
         ControlFontStyleRec controlFont;

-        OSStatus err = m_peer->GetData<ControlFontStyleRec>( kControlEntireControl, kControlFontStyleTag, &controlFont );
+        OSStatus err = GetPeer()->GetData<ControlFontStyleRec>( kControlEntireControl, kControlFontStyleTag, &controlFont );

         verify_noerr( err );
 
         // GetThemeTextDimensions will cache strings and the documentation
         verify_noerr( err );
 
         // GetThemeTextDimensions will cache strings and the documentation

diff --git a/src/osx/carbon/control.cpp b/src/osx/carbon/control.cpp
index 7f406f3a8bf86d4bc62b931d34f7654c8b4873bf..dba7a99689e242e6350078d57dfa260793c99e1a 100644 (file)
--- a/src/osx/carbon/control.cpp
+++ b/src/osx/carbon/control.cpp
@@ -73,7 +73,7 @@ bool wxControl::ProcessCommand( wxCommandEvent &event )
 
 void  wxControl::OnKeyDown( wxKeyEvent &WXUNUSED(event) )
 {
 
 void  wxControl::OnKeyDown( wxKeyEvent &WXUNUSED(event) )
 {

-    if ( m_peer == NULL || !m_peer->IsOk() )
+    if ( GetPeer() == NULL || !GetPeer()->IsOk() )

         return;
 
 #if wxOSX_USE_CARBON
         return;
 
 #if wxOSX_USE_CARBON


@@ -84,7 +84,7 @@ void  wxControl::OnKeyDown( wxKeyEvent &WXUNUSED(event) )
     GetEventParameter( (EventRef)wxTheApp->MacGetCurrentEvent(), kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(char), NULL, &charCode );
     GetEventParameter( (EventRef)wxTheApp->MacGetCurrentEvent(), kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers );
 
     GetEventParameter( (EventRef)wxTheApp->MacGetCurrentEvent(), kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(char), NULL, &charCode );
     GetEventParameter( (EventRef)wxTheApp->MacGetCurrentEvent(), kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers );
 

-    m_peer->HandleKey( keyCode, charCode, modifiers );
+    GetPeer()->HandleKey( keyCode, charCode, modifiers );

 #else
     // TODO
 #endif
 #else
     // TODO
 #endif

diff --git a/src/osx/carbon/listbox.cpp b/src/osx/carbon/listbox.cpp
index 2ee41be25e0e3a23bbf7310b6eeb8d6c17ab9f91..5baf503d8b58d248b01c8f52cb3056f4f34c443c 100644 (file)
--- a/src/osx/carbon/listbox.cpp
+++ b/src/osx/carbon/listbox.cpp
@@ -337,8 +337,8 @@ wxMacDataBrowserListControl::wxMacDataBrowserListControl( wxWindow *peer, const
     err = SetHasScrollBars( (style & wxHSCROLL) != 0 , true );
 #if 0
     // shouldn't be necessary anymore under 10.2
     err = SetHasScrollBars( (style & wxHSCROLL) != 0 , true );
 #if 0
     // shouldn't be necessary anymore under 10.2

-    m_peer->SetData( kControlNoPart, kControlDataBrowserIncludesFrameAndFocusTag, (Boolean)false );
-    m_peer->SetNeedsFocusRect( true );
+    GetPeer()->SetData( kControlNoPart, kControlDataBrowserIncludesFrameAndFocusTag, (Boolean)false );
+    GetPeer()->SetNeedsFocusRect( true );

 #endif
 }
 
 #endif
 }
 

diff --git a/src/osx/carbon/listctrl_mac.cpp b/src/osx/carbon/listctrl_mac.cpp
index 898890d2ffb11ef604b70aaa93f5562fa7fa86f6..c9a1fab233b9be768fcb15341d6ff96593568fbe 100644 (file)
--- a/src/osx/carbon/listctrl_mac.cpp
+++ b/src/osx/carbon/listctrl_mac.cpp
@@ -678,11 +678,11 @@ bool wxListCtrl::Create(wxWindow *parent,
         if ( !wxWindow::Create(parent, id, pos, size, style & ~(wxHSCROLL | wxVSCROLL), name) )
             return false;
         m_dbImpl = new wxMacDataBrowserListCtrlControl( this, pos, size, style );
         if ( !wxWindow::Create(parent, id, pos, size, style & ~(wxHSCROLL | wxVSCROLL), name) )
             return false;
         m_dbImpl = new wxMacDataBrowserListCtrlControl( this, pos, size, style );

-        m_peer = m_dbImpl;
+        SetPeer(m_dbImpl);

 
         MacPostControlCreate( pos, size );
 
 
         MacPostControlCreate( pos, size );
 

-        InstallControlEventHandler( m_peer->GetControlRef() , GetwxMacListCtrlEventHandlerUPP(),
+        InstallControlEventHandler( GetPeer()->GetControlRef() , GetwxMacListCtrlEventHandlerUPP(),

             GetEventTypeCount(eventList), eventList, this,
             (EventHandlerRef *)&m_macListCtrlEventHandler);
 
             GetEventTypeCount(eventList), eventList, this,
             (EventHandlerRef *)&m_macListCtrlEventHandler);
 

diff --git a/src/osx/carbon/notebmac.cpp b/src/osx/carbon/notebmac.cpp
index 9840b549f4db41da993e02395d78da1d5ed0707c..189b31c2a38e6b5b85219747099a988b330eac58 100644 (file)
--- a/src/osx/carbon/notebmac.cpp
+++ b/src/osx/carbon/notebmac.cpp
@@ -97,32 +97,32 @@ int wxNotebook::HitTest(const wxPoint& pt, long * flags) const
 
     HIPoint hipoint= { adjustedPt.x , adjustedPt.y } ;
     HIViewPartCode outPart = 0 ;
 
     HIPoint hipoint= { adjustedPt.x , adjustedPt.y } ;
     HIViewPartCode outPart = 0 ;

-    OSStatus err = HIViewGetPartHit( m_peer->GetControlRef(), &hipoint, &outPart );
+    OSStatus err = HIViewGetPartHit( GetPeer()->GetControlRef(), &hipoint, &outPart );

 
 

-    int max = m_peer->GetMaximum() ;
+    int max = GetPeer()->GetMaximum() ;

     if ( outPart == 0 && max > 0 )
     {
         // this is a hack, as unfortunately a hit on an already selected tab returns 0,
         // so we have to go some extra miles to make sure we select something different
         // and try again ..
     if ( outPart == 0 && max > 0 )
     {
         // this is a hack, as unfortunately a hit on an already selected tab returns 0,
         // so we have to go some extra miles to make sure we select something different
         // and try again ..

-        int val = m_peer->GetValue() ;
+        int val = GetPeer()->GetValue() ;

         int maxval = max ;
         if ( max == 1 )
         {
         int maxval = max ;
         if ( max == 1 )
         {

-            m_peer->SetMaximum( 2 ) ;
+            GetPeer()->SetMaximum( 2 ) ;

             maxval = 2 ;
         }
 
         if ( val == 1 )
             maxval = 2 ;
         }
 
         if ( val == 1 )

-            m_peer->SetValue( maxval ) ;
+            GetPeer()->SetValue( maxval ) ;

         else
         else

-             m_peer->SetValue( 1 ) ;
+             GetPeer()->SetValue( 1 ) ;

 
 

-        err = HIViewGetPartHit( m_peer->GetControlRef(), &hipoint, &outPart );
+        err = HIViewGetPartHit( GetPeer()->GetControlRef(), &hipoint, &outPart );

 
 

-        m_peer->SetValue( val ) ;
+        GetPeer()->SetValue( val ) ;

         if ( max == 1 )
         if ( max == 1 )

-            m_peer->SetMaximum( 1 ) ;
+            GetPeer()->SetMaximum( 1 ) ;

     }
 
     if ( outPart >= 1 && outPart <= countPages )
     }
 
     if ( outPart >= 1 && outPart <= countPages )

diff --git a/src/osx/carbon/stattext.cpp b/src/osx/carbon/stattext.cpp
index 90765430e8d0bbf86160c0ccf2c679eacd6b0724..995cc7966b3a0261276cfe2de83dea375933dd79 100644 (file)
--- a/src/osx/carbon/stattext.cpp
+++ b/src/osx/carbon/stattext.cpp
@@ -48,10 +48,10 @@ wxSize wxStaticText::DoGetBestSize() const
     Rect bestsize = { 0 , 0 , 0 , 0 } ;
 
     // try the built-in best size if available
     Rect bestsize = { 0 , 0 , 0 , 0 } ;
 
     // try the built-in best size if available

-    Boolean former = m_peer->GetData<Boolean>( kControlStaticTextIsMultilineTag);
-    m_peer->SetData( kControlStaticTextIsMultilineTag, (Boolean)0 );
-    m_peer->GetBestRect( &bestsize ) ;
-    m_peer->SetData( kControlStaticTextIsMultilineTag, former );
+    Boolean former = GetPeer()->GetData<Boolean>( kControlStaticTextIsMultilineTag);
+    GetPeer()->SetData( kControlStaticTextIsMultilineTag, (Boolean)0 );
+    GetPeer()->GetBestRect( &bestsize ) ;
+    GetPeer()->SetData( kControlStaticTextIsMultilineTag, former );

     if ( !EmptyRect( &bestsize ) )
     {
         bounds.h = bestsize.right - bestsize.left ;
     if ( !EmptyRect( &bestsize ) )
     {
         bounds.h = bestsize.right - bestsize.left ;


@@ -62,7 +62,7 @@ wxSize wxStaticText::DoGetBestSize() const
     {
 #if wxOSX_USE_CARBON
         ControlFontStyleRec controlFont;
     {
 #if wxOSX_USE_CARBON
         ControlFontStyleRec controlFont;

-        OSStatus err = m_peer->GetData<ControlFontStyleRec>( kControlEntireControl, kControlFontStyleTag, &controlFont );
+        OSStatus err = GetPeer()->GetData<ControlFontStyleRec>( kControlEntireControl, kControlFontStyleTag, &controlFont );

         verify_noerr( err );
 
 #if wxOSX_USE_ATSU_TEXT
         verify_noerr( err );
 
 #if wxOSX_USE_ATSU_TEXT

diff --git a/src/osx/carbon/toolbar.cpp b/src/osx/carbon/toolbar.cpp
index 08917a2f28b643336acfc2e33494d9bd44e34da9..f0576260c5311d9889ba8e392a4cfa6046864263 100644 (file)
--- a/src/osx/carbon/toolbar.cpp
+++ b/src/osx/carbon/toolbar.cpp
@@ -1118,9 +1118,9 @@ bool wxToolBar::MacInstallNativeToolbar(bool usesNative)
 
             SetAutomaticControlDragTrackingEnabledForWindow( tlw, true );
 
 
             SetAutomaticControlDragTrackingEnabledForWindow( tlw, true );
 

-            m_peer->Move(0,0,0,0 );
+            GetPeer()->Move(0,0,0,0 );

             SetSize( wxSIZE_AUTO_WIDTH, 0 );
             SetSize( wxSIZE_AUTO_WIDTH, 0 );

-            m_peer->SetVisibility( false );
+            GetPeer()->SetVisibility( false );

             wxToolBarBase::Show( false );
         }
     }
             wxToolBarBase::Show( false );
         }
     }


@@ -1135,7 +1135,7 @@ bool wxToolBar::MacInstallNativeToolbar(bool usesNative)
             ChangeWindowAttributes( tlw, 0, kWindowToolbarButtonAttribute );
             MacUninstallNativeToolbar();
 
             ChangeWindowAttributes( tlw, 0, kWindowToolbarButtonAttribute );
             MacUninstallNativeToolbar();
 

-            m_peer->SetVisibility( true );
+            GetPeer()->SetVisibility( true );

         }
     }
 
         }
     }
 

diff --git a/src/osx/checkbox_osx.cpp b/src/osx/checkbox_osx.cpp
index 3a7283396173620966edd95d658307ae49493628..1c4142f17d0f338d35546508c9415fca29a9ef97 100644 (file)
--- a/src/osx/checkbox_osx.cpp
+++ b/src/osx/checkbox_osx.cpp
@@ -36,7 +36,7 @@ bool wxCheckBox::Create(wxWindow *parent,
     m_labelOrig = m_label = label ;
 
     WXValidateStyle( &style );
     m_labelOrig = m_label = label ;
 
     WXValidateStyle( &style );

-    m_peer = wxWidgetImpl::CreateCheckBox( this, parent, id, label, pos, size, style, GetExtraStyle() ) ;
+    SetPeer(wxWidgetImpl::CreateCheckBox( this, parent, id, label, pos, size, style, GetExtraStyle() )) ;

 
     MacPostControlCreate(pos, size) ;
 
 
     MacPostControlCreate(pos, size) ;
 


@@ -72,12 +72,12 @@ void wxCheckBox::Command(wxCommandEvent & event)
 
 wxCheckBoxState wxCheckBox::DoGet3StateValue() const
 {
 
 wxCheckBoxState wxCheckBox::DoGet3StateValue() const
 {

-    return (wxCheckBoxState)m_peer->GetValue() ;
+    return (wxCheckBoxState)GetPeer()->GetValue() ;

 }
 
 void wxCheckBox::DoSet3StateValue(wxCheckBoxState val)
 {
 }
 
 void wxCheckBox::DoSet3StateValue(wxCheckBoxState val)
 {

-    m_peer->SetValue( val ) ;
+    GetPeer()->SetValue( val ) ;

 }
 
 bool wxCheckBox::OSXHandleClicked( double WXUNUSED(timestampsec) )
 }
 
 bool wxCheckBox::OSXHandleClicked( double WXUNUSED(timestampsec) )


@@ -85,7 +85,7 @@ bool wxCheckBox::OSXHandleClicked( double WXUNUSED(timestampsec) )
     bool sendEvent = true;
     wxCheckBoxState newState = Get3StateValue();
 
     bool sendEvent = true;
     wxCheckBoxState newState = Get3StateValue();
 

-    if ( !m_peer->ButtonClickDidStateChange() )
+    if ( !GetPeer()->ButtonClickDidStateChange() )

     {
         wxCheckBoxState origState ;
 
     {
         wxCheckBoxState origState ;
 

diff --git a/src/osx/choice_osx.cpp b/src/osx/choice_osx.cpp
index 28af5cdf2c0dcb8e3b8c40a3693ee1745ac5b632..c0540c58a3370ee8080071bb28fbc2bafa24fde6 100644 (file)
--- a/src/osx/choice_osx.cpp
+++ b/src/osx/choice_osx.cpp
@@ -74,7 +74,7 @@ bool wxChoice::Create(wxWindow *parent,
     m_popUpMenu = new wxMenu();
     m_popUpMenu->SetNoEventsMode(true);
 
     m_popUpMenu = new wxMenu();
     m_popUpMenu->SetNoEventsMode(true);
 

-    m_peer = wxWidgetImpl::CreateChoice( this, parent, id, m_popUpMenu, pos, size, style, GetExtraStyle() );
+    SetPeer(wxWidgetImpl::CreateChoice( this, parent, id, m_popUpMenu, pos, size, style, GetExtraStyle() ));

 
     MacPostControlCreate( pos, size );
 
 
     MacPostControlCreate( pos, size );
 


@@ -132,7 +132,7 @@ int wxChoice::DoInsertItems(const wxArrayStringsAdapter & items,
         AssignNewItemClientData(idx, clientData, i, type);
     }
 
         AssignNewItemClientData(idx, clientData, i, type);
     }
 

-    m_peer->SetMaximum( GetCount() );
+    GetPeer()->SetMaximum( GetCount() );

 
     return pos - 1;
 }
 
     return pos - 1;
 }


@@ -148,7 +148,7 @@ void wxChoice::DoDeleteOneItem(unsigned int n)
 
     m_strings.RemoveAt( n ) ;
     m_datas.RemoveAt( n ) ;
 
     m_strings.RemoveAt( n ) ;
     m_datas.RemoveAt( n ) ;

-    m_peer->SetMaximum( GetCount() ) ;
+    GetPeer()->SetMaximum( GetCount() ) ;

 
 }
 
 
 }
 


@@ -162,7 +162,7 @@ void wxChoice::DoClear()
     m_strings.Empty() ;
     m_datas.Empty() ;
 
     m_strings.Empty() ;
     m_datas.Empty() ;
 

-    m_peer->SetMaximum( 0 ) ;
+    GetPeer()->SetMaximum( 0 ) ;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -170,12 +170,12 @@ void wxChoice::DoClear()
 // ----------------------------------------------------------------------------
 int wxChoice::GetSelection() const
 {
 // ----------------------------------------------------------------------------
 int wxChoice::GetSelection() const
 {

-    return m_peer->GetValue();
+    return GetPeer()->GetValue();

 }
 
 void wxChoice::SetSelection( int n )
 {
 }
 
 void wxChoice::SetSelection( int n )
 {

-    m_peer->SetValue( n );
+    GetPeer()->SetValue( n );

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

diff --git a/src/osx/cocoa/button.mm b/src/osx/cocoa/button.mm
index 2eb0889fe250f7d0d224471f34246173550f4187..7350cef3f3b360d474e16ac398482b165f8d5e99 100644 (file)
--- a/src/osx/cocoa/button.mm
+++ b/src/osx/cocoa/button.mm
@@ -32,7 +32,7 @@ wxSize wxButton::DoGetBestSize() const
         return wxSize( 23 , 23 ) ;
 
     wxRect r ;
         return wxSize( 23 , 23 ) ;
 
     wxRect r ;

-    m_peer->GetBestRect(&r);
+    GetPeer()->GetBestRect(&r);

 
     wxSize sz = r.GetSize();
     sz.x  = sz.x  + MacGetLeftBorderSize() +
 
     wxSize sz = r.GetSize();
     sz.x  = sz.x  + MacGetLeftBorderSize() +

diff --git a/src/osx/cocoa/notebook.mm b/src/osx/cocoa/notebook.mm
index 5dff77fb3c424862c7c28ec8246d5894124b49c4..b409af77b7058a5deda213c3d2309147c3fe1e92 100644 (file)
--- a/src/osx/cocoa/notebook.mm
+++ b/src/osx/cocoa/notebook.mm
@@ -221,7 +221,7 @@ public:
     m_peer = new wxMacControl( this );
     OSStatus err = CreateTabsControl(
         MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds,
     m_peer = new wxMacControl( this );
     OSStatus err = CreateTabsControl(
         MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds,

-        tabsize, tabstyle, 0, NULL, m_peer->GetControlRefAddr() );
+        tabsize, tabstyle, 0, NULL, GetPeer()->GetControlRefAddr() );

     verify_noerr( err );
 #endif
 */
     verify_noerr( err );
 #endif
 */

diff --git a/src/osx/cocoa/toolbar.mm b/src/osx/cocoa/toolbar.mm
index f1233ce809525ba5c5a390f94bb0f33cc0971b04..02ac8d591e72054c5d9c59ef2b9a00ce453ee8e6 100644 (file)
--- a/src/osx/cocoa/toolbar.mm
+++ b/src/osx/cocoa/toolbar.mm
@@ -841,9 +841,9 @@ bool wxToolBar::MacInstallNativeToolbar(bool usesNative)
             [tlw setToolbar:(NSToolbar*) m_macToolbar];
             [(NSToolbar*) m_macToolbar setVisible:YES];
 
             [tlw setToolbar:(NSToolbar*) m_macToolbar];
             [(NSToolbar*) m_macToolbar setVisible:YES];
 

-            m_peer->Move(0,0,0,0 );
+            GetPeer()->Move(0,0,0,0 );

             SetSize( wxSIZE_AUTO_WIDTH, 0 );
             SetSize( wxSIZE_AUTO_WIDTH, 0 );

-            m_peer->SetVisibility( false );
+            GetPeer()->SetVisibility( false );

             wxToolBarBase::Show( false );
         }
     }
             wxToolBarBase::Show( false );
         }
     }


@@ -855,7 +855,7 @@ bool wxToolBar::MacInstallNativeToolbar(bool usesNative)
             bResult = true;
             [(NSToolbar*) m_macToolbar setVisible:NO];
             MacUninstallNativeToolbar();
             bResult = true;
             [(NSToolbar*) m_macToolbar setVisible:NO];
             MacUninstallNativeToolbar();

-            m_peer->SetVisibility( true );
+            GetPeer()->SetVisibility( true );

         }
     }
 
         }
     }
 

diff --git a/src/osx/combobox_osx.cpp b/src/osx/combobox_osx.cpp
index bf092f3772fdfacb043e0bbe96e6ae5fc4c3e95e..1d4529bbbcf1ad62cdac2e94eead12dd3b801ee8 100644 (file)
--- a/src/osx/combobox_osx.cpp
+++ b/src/osx/combobox_osx.cpp
@@ -64,7 +64,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
     wxASSERT_MSG( !(style & wxCB_SORT),
                   "wxCB_SORT not currently supported by wxOSX/Cocoa");
 
     wxASSERT_MSG( !(style & wxCB_SORT),
                   "wxCB_SORT not currently supported by wxOSX/Cocoa");
 

-    m_peer = wxWidgetImpl::CreateComboBox( this, parent, id, NULL, pos, size, style, GetExtraStyle() );
+    SetPeer(wxWidgetImpl::CreateComboBox( this, parent, id, NULL, pos, size, style, GetExtraStyle() ));

 
     MacPostControlCreate( pos, size );
 
 
     MacPostControlCreate( pos, size );
 


@@ -110,7 +110,7 @@ int wxComboBox::DoInsertItems(const wxArrayStringsAdapter& items,
         AssignNewItemClientData(idx, clientData, i, type);
     }
 
         AssignNewItemClientData(idx, clientData, i, type);
     }
 

-    m_peer->SetMaximum( GetCount() );
+    GetPeer()->SetMaximum( GetCount() );

 
     return pos - 1;
 }
 
     return pos - 1;
 }


@@ -216,7 +216,7 @@ bool wxComboBox::OSXHandleClicked( double WXUNUSED(timestampsec) )
 
 wxComboWidgetImpl* wxComboBox::GetComboPeer() const
 {
 
 wxComboWidgetImpl* wxComboBox::GetComboPeer() const
 {

-    return dynamic_cast<wxComboWidgetImpl*> (m_peer);
+    return dynamic_cast<wxComboWidgetImpl*> (GetPeer());

 }
 
 #endif // wxUSE_COMBOBOX && wxOSX_USE_COCOA
 }
 
 #endif // wxUSE_COMBOBOX && wxOSX_USE_COCOA

diff --git a/src/osx/dataview_osx.cpp b/src/osx/dataview_osx.cpp
index 6a15bd3aeb2febeeaa320e52d5e207d976635db8..9d2ea7506c2a961df271232264618443a88d7639 100644 (file)
--- a/src/osx/dataview_osx.cpp
+++ b/src/osx/dataview_osx.cpp
@@ -365,7 +365,7 @@ bool wxDataViewCtrl::Create(wxWindow *parent,
 {
   if (!(wxControl::Create(parent,id,pos,size,style,validator,name)))
     return false;
 {
   if (!(wxControl::Create(parent,id,pos,size,style,validator,name)))
     return false;

-  m_peer = ::CreateDataView(this,parent,id,pos,size,style,GetExtraStyle());
+  SetPeer(::CreateDataView(this,parent,id,pos,size,style,GetExtraStyle()));

 
   MacPostControlCreate(pos,size);
 
 
   MacPostControlCreate(pos,size);
 

diff --git a/src/osx/gauge_osx.cpp b/src/osx/gauge_osx.cpp
index 284d7fc66697851959a0bcfa6d5c377abcf16f9d..d8cd4a35ff6cdb0656a39028dabb766bf87886eb 100644 (file)
--- a/src/osx/gauge_osx.cpp
+++ b/src/osx/gauge_osx.cpp
@@ -33,7 +33,7 @@ bool wxGauge::Create( wxWindow *parent,
 
     wxSize size = s;
 
 
     wxSize size = s;
 

-    m_peer = wxWidgetImpl::CreateGauge( this, parent, id, GetValue() , 0, GetRange(), pos, size, style, GetExtraStyle() );
+    SetPeer(wxWidgetImpl::CreateGauge( this, parent, id, GetValue() , 0, GetRange(), pos, size, style, GetExtraStyle() ));

 
     MacPostControlCreate( pos, size );
 
 
     MacPostControlCreate( pos, size );
 


@@ -45,8 +45,8 @@ void wxGauge::SetRange(int r)
     // we are going via the base class in case there is
     // some change behind the values by it
     wxGaugeBase::SetRange( r ) ;
     // we are going via the base class in case there is
     // some change behind the values by it
     wxGaugeBase::SetRange( r ) ;

-    if ( m_peer )
-        m_peer->SetMaximum( GetRange() ) ;
+    if ( GetPeer() )
+        GetPeer()->SetMaximum( GetRange() ) ;

 }
 
 void wxGauge::SetValue(int pos)
 }
 
 void wxGauge::SetValue(int pos)


@@ -55,8 +55,8 @@ void wxGauge::SetValue(int pos)
     // some change behind the values by it
     wxGaugeBase::SetValue( pos ) ;
 
     // some change behind the values by it
     wxGaugeBase::SetValue( pos ) ;
 

-    if ( m_peer )
-        m_peer->SetValue( GetValue() ) ;
+    if ( GetPeer() )
+        GetPeer()->SetValue( GetValue() ) ;

 }
 
 int wxGauge::GetValue() const
 }
 
 int wxGauge::GetValue() const


@@ -66,7 +66,7 @@ int wxGauge::GetValue() const
 
 void wxGauge::Pulse()
 {
 
 void wxGauge::Pulse()
 {

-    m_peer->PulseGauge();
+    GetPeer()->PulseGauge();

 }
 
 #endif // wxUSE_GAUGE
 }
 
 #endif // wxUSE_GAUGE

diff --git a/src/osx/listbox_osx.cpp b/src/osx/listbox_osx.cpp
index 624eb806ff1240f02dffb87961ce7bfd64dd622e..a784aed42644cd6e89e8d09e43a89a1966f379db 100644 (file)
--- a/src/osx/listbox_osx.cpp
+++ b/src/osx/listbox_osx.cpp
@@ -85,7 +85,7 @@ bool wxListBox::Create(
     else
         m_strings.unsorted = new wxArrayString;
 
     else
         m_strings.unsorted = new wxArrayString;
 

-    m_peer = wxWidgetImpl::CreateListBox( this, parent, id, pos, size, style, GetExtraStyle() );
+    SetPeer(wxWidgetImpl::CreateListBox( this, parent, id, pos, size, style, GetExtraStyle() ));

 
     MacPostControlCreate( pos, size );
 
 
     MacPostControlCreate( pos, size );
 


@@ -106,7 +106,7 @@ wxListBox::~wxListBox()
     m_blockEvents = false;
 
     // make sure no native events get sent to a object in destruction
     m_blockEvents = false;
 
     // make sure no native events get sent to a object in destruction

-    wxDELETE(m_peer);
+    SetPeer(NULL);

 
     if ( IsSorted() )
         delete m_strings.sorted;
 
     if ( IsSorted() )
         delete m_strings.sorted;

diff --git a/src/osx/menu_osx.cpp b/src/osx/menu_osx.cpp
index ea540533083db916fccd5c9a6c7d30f48fdcbbbd..a24b9c291008e40f09a9b7cfe0e9d02730b348ec 100644 (file)
--- a/src/osx/menu_osx.cpp
+++ b/src/osx/menu_osx.cpp
@@ -111,7 +111,7 @@ void wxMenu::SetNoEventsMode( bool noEvents )
 bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
 {
     wxASSERT_MSG( pItem != NULL, wxT("can't append NULL item to the menu") );
 bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
 {
     wxASSERT_MSG( pItem != NULL, wxT("can't append NULL item to the menu") );

-    m_peer->InsertOrAppend( pItem, pos );
+    GetPeer()->InsertOrAppend( pItem, pos );

 
     if ( pItem->IsSeparator() )
     {
 
     if ( pItem->IsSeparator() )
     {


@@ -228,7 +228,7 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
 
     wxOSXMenuRemoveItem(m_hMenu , pos );
     */
 
     wxOSXMenuRemoveItem(m_hMenu , pos );
     */

-    m_peer->Remove( item );
+    GetPeer()->Remove( item );

     // and from internal data structures
     return wxMenuBase::DoRemove(item);
 }
     // and from internal data structures
     return wxMenuBase::DoRemove(item);
 }


@@ -236,7 +236,7 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
 void wxMenu::SetTitle(const wxString& label)
 {
     m_title = label ;
 void wxMenu::SetTitle(const wxString& label)
 {
     m_title = label ;

-    m_peer->SetTitle( wxStripMenuCodes( label ) );
+    GetPeer()->SetTitle( wxStripMenuCodes( label ) );

 }
 
 bool wxMenu::ProcessCommand(wxCommandEvent & event)
 }
 
 bool wxMenu::ProcessCommand(wxCommandEvent & event)

diff --git a/src/osx/menuitem_osx.cpp b/src/osx/menuitem_osx.cpp
index 3d83c083567993982042c354227807833758b3b5..ce44dbccbfed11c7460fcb1e1089b9a94dc84c2c 100644 (file)
--- a/src/osx/menuitem_osx.cpp
+++ b/src/osx/menuitem_osx.cpp
@@ -177,7 +177,7 @@ void wxMenuItem::UpdateItemBitmap()
 
     if ( m_bitmap.Ok() )
     {
 
     if ( m_bitmap.Ok() )
     {

-        m_peer->SetBitmap( m_bitmap );
+        GetPeer()->SetBitmap( m_bitmap );

     }
 }
 
     }
 }
 


@@ -190,11 +190,11 @@ void wxMenuItem::UpdateItemStatus()
         return ;
 
     if ( IsCheckable() && IsChecked() )
         return ;
 
     if ( IsCheckable() && IsChecked() )

-        m_peer->Check( true );
+        GetPeer()->Check( true );

     else
     else

-        m_peer->Check( false );
+        GetPeer()->Check( false );

 
 

-    m_peer->Enable( IsEnabled() );
+    GetPeer()->Enable( IsEnabled() );

 }
 
 void wxMenuItem::UpdateItemText()
 }
 
 void wxMenuItem::UpdateItemText()


@@ -210,7 +210,7 @@ void wxMenuItem::UpdateItemText()
     }
 
     wxAcceleratorEntry *entry = wxAcceleratorEntry::Create( m_text ) ;
     }
 
     wxAcceleratorEntry *entry = wxAcceleratorEntry::Create( m_text ) ;

-    m_peer->SetLabel( text, entry );
+    GetPeer()->SetLabel( text, entry );

     delete entry ;
 }
 
     delete entry ;
 }
 

diff --git a/src/osx/nonownedwnd_osx.cpp b/src/osx/nonownedwnd_osx.cpp
index e2543dff277eb3a9579cabba74ac094da9bbdc99..c3f981a100a5ac21bed9947246a718280cecd605 100644 (file)
--- a/src/osx/nonownedwnd_osx.cpp
+++ b/src/osx/nonownedwnd_osx.cpp
@@ -144,7 +144,7 @@ bool wxNonOwnedWindow::Create(wxWindow *parent,
                     name
                 );
     wxNonOwnedWindowImpl::Associate( m_nowpeer->GetWXWindow() , m_nowpeer ) ;
                     name
                 );
     wxNonOwnedWindowImpl::Associate( m_nowpeer->GetWXWindow() , m_nowpeer ) ;

-    m_peer = wxWidgetImpl::CreateContentView(this);
+    SetPeer(wxWidgetImpl::CreateContentView(this));

 
     DoSetWindowVariant( m_windowVariant ) ;
 
 
     DoSetWindowVariant( m_windowVariant ) ;
 


@@ -177,7 +177,7 @@ void wxNonOwnedWindow::SubclassWin(WXWindow nativeWindow)
     m_nowpeer = wxNonOwnedWindowImpl::CreateNonOwnedWindow(this, GetParent(), nativeWindow );
     m_isNativeWindowWrapper = true;
     wxNonOwnedWindowImpl::Associate( m_nowpeer->GetWXWindow() , m_nowpeer ) ;
     m_nowpeer = wxNonOwnedWindowImpl::CreateNonOwnedWindow(this, GetParent(), nativeWindow );
     m_isNativeWindowWrapper = true;
     wxNonOwnedWindowImpl::Associate( m_nowpeer->GetWXWindow() , m_nowpeer ) ;

-    m_peer = wxWidgetImpl::CreateContentView(this);
+    SetPeer(wxWidgetImpl::CreateContentView(this));

 }
 
 void wxNonOwnedWindow::UnsubclassWin()
 }
 
 void wxNonOwnedWindow::UnsubclassWin()


@@ -189,7 +189,7 @@ void wxNonOwnedWindow::UnsubclassWin()
 
     wxNonOwnedWindowImpl::RemoveAssociations(m_nowpeer) ;
     wxDELETE(m_nowpeer);
 
     wxNonOwnedWindowImpl::RemoveAssociations(m_nowpeer) ;
     wxDELETE(m_nowpeer);

-    wxDELETE(m_peer);
+    SetPeer(NULL);

     m_isNativeWindowWrapper = false;
 }
 
     m_isNativeWindowWrapper = false;
 }
 


@@ -471,7 +471,7 @@ void wxNonOwnedWindow::DoGetClientSize( int *width, int *height ) const
     // inner area, while the content area extends under the translucent
     // status bar, therefore we use the content view's area
 #ifdef __WXOSX_IPHONE__
     // inner area, while the content area extends under the translucent
     // status bar, therefore we use the content view's area
 #ifdef __WXOSX_IPHONE__

-    m_peer->GetContentArea(left, top, w, h);
+    GetPeer()->GetContentArea(left, top, w, h);

 #else
     m_nowpeer->GetContentArea(left, top, w, h);
 #endif
 #else
     m_nowpeer->GetContentArea(left, top, w, h);
 #endif

diff --git a/src/osx/notebook_osx.cpp b/src/osx/notebook_osx.cpp
index 7c65da46567d322965a3207efe21dc1987630644..f18f86dacf8df845400a925e89bce0eb076863af 100644 (file)
--- a/src/osx/notebook_osx.cpp
+++ b/src/osx/notebook_osx.cpp
@@ -53,7 +53,7 @@ bool wxNotebook::Create( wxWindow *parent,
     if ( !wxNotebookBase::Create( parent, id, pos, size, style, name ) )
         return false;
 
     if ( !wxNotebookBase::Create( parent, id, pos, size, style, name ) )
         return false;
 

-    m_peer = wxWidgetImpl::CreateTabView(this,parent, id, pos, size, style, GetExtraStyle() );
+    SetPeer(wxWidgetImpl::CreateTabView(this,parent, id, pos, size, style, GetExtraStyle() ));

 
     MacPostControlCreate( pos, size );
 
 
     MacPostControlCreate( pos, size );
 


@@ -235,7 +235,7 @@ bool wxNotebook::InsertPage(size_t nPage,
         m_selection++;
 
         // while this still is the same page showing, we need to update the tabs
         m_selection++;
 
         // while this still is the same page showing, we need to update the tabs

-        m_peer->SetValue( m_selection + 1 ) ;
+        GetPeer()->SetValue( m_selection + 1 ) ;

     }
 
     DoSetSelectionAfterInsertion(nPage, bSelect);
     }
 
     DoSetSelectionAfterInsertion(nPage, bSelect);


@@ -259,32 +259,32 @@ int wxNotebook::HitTest(const wxPoint& WXUNUSED(pt), long * WXUNUSED(flags)) con
 
     HIPoint hipoint= { adjustedPt.x , adjustedPt.y } ;
     HIViewPartCode outPart = 0 ;
 
     HIPoint hipoint= { adjustedPt.x , adjustedPt.y } ;
     HIViewPartCode outPart = 0 ;

-    OSStatus err = HIViewGetPartHit( m_peer->GetControlRef(), &hipoint, &outPart );
+    OSStatus err = HIViewGetPartHit( GetPeer()->GetControlRef(), &hipoint, &outPart );

 
 

-    int max = m_peer->GetMaximum() ;
+    int max = GetPeer()->GetMaximum() ;

     if ( outPart == 0 && max > 0 )
     {
         // this is a hack, as unfortunately a hit on an already selected tab returns 0,
         // so we have to go some extra miles to make sure we select something different
         // and try again ..
     if ( outPart == 0 && max > 0 )
     {
         // this is a hack, as unfortunately a hit on an already selected tab returns 0,
         // so we have to go some extra miles to make sure we select something different
         // and try again ..

-        int val = m_peer->GetValue() ;
+        int val = GetPeer()->GetValue() ;

         int maxval = max ;
         if ( max == 1 )
         {
         int maxval = max ;
         if ( max == 1 )
         {

-            m_peer->SetMaximum( 2 ) ;
+            GetPeer()->SetMaximum( 2 ) ;

             maxval = 2 ;
         }
 
         if ( val == 1 )
             maxval = 2 ;
         }
 
         if ( val == 1 )

-            m_peer->SetValue( maxval ) ;
+            GetPeer()->SetValue( maxval ) ;

         else
         else

-             m_peer->SetValue( 1 ) ;
+             GetPeer()->SetValue( 1 ) ;

 
 

-        err = HIViewGetPartHit( m_peer->GetControlRef(), &hipoint, &outPart );
+        err = HIViewGetPartHit( GetPeer()->GetControlRef(), &hipoint, &outPart );

 
 

-        m_peer->SetValue( val ) ;
+        GetPeer()->SetValue( val ) ;

         if ( max == 1 )
         if ( max == 1 )

-            m_peer->SetMaximum( 1 ) ;
+            GetPeer()->SetMaximum( 1 ) ;

     }
 
     if ( outPart >= 1 && outPart <= countPages )
     }
 
     if ( outPart >= 1 && outPart <= countPages )


@@ -311,7 +311,7 @@ int wxNotebook::HitTest(const wxPoint& WXUNUSED(pt), long * WXUNUSED(flags)) con
 //
 void wxNotebook::MacSetupTabs()
 {
 //
 void wxNotebook::MacSetupTabs()
 {

-    m_peer->SetupTabs(*this);
+    GetPeer()->SetupTabs(*this);

     Refresh();
 }
 
     Refresh();
 }
 


@@ -494,14 +494,14 @@ void wxNotebook::ChangePage(int nOldSel, int nSel)
     }
 
     m_selection = nSel;
     }
 
     m_selection = nSel;

-    m_peer->SetValue( m_selection + 1 ) ;
+    GetPeer()->SetValue( m_selection + 1 ) ;

 }
 
 bool wxNotebook::OSXHandleClicked( double WXUNUSED(timestampsec) )
 {
     bool status = false ;
 
 }
 
 bool wxNotebook::OSXHandleClicked( double WXUNUSED(timestampsec) )
 {
     bool status = false ;
 

-    SInt32 newSel = m_peer->GetValue() - 1 ;
+    SInt32 newSel = GetPeer()->GetValue() - 1 ;

     if ( newSel != m_selection )
     {
         wxBookCtrlEvent changing(
     if ( newSel != m_selection )
     {
         wxBookCtrlEvent changing(


@@ -520,7 +520,7 @@ bool wxNotebook::OSXHandleClicked( double WXUNUSED(timestampsec) )
         }
         else
         {
         }
         else
         {

-            m_peer->SetValue( m_selection + 1 ) ;
+            GetPeer()->SetValue( m_selection + 1 ) ;

         }
 
         status = true ;
         }
 
         status = true ;

diff --git a/src/osx/radiobox_osx.cpp b/src/osx/radiobox_osx.cpp
index 874381292c73f137ec41597c11a3c6e706812f31..ae1526b0a5f067ba48497a6d15a762e834711311 100644 (file)
--- a/src/osx/radiobox_osx.cpp
+++ b/src/osx/radiobox_osx.cpp
@@ -113,7 +113,7 @@ bool wxRadioBox::Create( wxWindow *parent,
 
     m_labelOrig = m_label = label;
 
 
     m_labelOrig = m_label = label;
 

-    m_peer = wxWidgetImpl::CreateGroupBox( this, parent, id, label, pos, size, style, GetExtraStyle() );
+    SetPeer(wxWidgetImpl::CreateGroupBox( this, parent, id, label, pos, size, style, GetExtraStyle() ));

 
     for (i = 0; i < n; i++)
     {
 
     for (i = 0; i < n; i++)
     {

diff --git a/src/osx/radiobut_osx.cpp b/src/osx/radiobut_osx.cpp
index 772a2601a6c9b0fef093f5b9bdaa1cfd768fea0f..0b93ecd662b784f7480ca420ee31c87d08a2ee13 100644 (file)
--- a/src/osx/radiobut_osx.cpp
+++ b/src/osx/radiobut_osx.cpp
@@ -32,7 +32,7 @@ bool wxRadioButton::Create( wxWindow *parent,
 
     m_labelOrig = m_label = label;
 
 
     m_labelOrig = m_label = label;
 

-    m_peer = wxWidgetImpl::CreateRadioButton( this, parent, id, label, pos, size, style, GetExtraStyle() );
+    SetPeer(wxWidgetImpl::CreateRadioButton( this, parent, id, label, pos, size, style, GetExtraStyle() ));

 
     MacPostControlCreate( pos, size );
 
 
     MacPostControlCreate( pos, size );
 


@@ -74,10 +74,10 @@ wxRadioButton::~wxRadioButton()
 void wxRadioButton::SetValue(bool val)
 {
     wxRadioButton *cycle;
 void wxRadioButton::SetValue(bool val)
 {
     wxRadioButton *cycle;

-    if (m_peer->GetValue() == val)
+    if (GetPeer()->GetValue() == val)

         return;
 
         return;
 

-    m_peer->SetValue( val );
+    GetPeer()->SetValue( val );

     if (val)
     {
         cycle = this->NextInCycle();
     if (val)
     {
         cycle = this->NextInCycle();


@@ -94,7 +94,7 @@ void wxRadioButton::SetValue(bool val)
 
 bool wxRadioButton::GetValue() const
 {
 
 bool wxRadioButton::GetValue() const
 {

-    return m_peer->GetValue() != 0;
+    return GetPeer()->GetValue() != 0;

 }
 
 void wxRadioButton::Command(wxCommandEvent& event)
 }
 
 void wxRadioButton::Command(wxCommandEvent& event)


@@ -105,7 +105,7 @@ void wxRadioButton::Command(wxCommandEvent& event)
 
 bool wxRadioButton::OSXHandleClicked( double WXUNUSED(timestampsec) )
 {
 
 bool wxRadioButton::OSXHandleClicked( double WXUNUSED(timestampsec) )
 {

-    if ( !m_peer->ButtonClickDidStateChange() )
+    if ( !GetPeer()->ButtonClickDidStateChange() )

     {
         // if already set -> no action
         if (GetValue())
     {
         // if already set -> no action
         if (GetValue())

diff --git a/src/osx/scrolbar_osx.cpp b/src/osx/scrolbar_osx.cpp
index 3842de56865884b74c4c00187c4c2d99655cc4a9..eb324b9e7aa2379cd08ad5f4e2f379c618f5f10c 100644 (file)
--- a/src/osx/scrolbar_osx.cpp
+++ b/src/osx/scrolbar_osx.cpp
@@ -40,7 +40,7 @@ bool wxScrollBar::Create( wxWindow *parent,
     if ( !wxControl::Create( parent, id, pos, size, style, validator, name ) )
         return false;
 
     if ( !wxControl::Create( parent, id, pos, size, style, validator, name ) )
         return false;
 

-    m_peer = wxWidgetImpl::CreateScrollBar( this, parent, id, pos, size, style, GetExtraStyle() );
+    SetPeer(wxWidgetImpl::CreateScrollBar( this, parent, id, pos, size, style, GetExtraStyle() ));

 
     MacPostControlCreate( pos, size );
 
 
     MacPostControlCreate( pos, size );
 


@@ -53,12 +53,12 @@ wxScrollBar::~wxScrollBar()
 
 void wxScrollBar::SetThumbPosition( int viewStart )
 {
 
 void wxScrollBar::SetThumbPosition( int viewStart )
 {

-    m_peer->SetScrollThumb( viewStart, m_viewSize );
+    GetPeer()->SetScrollThumb( viewStart, m_viewSize );

 }
 
 int wxScrollBar::GetThumbPosition() const
 {
 }
 
 int wxScrollBar::GetThumbPosition() const
 {

-    return m_peer->GetValue();
+    return GetPeer()->GetValue();

 }
 
 void wxScrollBar::SetScrollbar( int position,
 }
 
 void wxScrollBar::SetScrollbar( int position,


@@ -73,8 +73,8 @@ void wxScrollBar::SetScrollbar( int position,
 
    int range1 = wxMax( (m_objectSize - m_viewSize), 0 );
 
 
    int range1 = wxMax( (m_objectSize - m_viewSize), 0 );
 

-   m_peer->SetMaximum( range1 );
-   m_peer->SetScrollThumb( position, m_viewSize );
+   GetPeer()->SetMaximum( range1 );
+   GetPeer()->SetScrollThumb( position, m_viewSize );

 }
 
 void wxScrollBar::Command( wxCommandEvent& event )
 }
 
 void wxScrollBar::Command( wxCommandEvent& event )


@@ -85,7 +85,7 @@ void wxScrollBar::Command( wxCommandEvent& event )
 
 bool wxScrollBar::OSXHandleClicked( double WXUNUSED(timestampsec) )
 {
 
 bool wxScrollBar::OSXHandleClicked( double WXUNUSED(timestampsec) )
 {

-    int new_pos = m_peer->GetValue();
+    int new_pos = GetPeer()->GetValue();

 
     wxScrollEvent event( wxEVT_SCROLL_THUMBRELEASE, m_windowId );
     if ( m_windowStyle & wxHORIZONTAL )
 
     wxScrollEvent event( wxEVT_SCROLL_THUMBRELEASE, m_windowId );
     if ( m_windowStyle & wxHORIZONTAL )


@@ -127,9 +127,9 @@ wxSize wxScrollBar::DoGetBestSize() const
 
 void wxScrollBar::TriggerScrollEvent( wxEventType scrollEvent )
 {
 
 void wxScrollBar::TriggerScrollEvent( wxEventType scrollEvent )
 {

-    int position = m_peer->GetValue();
+    int position = GetPeer()->GetValue();

     int minPos = 0 ;
     int minPos = 0 ;

-    int maxPos = m_peer->GetMaximum();
+    int maxPos = GetPeer()->GetMaximum();

     int nScrollInc = 0;
 
     if ( scrollEvent == wxEVT_SCROLL_LINEUP )
     int nScrollInc = 0;
 
     if ( scrollEvent == wxEVT_SCROLL_LINEUP )

diff --git a/src/osx/slider_osx.cpp b/src/osx/slider_osx.cpp
index ef3a7f1b7d636cb9a675835374b9b6e12db7786f..dffe5eb2d2241bccf2e5d343a74206c0f9aedd7e 100644 (file)
--- a/src/osx/slider_osx.cpp
+++ b/src/osx/slider_osx.cpp
@@ -103,7 +103,7 @@ bool wxSlider::Create(wxWindow *parent,
     if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
         return false;
 
     if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
         return false;
 

-    m_peer = wxWidgetImpl::CreateSlider( this, parent, id, value, minValue, maxValue, pos, size, style, GetExtraStyle() );
+    SetPeer(wxWidgetImpl::CreateSlider( this, parent, id, value, minValue, maxValue, pos, size, style, GetExtraStyle() ));

 
     if (style & wxSL_VERTICAL)
         // Forces SetSize to use the proper width
 
     if (style & wxSL_VERTICAL)
         // Forces SetSize to use the proper width


@@ -146,7 +146,7 @@ wxSlider::~wxSlider()
 int wxSlider::GetValue() const
 {
     // We may need to invert the value returned by the widget
 int wxSlider::GetValue() const
 {
     // We may need to invert the value returned by the widget

-    return ValueInvertOrNot( m_peer->GetValue() ) ;
+    return ValueInvertOrNot( GetPeer()->GetValue() ) ;

 }
 
 void wxSlider::SetValue(int value)
 }
 
 void wxSlider::SetValue(int value)


@@ -159,7 +159,7 @@ void wxSlider::SetValue(int value)
     }
 
     // We only invert for the setting of the actual native widget
     }
 
     // We only invert for the setting of the actual native widget

-    m_peer->SetValue( ValueInvertOrNot( value ) );
+    GetPeer()->SetValue( ValueInvertOrNot( value ) );

 }
 
 void wxSlider::SetRange(int minValue, int maxValue)
 }
 
 void wxSlider::SetRange(int minValue, int maxValue)


@@ -175,8 +175,8 @@ void wxSlider::SetRange(int minValue, int maxValue)
     m_rangeMin = minValue;
     m_rangeMax = maxValue;
 
     m_rangeMin = minValue;
     m_rangeMax = maxValue;
 

-    m_peer->SetMinimum( m_rangeMin );
-    m_peer->SetMaximum( m_rangeMax );
+    GetPeer()->SetMinimum( m_rangeMin );
+    GetPeer()->SetMaximum( m_rangeMax );

 
     if (m_macMinimumStatic)
     {
 
     if (m_macMinimumStatic)
     {


@@ -288,7 +288,7 @@ void wxSlider::TriggerScrollEvent( wxEventType scrollEvent)
 {
     // Whatever the native value is, we may need to invert it for calling
     // SetValue and putting the possibly inverted value in the event
 {
     // Whatever the native value is, we may need to invert it for calling
     // SetValue and putting the possibly inverted value in the event

-    int value = ValueInvertOrNot( m_peer->GetValue() );
+    int value = ValueInvertOrNot( GetPeer()->GetValue() );

 
     SetValue( value );
 
 
     SetValue( value );
 


@@ -436,7 +436,7 @@ void wxSlider::DoSetSize(int x, int y, int w, int h, int sizeFlags)
 
         if (GetWindowStyle() & wxSL_VERTICAL)
             // If vertical, use current value
 
         if (GetWindowStyle() & wxSL_VERTICAL)
             // If vertical, use current value

-            text.Printf(wxT("%d"), (int)m_peer->GetValue());
+            text.Printf(wxT("%d"), (int)GetPeer()->GetValue());

         else
             // Use max so that the current value doesn't drift as centering would need to change
             text.Printf(wxT("%d"), m_rangeMax);
         else
             // Use max so that the current value doesn't drift as centering would need to change
             text.Printf(wxT("%d"), m_rangeMax);

diff --git a/src/osx/spinbutt_osx.cpp b/src/osx/spinbutt_osx.cpp
index 5e3408d5193c62b6fdf37f2c2d808fd9873acaa8..92bc682b9ae9af11d70bbf14c35afb0f824dbe1f 100644 (file)
--- a/src/osx/spinbutt_osx.cpp
+++ b/src/osx/spinbutt_osx.cpp
@@ -37,8 +37,8 @@ bool wxSpinButton::Create( wxWindow *parent,
     if (!parent)
         return false;
 
     if (!parent)
         return false;
 

-    m_peer = wxWidgetImpl::CreateSpinButton( this , parent, id, 0, m_min, m_max, pos, size,
-        style, GetExtraStyle() );
+    SetPeer(wxWidgetImpl::CreateSpinButton( this , parent, id, 0, m_min, m_max, pos, size,
+        style, GetExtraStyle() ));

 
     MacPostControlCreate( pos, size );
 
 
     MacPostControlCreate( pos, size );
 


@@ -51,20 +51,20 @@ wxSpinButton::~wxSpinButton()
 
 void wxSpinButton::SetValue( int val )
 {
 
 void wxSpinButton::SetValue( int val )
 {

-    m_peer->SetValue( val );
+    GetPeer()->SetValue( val );

 }
 
 int wxSpinButton::GetValue() const
 {
 }
 
 int wxSpinButton::GetValue() const
 {

-    return m_peer->GetValue();
+    return GetPeer()->GetValue();

 }
 
 void wxSpinButton::SetRange(int minVal, int maxVal)
 {
     m_min = minVal;
     m_max = maxVal;
 }
 
 void wxSpinButton::SetRange(int minVal, int maxVal)
 {
     m_min = minVal;
     m_max = maxVal;

-    m_peer->SetMaximum( maxVal );
-    m_peer->SetMinimum( minVal );
+    GetPeer()->SetMaximum( maxVal );
+    GetPeer()->SetMinimum( minVal );

 }
 
 void wxSpinButton::SendThumbTrackEvent()
 }
 
 void wxSpinButton::SendThumbTrackEvent()


@@ -143,7 +143,7 @@ void wxSpinButton::TriggerScrollEvent(wxEventType scrollEvent)
             newValue = oldValue;
     }
 
             newValue = oldValue;
     }
 

-    m_peer->SetValue( newValue );
+    GetPeer()->SetValue( newValue );

 
     // always send a thumbtrack event
     SendThumbTrackEvent() ;
 
     // always send a thumbtrack event
     SendThumbTrackEvent() ;

diff --git a/src/osx/srchctrl_osx.cpp b/src/osx/srchctrl_osx.cpp
index 58cc5313ec9f3b02404c4d503fba602653cbbec4..f62ecd530ec5036075e6c7bf753e79047798d2ff 100644 (file)
--- a/src/osx/srchctrl_osx.cpp
+++ b/src/osx/srchctrl_osx.cpp
@@ -68,7 +68,7 @@ void wxSearchCtrl::Init()
 
 wxSearchWidgetImpl* wxSearchCtrl::GetSearchPeer() const
 {
 
 wxSearchWidgetImpl* wxSearchCtrl::GetSearchPeer() const
 {

-    return dynamic_cast<wxSearchWidgetImpl*> (m_peer);
+    return dynamic_cast<wxSearchWidgetImpl*> (GetPeer());

 }
 
 wxSearchCtrl::~wxSearchCtrl()
 }
 
 wxSearchCtrl::~wxSearchCtrl()


@@ -185,7 +185,7 @@ bool wxSearchCtrl::Create(wxWindow *parent, wxWindowID id,
     }
 
 
     }
 
 

-    m_peer = wxWidgetImpl::CreateSearchControl( this, GetParent(), GetId(), value, pos, size, style, GetExtraStyle() );
+    SetPeer(wxWidgetImpl::CreateSearchControl( this, GetParent(), GetId(), value, pos, size, style, GetExtraStyle() ));

 
     MacPostControlCreate(pos, size) ;
 
 
     MacPostControlCreate(pos, size) ;
 

diff --git a/src/osx/statbox_osx.cpp b/src/osx/statbox_osx.cpp
index c093cd384fa2e96e4ee57c626b6a044d009c0f4b..2db314f9fce94bc9ab6a010430ed1ce1d79db9ae 100644 (file)
--- a/src/osx/statbox_osx.cpp
+++ b/src/osx/statbox_osx.cpp
@@ -31,7 +31,7 @@ bool wxStaticBox::Create( wxWindow *parent,
 
     m_labelOrig = m_label = label;
 
 
     m_labelOrig = m_label = label;
 

-    m_peer = wxWidgetImpl::CreateGroupBox( this, parent, id, label, pos, size, style, GetExtraStyle() );
+    SetPeer(wxWidgetImpl::CreateGroupBox( this, parent, id, label, pos, size, style, GetExtraStyle() ));

 
     MacPostControlCreate( pos, size );
 
 
     MacPostControlCreate( pos, size );
 

diff --git a/src/osx/statline_osx.cpp b/src/osx/statline_osx.cpp
index 73e29957c743017604acebd39d1945020ccc55a1..0e4515c674e3ff1c4629c8caebb85773c441efb6 100644 (file)
--- a/src/osx/statline_osx.cpp
+++ b/src/osx/statline_osx.cpp
@@ -54,7 +54,7 @@ bool wxStaticLine::Create( wxWindow *parent,
                                    style, wxDefaultValidator, name) )
         return false;
 
                                    style, wxDefaultValidator, name) )
         return false;
 

-    m_peer = wxWidgetImpl::CreateStaticLine( this, parent, id, pos, size, style, GetExtraStyle() );
+    SetPeer(wxWidgetImpl::CreateStaticLine( this, parent, id, pos, size, style, GetExtraStyle() ));

 
     MacPostControlCreate(pos,size) ;
 
 
     MacPostControlCreate(pos,size) ;
 

diff --git a/src/osx/stattext_osx.cpp b/src/osx/stattext_osx.cpp
index 0ff943ff6d6e930d3409237f978c9e21f93aae3f..3f75f624911b069b9ad0aa6c5646715851320f3f 100644 (file)
--- a/src/osx/stattext_osx.cpp
+++ b/src/osx/stattext_osx.cpp
@@ -41,7 +41,7 @@ bool wxStaticText::Create( wxWindow *parent,
     if ( !wxControl::Create( parent, id, pos, size, style, wxDefaultValidator, name ) )
         return false;
 
     if ( !wxControl::Create( parent, id, pos, size, style, wxDefaultValidator, name ) )
         return false;
 

-    m_peer = wxWidgetImpl::CreateStaticText( this, parent, id, label, pos, size, style, GetExtraStyle() );
+    SetPeer(wxWidgetImpl::CreateStaticText( this, parent, id, label, pos, size, style, GetExtraStyle() ));

 
     MacPostControlCreate( pos, size );
 
 
     MacPostControlCreate( pos, size );
 


@@ -101,7 +101,7 @@ bool wxStaticText::SetFont(const wxFont& font)
 void wxStaticText::DoSetLabel(const wxString& label)
 {
     m_label = RemoveMnemonics(label);
 void wxStaticText::DoSetLabel(const wxString& label)
 {
     m_label = RemoveMnemonics(label);

-    m_peer->SetLabel(m_label , GetFont().GetEncoding() );
+    GetPeer()->SetLabel(m_label , GetFont().GetEncoding() );

 }
 
 #if wxUSE_MARKUP && wxOSX_USE_COCOA
 }
 
 #if wxUSE_MARKUP && wxOSX_USE_COCOA


@@ -111,7 +111,7 @@ bool wxStaticText::DoSetLabelMarkup(const wxString& markup)
     if ( !wxStaticTextBase::DoSetLabelMarkup(markup) )
         return false;
 
     if ( !wxStaticTextBase::DoSetLabelMarkup(markup) )
         return false;
 

-    m_peer->SetLabelMarkup(markup);
+    GetPeer()->SetLabelMarkup(markup);

 
     return true;
 }
 
     return true;
 }

diff --git a/src/osx/textctrl_osx.cpp b/src/osx/textctrl_osx.cpp
index 226c24f2a8dcf9be6ef09f1973dca284a2f34429..9baf7499890549e8edbffbc6294ff7227bdeb8a0 100644 (file)
--- a/src/osx/textctrl_osx.cpp
+++ b/src/osx/textctrl_osx.cpp
@@ -112,7 +112,7 @@ bool wxTextCtrl::Create( wxWindow *parent,
     }
 
 
     }
 
 

-    m_peer = wxWidgetImpl::CreateTextControl( this, GetParent(), GetId(), str, pos, size, style, GetExtraStyle() );
+    SetPeer(wxWidgetImpl::CreateTextControl( this, GetParent(), GetId(), str, pos, size, style, GetExtraStyle() ));

 
     MacPostControlCreate(pos, size) ;
 
 
     MacPostControlCreate(pos, size) ;
 

diff --git a/src/osx/tglbtn_osx.cpp b/src/osx/tglbtn_osx.cpp
index 9c5e02bfcfee3041a38655ed441eed0478682747..cc70d3aaecfdeb11c6ef0a0dc775af2af84adf7c 100644 (file)
--- a/src/osx/tglbtn_osx.cpp
+++ b/src/osx/tglbtn_osx.cpp
@@ -54,7 +54,7 @@ bool wxToggleButton::Create(wxWindow *parent, wxWindowID id,
 
     m_labelOrig = m_label = label ;
 
 
     m_labelOrig = m_label = label ;
 

-    m_peer = wxWidgetImpl::CreateToggleButton( this, parent, id, label, pos, size, style, GetExtraStyle() ) ;
+    SetPeer(wxWidgetImpl::CreateToggleButton( this, parent, id, label, pos, size, style, GetExtraStyle() )) ;

 
     MacPostControlCreate(pos,size) ;
 
 
     MacPostControlCreate(pos,size) ;
 


@@ -75,12 +75,12 @@ wxSize wxToggleButton::DoGetBestSize() const
 
 void wxToggleButton::SetValue(bool val)
 {
 
 void wxToggleButton::SetValue(bool val)
 {

-    m_peer->SetValue( val ) ;
+    GetPeer()->SetValue( val ) ;

 }
 
 bool wxToggleButton::GetValue() const
 {
 }
 
 bool wxToggleButton::GetValue() const
 {

-    return m_peer->GetValue() ;
+    return GetPeer()->GetValue() ;

 }
 
 void wxToggleButton::Command(wxCommandEvent & event)
 }
 
 void wxToggleButton::Command(wxCommandEvent & event)


@@ -121,7 +121,7 @@ bool wxBitmapToggleButton::Create(wxWindow *parent, wxWindowID id,
     if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
         return false;
 
     if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
         return false;
 

-    m_peer = wxWidgetImpl::CreateBitmapToggleButton( this, parent, id, label, pos, size, style, GetExtraStyle() ) ;
+    SetPeer(wxWidgetImpl::CreateBitmapToggleButton( this, parent, id, label, pos, size, style, GetExtraStyle() ));

 
     MacPostControlCreate(pos,size) ;
 
 
     MacPostControlCreate(pos,size) ;
 


@@ -142,12 +142,12 @@ wxSize wxBitmapToggleButton::DoGetBestSize() const
 
 void wxBitmapToggleButton::SetValue(bool val)
 {
 
 void wxBitmapToggleButton::SetValue(bool val)
 {

-    m_peer->SetValue( val ) ;
+    GetPeer()->SetValue( val ) ;

 }
 
 bool wxBitmapToggleButton::GetValue() const
 {
 }
 
 bool wxBitmapToggleButton::GetValue() const
 {

-    return m_peer->GetValue() ;
+    return GetPeer()->GetValue() ;

 }
 
 void wxBitmapToggleButton::Command(wxCommandEvent & event)
 }
 
 void wxBitmapToggleButton::Command(wxCommandEvent & event)

diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp
index 5e8dc2476379a14ef8896995fd1da4d3913c471b..9ae46ce412af370d03da43da4ebdbc573c514641 100644 (file)
--- a/src/osx/window_osx.cpp
+++ b/src/osx/window_osx.cpp
@@ -268,6 +268,13 @@ WXWidget wxWindowMac::GetHandle() const
     return NULL;
 }
 
     return NULL;
 }
 

+void wxWindowMac::SetPeer(wxOSXWidgetImpl* peer)
+{
+    wxDELETE(m_peer);
+    // todo event check handlers
+    m_peer = peer;
+}
+

 // ---------------------------------------------------------------------------
 // Utility Routines to move between different coordinate systems
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // Utility Routines to move between different coordinate systems
 // ---------------------------------------------------------------------------