* wxSocket fixes
* wxStream: - new inheritance, new stream buffer, nearly the same API for the
end user
- updated other streams consequently
* wxGTK: some change to make it compile on GTK 1.0 and GTK 1.1
* small changes on wxThread to prepare a more reentrant lib
* wxVariant works with wxStream too now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@829 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -300,19 +300,31 @@ void wxComboBox::SetValue( const wxString& value )
|
||||
void wxComboBox::Copy(void)
|
||||
{
|
||||
GtkWidget *entry = GTK_COMBO(m_widget)->entry;
|
||||
#if (GTK_MINOR_VERSION == 1)
|
||||
gtk_editable_copy_clipboard( GTK_EDITABLE(entry) );
|
||||
#else
|
||||
gtk_editable_copy_clipboard( GTK_EDITABLE(entry), 0 );
|
||||
#endif
|
||||
}
|
||||
|
||||
void wxComboBox::Cut(void)
|
||||
{
|
||||
GtkWidget *entry = GTK_COMBO(m_widget)->entry;
|
||||
#if (GTK_MINOR_VERSION == 1)
|
||||
gtk_editable_cut_clipboard( GTK_EDITABLE(entry) );
|
||||
#else
|
||||
gtk_editable_cut_clipboard( GTK_EDITABLE(entry), 0 );
|
||||
#endif
|
||||
}
|
||||
|
||||
void wxComboBox::Paste(void)
|
||||
{
|
||||
GtkWidget *entry = GTK_COMBO(m_widget)->entry;
|
||||
#if (GTK_MINOR_VERSION == 1)
|
||||
gtk_editable_paste_clipboard( GTK_EDITABLE(entry) );
|
||||
#else
|
||||
gtk_editable_paste_clipboard( GTK_EDITABLE(entry), 0 );
|
||||
#endif
|
||||
}
|
||||
|
||||
void wxComboBox::SetInsertionPoint( long pos )
|
||||
|
||||
@@ -300,17 +300,29 @@ void wxTextCtrl::Replace( long from, long to, const wxString &value )
|
||||
|
||||
void wxTextCtrl::Cut()
|
||||
{
|
||||
#if (GTK_MINOR_VERSION == 1)
|
||||
gtk_editable_cut_clipboard( GTK_EDITABLE(m_text) );
|
||||
#else
|
||||
gtk_editable_cut_clipboard( GTK_EDITABLE(m_text), 0 );
|
||||
#endif
|
||||
}
|
||||
|
||||
void wxTextCtrl::Copy()
|
||||
{
|
||||
#if (GTK_MINOR_VERSION == 1)
|
||||
gtk_editable_copy_clipboard( GTK_EDITABLE(m_text) );
|
||||
#else
|
||||
gtk_editable_copy_clipboard( GTK_EDITABLE(m_text), 0 );
|
||||
#endif
|
||||
}
|
||||
|
||||
void wxTextCtrl::Paste()
|
||||
{
|
||||
#if (GTK_MINOR_VERSION == 1)
|
||||
gtk_editable_paste_clipboard( GTK_EDITABLE(m_text) );
|
||||
#else
|
||||
gtk_editable_paste_clipboard( GTK_EDITABLE(m_text), 0 );
|
||||
#endif
|
||||
}
|
||||
|
||||
void wxTextCtrl::Clear()
|
||||
|
||||
@@ -21,7 +21,6 @@
|
||||
|
||||
#include <gdk/gdk.h>
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Static variables
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@@ -63,3 +62,29 @@ static void wxThreadGuiExit()
|
||||
close(p_thrd_pipe[0]);
|
||||
close(p_thrd_pipe[1]);
|
||||
}
|
||||
|
||||
#ifdef NO_DEFINE_GDK_1_1
|
||||
|
||||
void wxMutexGuiEnter()
|
||||
{
|
||||
gdk_mutex_enter();
|
||||
}
|
||||
|
||||
void wxMutexGuiLeave()
|
||||
{
|
||||
gdk_mutex_leave();
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
void wxMutexGuiEnter()
|
||||
{
|
||||
wxMainMutex.Lock();
|
||||
}
|
||||
|
||||
void wxMutexGuiLeave()
|
||||
{
|
||||
wxMainMutex.Unlock();
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
/////////////////////////////////////////////////////////////////////////// */
|
||||
|
||||
#include "wx/gtk/win_gtk.h"
|
||||
#include <gtk/gtkfeatures.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
@@ -34,6 +35,9 @@ static void gtk_myfixed_add (GtkContainer *container,
|
||||
static void gtk_myfixed_remove (GtkContainer *container,
|
||||
GtkWidget *widget);
|
||||
static void gtk_myfixed_foreach (GtkContainer *container,
|
||||
#if (GTK_MINOR_VERSION == 1)
|
||||
gboolean include_internals,
|
||||
#endif
|
||||
GtkCallback callback,
|
||||
gpointer callback_data);
|
||||
|
||||
@@ -88,7 +92,11 @@ gtk_myfixed_class_init (GtkMyFixedClass *klass)
|
||||
|
||||
container_class->add = gtk_myfixed_add;
|
||||
container_class->remove = gtk_myfixed_remove;
|
||||
#if (GTK_MINOR_VERSION == 1)
|
||||
container_class->forall = gtk_myfixed_foreach;
|
||||
#else
|
||||
container_class->foreach = gtk_myfixed_foreach;
|
||||
#endif
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -454,6 +462,9 @@ gtk_myfixed_remove (GtkContainer *container,
|
||||
|
||||
static void
|
||||
gtk_myfixed_foreach (GtkContainer *container,
|
||||
#if (GTK_MINOR_VERSION == 1)
|
||||
gboolean include_internals,
|
||||
#endif
|
||||
GtkCallback callback,
|
||||
gpointer callback_data)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user