handle EINTR when reading data from the wakeup pipe

[wxWidgets.git] / src / gtk / window.cpp

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index e5a5cd7ab11a8fa075aebbcb2ee5bb65a9a5ef17..7fc84be9129a2b9e789681eb16bf3efd7536a2d6 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -205,7 +205,7 @@ extern wxCursor   g_globalCursor;
 
 // mouse capture state: the window which has it and if the mouse is currently
 // inside it
 
 // mouse capture state: the window which has it and if the mouse is currently
 // inside it

-static wxWindowGTK  *g_captureWindow = (wxWindowGTK*) NULL;
+static wxWindowGTK  *g_captureWindow = NULL;

 static bool g_captureWindowHasMouse = false;
 
 // The window that currently has focus:
 static bool g_captureWindowHasMouse = false;
 
 // The window that currently has focus:


@@ -220,7 +220,7 @@ static wxWindowGTK *gs_deferredFocusOut = NULL;
 
 // global variables because GTK+ DnD want to have the
 // mouse event that caused it
 
 // global variables because GTK+ DnD want to have the
 // mouse event that caused it

-GdkEvent    *g_lastMouseEvent = (GdkEvent*) NULL;
+GdkEvent    *g_lastMouseEvent = NULL;

 int          g_lastButtonNumber = 0;
 
 //-----------------------------------------------------------------------------
 int          g_lastButtonNumber = 0;
 
 //-----------------------------------------------------------------------------


