adaption for CW 8.3 and quick hack for unicode text control size

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

diff --git a/src/x11/textctrl.cpp b/src/x11/textctrl.cpp
index 84b9ae0290e46edfaedf7dce324c5243f2a28d04..3b778c72a9fc4399ae95d3033d771b086f669dd6 100644 (file)
--- a/src/x11/textctrl.cpp
+++ b/src/x11/textctrl.cpp
@@ -157,8 +157,6 @@ void wxTextCtrl::Init()
     m_editable = TRUE;
     m_modified = FALSE;
     
     m_editable = TRUE;
     m_modified = FALSE;
     

-    m_undos.DeleteContents( TRUE );
-    

     m_lang = wxSOURCE_LANG_NONE;
     
     m_capturing = FALSE;
     m_lang = wxSOURCE_LANG_NONE;
     
     m_capturing = FALSE;


@@ -202,6 +200,11 @@ wxTextCtrl::wxTextCtrl( wxWindow *parent,
     Create( parent, id, value, pos, size, style, validator, name );
 }
 
     Create( parent, id, value, pos, size, style, validator, name );
 }
 

+wxTextCtrl::~wxTextCtrl()
+{
+    WX_CLEAR_LIST(wxList, m_undos);
+}
+

 bool wxTextCtrl::Create( wxWindow *parent,
                          wxWindowID id,
                          const wxString &value,
 bool wxTextCtrl::Create( wxWindow *parent,
                          wxWindowID id,
                          const wxString &value,


@@ -218,7 +221,7 @@ bool wxTextCtrl::Create( wxWindow *parent,
         style |= wxALWAYS_SHOW_SB;
         
     wxTextCtrlBase::Create( parent, id, pos /* wxDefaultPosition */, size,
         style |= wxALWAYS_SHOW_SB;
         
     wxTextCtrlBase::Create( parent, id, pos /* wxDefaultPosition */, size,

-                              style|wxVSCROLL|wxHSCROLL|wxNO_FULL_REPAINT_ON_RESIZE );
+                            style | wxVSCROLL | wxHSCROLL);

                               
     SetBackgroundColour( *wxWHITE );
     
                               
     SetBackgroundColour( *wxWHITE );
     


@@ -398,7 +401,7 @@ void wxTextCtrl::Clear()
     
     SetScrollbars( m_charWidth, m_lineHeight, 0, 0, 0, 0 );
     Refresh();
     
     SetScrollbars( m_charWidth, m_lineHeight, 0, 0, 0, 0 );
     Refresh();

-    m_undos.Clear();
+    WX_CLEAR_LIST(wxList, m_undos);

 }
 
 void wxTextCtrl::Replace(long from, long to, const wxString& value)
 }
 
 void wxTextCtrl::Replace(long from, long to, const wxString& value)


@@ -795,12 +798,13 @@ void wxTextCtrl::Undo()
 {
     if (m_undos.GetCount() == 0) return;
     
 {
     if (m_undos.GetCount() == 0) return;
     

-    wxList::Node *node = m_undos.Item( m_undos.GetCount()-1 );
+    wxList::compatibility_iterator node = m_undos.Item( m_undos.GetCount()-1 );

     wxSourceUndoStep *undo = (wxSourceUndoStep*) node->GetData();
     
     undo->Undo();
     wxSourceUndoStep *undo = (wxSourceUndoStep*) node->GetData();
     
     undo->Undo();

-    
-    delete node;
+
+    delete undo;
+    m_undos.Erase( node );

     
     m_modified = TRUE;
 }
     
     m_modified = TRUE;
 }