native window disposal is moved to deferred delete, size of parent taken into account...

[wxWidgets.git] / src / mac / textctrl.cpp

diff --git a/src/mac/textctrl.cpp b/src/mac/textctrl.cpp
index 3b7918178b43240e3483b6c0e747fcdef92a82e6..451754201301468189c279c21bf26609448a61a2 100644 (file)
--- a/src/mac/textctrl.cpp
+++ b/src/mac/textctrl.cpp
@@ -752,7 +752,7 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
 
     if ( !m_macUsesTXN )
     {
 
     if ( !m_macUsesTXN )
     {

-           m_macControl = ::NewControl( (GrafPtr) parent->MacGetRootWindow() , &bounds , "\p" , true , 0 , 0 , 1, 
+           m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , "\p" , true , 0 , 0 , 1, 

                    (style & wxTE_PASSWORD) ? kControlEditTextPasswordProc : kControlEditTextProc , (long) this ) ;
                long size ;
         ::GetControlData((ControlHandle)  m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &((TEHandle) m_macTE) , &size ) ;
                    (style & wxTE_PASSWORD) ? kControlEditTextPasswordProc : kControlEditTextProc , (long) this ) ;
                long size ;
         ::GetControlData((ControlHandle)  m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &((TEHandle) m_macTE) , &size ) ;


@@ -766,7 +766,7 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
                 | kControlWantsActivate | kControlHandlesTracking | kControlHasSpecialBackground
                 | kControlGetsFocusOnClick | kControlSupportsLiveFeedback;
             /* create the control */
                 | kControlWantsActivate | kControlHandlesTracking | kControlHasSpecialBackground
                 | kControlGetsFocusOnClick | kControlSupportsLiveFeedback;
             /* create the control */

-        m_macControl = NewControl((GrafPtr) parent->MacGetRootWindow(), &bounds, "\p", true, featurSet, 0, featurSet, kControlUserPaneProc, 0);
+        m_macControl = NewControl(MAC_WXHWND(parent->MacGetRootWindow()), &bounds, "\p", true, featurSet, 0, featurSet, kControlUserPaneProc, 0);

             /* set up the mUP specific features and data */
        mUPOpenControl((ControlHandle) m_macControl, m_windowStyle & wxTE_MULTILINE );
        }
             /* set up the mUP specific features and data */
        mUPOpenControl((ControlHandle) m_macControl, m_windowStyle & wxTE_MULTILINE );
        }


@@ -1129,7 +1129,7 @@ void wxTextCtrl::WriteText(const wxString& text)
        }
        else
        {
        }
        else
        {

-       TXNSetData( ((TXNObject) m_macTXN), kTXNTextData,  (const char*)value, value.Length(),
+       TXNSetData( ((TXNObject) m_macTXN), kTXNTextData, (void*) (const char*)value, value.Length(),

          kTXNUseCurrentSelection, kTXNUseCurrentSelection);
        }
        MacRedrawControl() ;
          kTXNUseCurrentSelection, kTXNUseCurrentSelection);
        }
        MacRedrawControl() ;