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

Typo GtkPizza,

Browse Source 
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
This commit is contained in:
Robert Roebling
2000-03-13 15:21:40 +00:00
parent 236a9de39a
commit d5ab387d2a
3 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/gtk/win_gtk.c
View File

@@ -563,19 +563,19 @@ gtk_pizza_realize (GtkWidget *widget)
static void static void
gtk_pizza_unrealize (GtkWidget *widget) gtk_pizza_unrealize (GtkWidget *widget)
{ {
GtkPizza *pizza; GtkPizza *pizza;
g_return_if_fail (widget != NULL); g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_PIZZA (widget)); 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_set_user_data (pizza->bin_window, NULL);
gdk_window_destroy (pizza->bin_window); gdk_window_destroy (pizza->bin_window);
pizza->bin_window = NULL; pizza->bin_window = NULL;
if (GTK_WIDGET_CLASS (parent_class)->unrealize) if (GTK_WIDGET_CLASS (parent_class)->unrealize)
(* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget); (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
} }
static void static void
@@ -712,7 +712,7 @@ gtk_pizza_expose (GtkWidget *widget,
/* Sometimes, We handle all expose events in window.cpp now. */ /* Sometimes, We handle all expose events in window.cpp now. */
if (pizza->external_expose) if (pizza->external_expose)
return; return FALSE;
if (event->window != pizza->bin_window) if (event->window != pizza->bin_window)
return FALSE; return FALSE;

20
src/gtk1/win_gtk.c
View File

@@ -563,19 +563,19 @@ gtk_pizza_realize (GtkWidget *widget)
static void static void
gtk_pizza_unrealize (GtkWidget *widget) gtk_pizza_unrealize (GtkWidget *widget)
{ {
GtkPizza *pizza; GtkPizza *pizza;
g_return_if_fail (widget != NULL); g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_PIZZA (widget)); 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_set_user_data (pizza->bin_window, NULL);
gdk_window_destroy (pizza->bin_window); gdk_window_destroy (pizza->bin_window);
pizza->bin_window = NULL; pizza->bin_window = NULL;
if (GTK_WIDGET_CLASS (parent_class)->unrealize) if (GTK_WIDGET_CLASS (parent_class)->unrealize)
(* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget); (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
} }
static void static void
@@ -712,7 +712,7 @@ gtk_pizza_expose (GtkWidget *widget,
/* Sometimes, We handle all expose events in window.cpp now. */ /* Sometimes, We handle all expose events in window.cpp now. */
if (pizza->external_expose) if (pizza->external_expose)
return; return FALSE;
if (event->window != pizza->bin_window) if (event->window != pizza->bin_window)
return FALSE; return FALSE;

6
src/unix/gsocket.c
View File

@@ -742,9 +742,15 @@ int GSocket_Write(GSocket *socket, const char *buffer, int size)
if (ret == -1) if (ret == -1)
{ {
if (errno == EWOULDBLOCK) if (errno == EWOULDBLOCK)
{
socket->m_error = GSOCK_WOULDBLOCK; socket->m_error = GSOCK_WOULDBLOCK;
printf( "GSocket_Write error WOULDBLOCK\n" );
}
else else
{
socket->m_error = GSOCK_IOERR; socket->m_error = GSOCK_IOERR;
printf( "GSocket_Write error IOERR\n" );
}
/* Only reenable OUTPUT events after an error (just like WSAAsyncSelect /* Only reenable OUTPUT events after an error (just like WSAAsyncSelect
* in MSW). Once the first OUTPUT event is received, users can assume * in MSW). Once the first OUTPUT event is received, users can assume