From d5ab387d2ac132927d7494c02480407e37153ea6 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Mon, 13 Mar 2000 15:21:40 +0000 Subject: [PATCH] Typo GtkPizza, More debug printf()s in GSocket_Write() Did I touch plot.cpp ? git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6653 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/win_gtk.c | 20 ++++++++++---------- src/gtk1/win_gtk.c | 20 ++++++++++---------- src/unix/gsocket.c | 6 ++++++ 3 files changed, 26 insertions(+), 20 deletions(-) diff --git a/src/gtk/win_gtk.c b/src/gtk/win_gtk.c index 4d925f373c..20d0181db6 100644 --- a/src/gtk/win_gtk.c +++ b/src/gtk/win_gtk.c @@ -563,19 +563,19 @@ gtk_pizza_realize (GtkWidget *widget) static void gtk_pizza_unrealize (GtkWidget *widget) { - GtkPizza *pizza; + GtkPizza *pizza; - g_return_if_fail (widget != NULL); - g_return_if_fail (GTK_IS_PIZZA (widget)); + g_return_if_fail (widget != NULL); + g_return_if_fail (GTK_IS_PIZZA (widget)); - pizza = GTK_PIZZA (widget); + pizza = GTK_PIZZA (widget); - gdk_window_set_user_data (pizza->bin_window, NULL); - gdk_window_destroy (pizza->bin_window); - pizza->bin_window = NULL; + gdk_window_set_user_data (pizza->bin_window, NULL); + gdk_window_destroy (pizza->bin_window); + pizza->bin_window = NULL; - if (GTK_WIDGET_CLASS (parent_class)->unrealize) - (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget); + if (GTK_WIDGET_CLASS (parent_class)->unrealize) + (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget); } static void @@ -712,7 +712,7 @@ gtk_pizza_expose (GtkWidget *widget, /* Sometimes, We handle all expose events in window.cpp now. */ if (pizza->external_expose) - return; + return FALSE; if (event->window != pizza->bin_window) return FALSE; diff --git a/src/gtk1/win_gtk.c b/src/gtk1/win_gtk.c index 4d925f373c..20d0181db6 100644 --- a/src/gtk1/win_gtk.c +++ b/src/gtk1/win_gtk.c @@ -563,19 +563,19 @@ gtk_pizza_realize (GtkWidget *widget) static void gtk_pizza_unrealize (GtkWidget *widget) { - GtkPizza *pizza; + GtkPizza *pizza; - g_return_if_fail (widget != NULL); - g_return_if_fail (GTK_IS_PIZZA (widget)); + g_return_if_fail (widget != NULL); + g_return_if_fail (GTK_IS_PIZZA (widget)); - pizza = GTK_PIZZA (widget); + pizza = GTK_PIZZA (widget); - gdk_window_set_user_data (pizza->bin_window, NULL); - gdk_window_destroy (pizza->bin_window); - pizza->bin_window = NULL; + gdk_window_set_user_data (pizza->bin_window, NULL); + gdk_window_destroy (pizza->bin_window); + pizza->bin_window = NULL; - if (GTK_WIDGET_CLASS (parent_class)->unrealize) - (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget); + if (GTK_WIDGET_CLASS (parent_class)->unrealize) + (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget); } static void @@ -712,7 +712,7 @@ gtk_pizza_expose (GtkWidget *widget, /* Sometimes, We handle all expose events in window.cpp now. */ if (pizza->external_expose) - return; + return FALSE; if (event->window != pizza->bin_window) return FALSE; diff --git a/src/unix/gsocket.c b/src/unix/gsocket.c index 5b3c647893..44ce4e0dbc 100644 --- a/src/unix/gsocket.c +++ b/src/unix/gsocket.c @@ -742,9 +742,15 @@ int GSocket_Write(GSocket *socket, const char *buffer, int size) if (ret == -1) { if (errno == EWOULDBLOCK) + { socket->m_error = GSOCK_WOULDBLOCK; + printf( "GSocket_Write error WOULDBLOCK\n" ); + } else + { socket->m_error = GSOCK_IOERR; + printf( "GSocket_Write error IOERR\n" ); + } /* Only reenable OUTPUT events after an error (just like WSAAsyncSelect * in MSW). Once the first OUTPUT event is received, users can assume