@@ -257,11 +257,11 @@ gdk_window_warp_pointer (GdkWindow      *window,
 // "size_request" of m_widget
 //-----------------------------------------------------------------------------
 
 // "size_request" of m_widget
 //-----------------------------------------------------------------------------
 

-// make it extern because wxStaticText needs to disconnect this one

 extern "C" {
 extern "C" {

-void wxgtk_window_size_request_callback(GtkWidget * WXUNUSED(widget),
-                                        GtkRequisition *requisition,
-                                        wxWindow * win)
+static void
+wxgtk_window_size_request_callback(GtkWidget * WXUNUSED(widget),
+                                   GtkRequisition *requisition,
+                                   wxWindow * win)

 {
     int w, h;
     win->GetSize( &w, &h );
 {
     int w, h;
     win->GetSize( &w, &h );


@@ -1182,7 +1182,7 @@ wxWindowGTK *FindWindowForMouseEvent(wxWindowGTK *win, wxCoord& x, wxCoord& y)
         }
         else
         {
         }
         else
         {

-            if ((child->m_wxwindow == (GtkWidget*) NULL) &&
+            if ((child->m_wxwindow == NULL) &&

                 (child->m_x <= xx) &&
                 (child->m_y <= yy) &&
                 (child->m_x+child->m_width  >= xx) &&
                 (child->m_x <= xx) &&
                 (child->m_y <= yy) &&
                 (child->m_x+child->m_width  >= xx) &&


@@ -1570,7 +1570,7 @@ window_scroll_event_hscrollbar(GtkWidget*, GdkEventScroll* gdk_event, wxWindow*
             delta = -delta;
 
         gdouble new_value = CLAMP (adj->value + delta, adj->lower, adj->upper - adj->page_size);
             delta = -delta;
 
         gdouble new_value = CLAMP (adj->value + delta, adj->lower, adj->upper - adj->page_size);

-      
+

         gtk_adjustment_set_value (adj, new_value);
 
         return TRUE;
         gtk_adjustment_set_value (adj, new_value);
 
         return TRUE;


@@ -1601,7 +1601,7 @@ window_scroll_event(GtkWidget*, GdkEventScroll* gdk_event, wxWindow* win)
 
     if (win->GTKProcessEvent(event))
       return TRUE;
 
     if (win->GTKProcessEvent(event))
       return TRUE;

-      
+

     GtkRange *range = win->m_scrollBar[wxWindow::ScrollDir_Vert];
     if (!range) return FALSE;
 
     GtkRange *range = win->m_scrollBar[wxWindow::ScrollDir_Vert];
     if (!range) return FALSE;
 


@@ -1613,7 +1613,7 @@ window_scroll_event(GtkWidget*, GdkEventScroll* gdk_event, wxWindow* win)
           delta = -delta;
 
         gdouble new_value = CLAMP (adj->value + delta, adj->lower, adj->upper - adj->page_size);
           delta = -delta;
 
         gdouble new_value = CLAMP (adj->value + delta, adj->lower, adj->upper - adj->page_size);

-      
+

         gtk_adjustment_set_value (adj, new_value);
 
         return TRUE;
         gtk_adjustment_set_value (adj, new_value);
 
         return TRUE;


@@ -1759,7 +1759,7 @@ gtk_scrollbar_value_changed(GtkRange* range, wxWindow* win)
 
         // find the scrollbar which generated the event
         wxWindowGTK::ScrollDir dir = win->ScrollDirFromRange(range);
 
         // find the scrollbar which generated the event
         wxWindowGTK::ScrollDir dir = win->ScrollDirFromRange(range);

-        
+

         // generate the corresponding wx event
         const int orient = wxWindow::OrientFromScrollDir(dir);
         wxScrollWinEvent event(eventType, win->GetScrollPos(orient), orient);
         // generate the corresponding wx event
         const int orient = wxWindow::OrientFromScrollDir(dir);
         wxScrollWinEvent event(eventType, win->GetScrollPos(orient), orient);


@@ -2029,9 +2029,9 @@ wxMouseState wxGetMouseState()
 void wxWindowGTK::Init()
 {
     // GTK specific
 void wxWindowGTK::Init()
 {
     // GTK specific

-    m_widget = (GtkWidget *) NULL;
-    m_wxwindow = (GtkWidget *) NULL;
-    m_focusWidget = (GtkWidget *) NULL;
+    m_widget = NULL;
+    m_wxwindow = NULL;
+    m_focusWidget = NULL;

 
     // position/size
     m_x = 0;
 
     // position/size
     m_x = 0;


@@ -2040,9 +2040,8 @@ void wxWindowGTK::Init()
     m_height = 0;
 
     m_hasVMT = false;
     m_height = 0;
 
     m_hasVMT = false;

-    m_isBeingDeleted = false;

 
 

-    m_showOnIdle= false;
+    m_showOnIdle = false;

 
     m_noExpose = false;
     m_nativeSizeEvent = false;
 
     m_noExpose = false;
     m_nativeSizeEvent = false;


@@ -2096,6 +2095,7 @@ bool wxWindowGTK::Create( wxWindow *parent,
 {
     // Get default border
     wxBorder border = GetBorder(style);
 {
     // Get default border
     wxBorder border = GetBorder(style);

+

     style &= ~wxBORDER_MASK;
     style |= border;
 
     style &= ~wxBORDER_MASK;
     style |= border;
 


@@ -2106,8 +2106,14 @@ bool wxWindowGTK::Create( wxWindow *parent,
         return false;
     }
 
         return false;
     }
 

+        // We should accept the native look
+#if 0
+        GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT_GET_CLASS(m_widget) );
+        scroll_class->scrollbar_spacing = 0;
+#endif
+

 
 

-    m_wxwindow = wxPizza::New(m_windowStyle);
+    m_wxwindow = wxPizza::New(m_windowStyle,this);

 #ifndef __WXUNIVERSAL__
     if (HasFlag(wxPizza::BORDER_STYLES))
     {
 #ifndef __WXUNIVERSAL__
     if (HasFlag(wxPizza::BORDER_STYLES))
     {


@@ -2119,13 +2125,10 @@ bool wxWindowGTK::Create( wxWindow *parent,
         m_widget = m_wxwindow;
     else
     {
         m_widget = m_wxwindow;
     else
     {

-        m_widget = gtk_scrolled_window_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL );
+        m_widget = gtk_scrolled_window_new( NULL, NULL );

 
         GtkScrolledWindow *scrolledWindow = GTK_SCROLLED_WINDOW(m_widget);
 
 
         GtkScrolledWindow *scrolledWindow = GTK_SCROLLED_WINDOW(m_widget);
 

-        GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT_GET_CLASS(m_widget) );
-        scroll_class->scrollbar_spacing = 0;
-

         // There is a conflict with default bindings at GTK+
         // level between scrolled windows and notebooks both of which want to use
         // Ctrl-PageUp/Down: scrolled windows for scrolling in the horizontal
         // There is a conflict with default bindings at GTK+
         // level between scrolled windows and notebooks both of which want to use
         // Ctrl-PageUp/Down: scrolled windows for scrolling in the horizontal


@@ -2210,7 +2213,6 @@ wxWindowGTK::~wxWindowGTK()
     if ( gs_deferredFocusOut == this )
         gs_deferredFocusOut = NULL;
 
     if ( gs_deferredFocusOut == this )
         gs_deferredFocusOut = NULL;
 

-    m_isBeingDeleted = true;

     m_hasVMT = false;
 
     // destroy children before destroying this window itself
     m_hasVMT = false;
 
     // destroy children before destroying this window itself


@@ -2408,7 +2410,7 @@ void wxWindowGTK::ConnectWidget( GtkWidget *widget )
                       G_CALLBACK (gtk_window_button_release_callback), this);
     g_signal_connect (widget, "motion_notify_event",
                       G_CALLBACK (gtk_window_motion_notify_callback), this);
                       G_CALLBACK (gtk_window_button_release_callback), this);
     g_signal_connect (widget, "motion_notify_event",
                       G_CALLBACK (gtk_window_motion_notify_callback), this);

-                      
+

     g_signal_connect (widget, "scroll_event",
                       G_CALLBACK (window_scroll_event), this);
     if (m_scrollBar[ScrollDir_Horz])
     g_signal_connect (widget, "scroll_event",
                       G_CALLBACK (window_scroll_event), this);
     if (m_scrollBar[ScrollDir_Horz])


@@ -2417,7 +2419,7 @@ void wxWindowGTK::ConnectWidget( GtkWidget *widget )
     if (m_scrollBar[ScrollDir_Vert])
         g_signal_connect (m_scrollBar[ScrollDir_Vert], "scroll_event",
                       G_CALLBACK (window_scroll_event), this);
     if (m_scrollBar[ScrollDir_Vert])
         g_signal_connect (m_scrollBar[ScrollDir_Vert], "scroll_event",
                       G_CALLBACK (window_scroll_event), this);

-                      
+

     g_signal_connect (widget, "popup_menu",
                      G_CALLBACK (wxgtk_window_popup_menu_callback), this);
     g_signal_connect (widget, "enter_notify_event",
     g_signal_connect (widget, "popup_menu",
                      G_CALLBACK (wxgtk_window_popup_menu_callback), this);
     g_signal_connect (widget, "enter_notify_event",


@@ -2679,12 +2681,15 @@ void wxWindowGTK::DoGetClientSize( int *width, int *height ) const
                             continue;
                 }
 
                             continue;
                 }
 

+                GtkScrolledWindowClass *scroll_class =
+                    GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT_GET_CLASS(m_widget) );
+

                 GtkRequisition req;
                 gtk_widget_size_request(GTK_WIDGET(range), &req);
                 if (i == ScrollDir_Horz)
                 GtkRequisition req;
                 gtk_widget_size_request(GTK_WIDGET(range), &req);
                 if (i == ScrollDir_Horz)

-                    h -= req.height;
+                    h -= req.height + scroll_class->scrollbar_spacing;

                 else
                 else

-                    w -= req.width;
+                    w -= req.width + scroll_class->scrollbar_spacing;

             }
         }
 
             }
         }
 


@@ -2718,7 +2723,7 @@ void wxWindowGTK::DoGetPosition( int *x, int *y ) const
 
     if (m_x == -1 && m_y == -1)
     {
 
     if (m_x == -1 && m_y == -1)
     {

-        GdkWindow *source = (GdkWindow *) NULL;
+        GdkWindow *source = NULL;

         if (m_wxwindow)
             source = m_wxwindow->window;
         else
         if (m_wxwindow)
             source = m_wxwindow->window;
         else


@@ -2748,7 +2753,7 @@ void wxWindowGTK::DoClientToScreen( int *x, int *y ) const
 
     if (!m_widget->window) return;
 
 
     if (!m_widget->window) return;
 

-    GdkWindow *source = (GdkWindow *) NULL;
+    GdkWindow *source = NULL;

     if (m_wxwindow)
         source = m_wxwindow->window;
     else
     if (m_wxwindow)
         source = m_wxwindow->window;
     else


@@ -2785,7 +2790,7 @@ void wxWindowGTK::DoScreenToClient( int *x, int *y ) const
 
     if (!m_widget->window) return;
 
 
     if (!m_widget->window) return;
 

-    GdkWindow *source = (GdkWindow *) NULL;
+    GdkWindow *source = NULL;

     if (m_wxwindow)
         source = m_wxwindow->window;
     else
     if (m_wxwindow)
         source = m_wxwindow->window;
     else


@@ -3470,7 +3475,7 @@ void wxWindowGTK::WarpPointer( int x, int y )
     // We provide this function ourselves as it is
     // missing in GDK (top of this file).
 
     // We provide this function ourselves as it is
     // missing in GDK (top of this file).
 

-    GdkWindow *window = (GdkWindow*) NULL;
+    GdkWindow *window = NULL;

     if (m_wxwindow)
         window = m_wxwindow->window;
     else
     if (m_wxwindow)
         window = m_wxwindow->window;
     else


@@ -3998,8 +4003,8 @@ bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y )
     menu->m_popupShown = true;
     gtk_menu_popup(
                   GTK_MENU(menu->m_menu),
     menu->m_popupShown = true;
     gtk_menu_popup(
                   GTK_MENU(menu->m_menu),

-                  (GtkWidget *) NULL,           // parent menu shell
-                  (GtkWidget *) NULL,           // parent menu item
+                  NULL,           // parent menu shell
+                  NULL,           // parent menu item

                   posfunc,                      // function to position it
                   userdata,                     // client data
                   0,                            // button used to activate it
                   posfunc,                      // function to position it
                   userdata,                     // client data
                   0,                            // button used to activate it


@@ -4024,12 +4029,12 @@ void wxWindowGTK::SetDropTarget( wxDropTarget *dropTarget )
 
     GtkWidget *dnd_widget = GetConnectWidget();
 
 
     GtkWidget *dnd_widget = GetConnectWidget();
 

-    if (m_dropTarget) m_dropTarget->UnregisterWidget( dnd_widget );
+    if (m_dropTarget) m_dropTarget->GtkUnregisterWidget( dnd_widget );

 
     if (m_dropTarget) delete m_dropTarget;
     m_dropTarget = dropTarget;
 
 
     if (m_dropTarget) delete m_dropTarget;
     m_dropTarget = dropTarget;
 

-    if (m_dropTarget) m_dropTarget->RegisterWidget( dnd_widget );
+    if (m_dropTarget) m_dropTarget->GtkRegisterWidget( dnd_widget );

 }
 
 #endif // wxUSE_DRAG_AND_DROP
 }
 
 #endif // wxUSE_DRAG_AND_DROP


@@ -4074,7 +4079,7 @@ void wxWindowGTK::DoCaptureMouse()
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
 
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
 

-    GdkWindow *window = (GdkWindow*) NULL;
+    GdkWindow *window = NULL;

     if (m_wxwindow)
         window = m_wxwindow->window;
     else
     if (m_wxwindow)
         window = m_wxwindow->window;
     else


@@ -4092,7 +4097,7 @@ void wxWindowGTK::DoCaptureMouse()
                           GDK_BUTTON_RELEASE_MASK |
                           GDK_POINTER_MOTION_HINT_MASK |
                           GDK_POINTER_MOTION_MASK),
                           GDK_BUTTON_RELEASE_MASK |
                           GDK_POINTER_MOTION_HINT_MASK |
                           GDK_POINTER_MOTION_MASK),

-                      (GdkWindow *) NULL,
+                      NULL,

                       cursor->GetCursor(),
                       (guint32)GDK_CURRENT_TIME );
     g_captureWindow = this;
                       cursor->GetCursor(),
                       (guint32)GDK_CURRENT_TIME );
     g_captureWindow = this;


@@ -4105,9 +4110,9 @@ void wxWindowGTK::DoReleaseMouse()
 
     wxCHECK_RET( g_captureWindow, wxT("can't release mouse - not captured") );
 
 
     wxCHECK_RET( g_captureWindow, wxT("can't release mouse - not captured") );
 

-    g_captureWindow = (wxWindowGTK*) NULL;
+    g_captureWindow = NULL;

 
 

-    GdkWindow *window = (GdkWindow*) NULL;
+    GdkWindow *window = NULL;

     if (m_wxwindow)
         window = m_wxwindow->window;
     else
     if (m_wxwindow)
         window = m_wxwindow->window;
     else


@@ -4157,7 +4162,7 @@ void wxWindowGTK::SetScrollbar(int orient,
 
     GtkAdjustment * const adj = sb->adjustment;
     adj->step_increment = 1;
 
     GtkAdjustment * const adj = sb->adjustment;
     adj->step_increment = 1;

-    adj->page_increment = 
+    adj->page_increment =

     adj->page_size = thumbVisible;
     adj->value = pos;
 
     adj->page_size = thumbVisible;
     adj->value = pos;
 


@@ -4276,7 +4281,7 @@ void wxWindowGTK::ScrollWindow( int dx, int dy, const wxRect* WXUNUSED(rect) )
 
     // No scrolling requested.
     if ((dx == 0) && (dy == 0)) return;
 
     // No scrolling requested.
     if ((dx == 0) && (dy == 0)) return;

-    
+

     m_clipPaintRegion = true;
 
     WX_PIZZA(m_wxwindow)->scroll(dx, dy);
     m_clipPaintRegion = true;
 
     WX_PIZZA(m_wxwindow)->scroll(dx, dy);