gtk_text_iter_get_line and get_line_offset work fine on the end iter. Don't bail...

[wxWidgets.git] / src / gtk1 / gsockgtk.cpp

diff --git a/src/gtk1/gsockgtk.cpp b/src/gtk1/gsockgtk.cpp
index ffcd57563c224a9e491d874bc024a148f6c996a9..a3656b7284e2b1788b46e743c9f7763a265cd1d9 100644 (file)
--- a/src/gtk1/gsockgtk.cpp
+++ b/src/gtk1/gsockgtk.cpp
@@ -1,12 +1,13 @@
 /* -------------------------------------------------------------------------
  * Project: GSocket (Generic Socket) for WX
 /* -------------------------------------------------------------------------
  * Project: GSocket (Generic Socket) for WX

- * Name:    gsockgtk.c
+ * Name:    src/gtk1/gsockgtk.cpp

  * Purpose: GSocket: GTK part
  * Licence: The wxWindows licence
  * CVSID:   $Id$
  * -------------------------------------------------------------------------
  */
  * Purpose: GSocket: GTK part
  * Licence: The wxWindows licence
  * CVSID:   $Id$
  * -------------------------------------------------------------------------
  */

-#include "wx/setup.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #if wxUSE_SOCKETS
 
 
 #if wxUSE_SOCKETS
 


@@ -21,6 +22,8 @@
 #include "wx/unix/gsockunx.h"
 
 
 #include "wx/unix/gsockunx.h"
 
 

+extern "C" {
+static

 void _GSocket_GDK_Input(gpointer data,
                         gint source,
                         GdkInputCondition condition)
 void _GSocket_GDK_Input(gpointer data,
                         gint source,
                         GdkInputCondition condition)


@@ -32,6 +35,7 @@ void _GSocket_GDK_Input(gpointer data,
   if (condition & GDK_INPUT_WRITE)
     socket->Detected_Write();
 }
   if (condition & GDK_INPUT_WRITE)
     socket->Detected_Write();
 }

+}

 
 bool GSocketGUIFunctionsTableConcrete::CanUseEventLoop()
 {   return true; }
 
 bool GSocketGUIFunctionsTableConcrete::CanUseEventLoop()
 {   return true; }


@@ -44,7 +48,7 @@ bool GSocketGUIFunctionsTableConcrete::OnInit(void)
 void GSocketGUIFunctionsTableConcrete::OnExit(void)
 {
 }
 void GSocketGUIFunctionsTableConcrete::OnExit(void)
 {
 }

-    
+

 bool GSocketGUIFunctionsTableConcrete::Init_Socket(GSocket *socket)
 {
   gint *m_id;
 bool GSocketGUIFunctionsTableConcrete::Init_Socket(GSocket *socket)
 {
   gint *m_id;


@@ -106,9 +110,10 @@ void GSocketGUIFunctionsTableConcrete::Uninstall_Callback(GSocket *socket, GSock
   }
 
   if (m_id[c] != -1)
   }
 
   if (m_id[c] != -1)

+  {

     gdk_input_remove(m_id[c]);
     gdk_input_remove(m_id[c]);

-
-  m_id[c] = -1;
+    m_id[c] = -1;
+  }

 }
 
 void GSocketGUIFunctionsTableConcrete::Enable_Events(GSocket *socket)
 }
 
 void GSocketGUIFunctionsTableConcrete::Enable_Events(GSocket *socket)