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

Remove obsolete GTK1 compatibility macros. Patch #1413458 - Paul Cornett

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37275 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mart Raudsepp
2006-02-03 20:38:55 +00:00
parent 1794103bab
commit afa7bd1eef
14 changed files with 47 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gtk/textctrl.cpp
View File

@@ -830,7 +830,7 @@ void wxTextCtrl::WriteText( const wxString &text )
gtk_editable_delete_selection( GTK_EDITABLE(m_text) );
// This moves the cursor pos to behind the inserted text.
gint len = GET_EDITABLE_POS(m_text);
gint len = gtk_editable_get_position(GTK_EDITABLE(m_text));
#if wxUSE_UNICODE
wxCharBuffer buffer( wxConvUTF8.cWX2MB( text ) );
@@ -977,7 +977,7 @@ void wxTextCtrl::SetInsertionPoint( long pos )
gtk_entry_set_position( GTK_ENTRY(m_text), (int)pos );
// Bring editable's cursor uptodate. Bug in GTK.
SET_EDITABLE_POS(m_text, (guint32)pos);
gtk_editable_set_position(GTK_EDITABLE(m_text), int(pos));
}
}
@@ -1191,7 +1191,7 @@ long wxTextCtrl::GetInsertionPoint() const
}
else
{
return (long) GET_EDITABLE_POS(m_text);
return (long) gtk_editable_get_position(GTK_EDITABLE(m_text));
}
}
@@ -1252,7 +1252,7 @@ void wxTextCtrl::Cut()
if (m_windowStyle & wxTE_MULTILINE)
g_signal_emit_by_name (m_text, "cut-clipboard");
else
gtk_editable_cut_clipboard(GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG);
gtk_editable_cut_clipboard(GTK_EDITABLE(m_text));
}
void wxTextCtrl::Copy()
@@ -1262,7 +1262,7 @@ void wxTextCtrl::Copy()
if (m_windowStyle & wxTE_MULTILINE)
g_signal_emit_by_name (m_text, "copy-clipboard");
else
gtk_editable_copy_clipboard(GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG);
gtk_editable_copy_clipboard(GTK_EDITABLE(m_text));
}
void wxTextCtrl::Paste()
@@ -1272,7 +1272,7 @@ void wxTextCtrl::Paste()
if (m_windowStyle & wxTE_MULTILINE)
g_signal_emit_by_name (m_text, "paste-clipboard");
else
gtk_editable_paste_clipboard(GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG);
gtk_editable_paste_clipboard(GTK_EDITABLE(m_text));
}
// Undo/redo