X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..700dbceb374774f5207a2daf2b7ea69e08bfd56f:/src/gtk/window.cpp diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index 813c527f68..43673380dc 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -47,6 +47,7 @@ #include "wx/settings.h" #include "wx/log.h" #include "wx/fontutil.h" +#include "wx/stattext.h" #ifdef __WXDEBUG__ #include "wx/thread.h" @@ -65,20 +66,13 @@ #include "wx/gtk/win_gtk.h" -#ifdef __WXGTK20__ #include -#endif - -#ifdef __WXGTK20__ - #ifdef HAVE_XIM - #undef HAVE_XIM - #endif +#ifdef HAVE_XIM + #undef HAVE_XIM #endif -#ifdef __WXGTK20__ extern GtkContainerClass *pizza_parent_class; -#endif //----------------------------------------------------------------------------- // documentation on internals @@ -133,7 +127,7 @@ extern GtkContainerClass *pizza_parent_class; All windows must have a widget, with which they interact with other under- lying GTK widgets. It is this widget, e.g. that has to be resized etc and - thw wxWindow class has a member variable called m_widget which holds a + the wxWindow class has a member variable called m_widget which holds a pointer to this widget. When the window class represents a GTK native widget, this is (in most cases) the only GTK widget the class manages. E.g. the wxStaticText class handles only a GtkLabel widget a pointer to which you @@ -173,27 +167,27 @@ extern GtkContainerClass *pizza_parent_class; III) - Singularily the most broken code in GTK is the code that is supposes to + Singularily the most broken code in GTK is the code that is supposed to inform subwindows (child windows) about new positions. Very often, duplicate events are sent without changes in size or position, equally often no events are sent at all (All this is due to a bug in the GtkContainer code which got fixed in GTK 1.2.6). For that reason, wxGTK completely ignores GTK's own system and it simply waits for size events for toplevel windows and then iterates down the respective size events to all window. This has - the disadvantage, that windows might get size events before the GTK widget + the disadvantage that windows might get size events before the GTK widget actually has the reported size. This doesn't normally pose any problem, but - the OpenGl drawing routines rely on correct behaviour. Therefore, I have + the OpenGL drawing routines rely on correct behaviour. Therefore, I have added the m_nativeSizeEvents flag, which is true only for the OpenGL canvas, i.e. the wxGLCanvas will emit a size event, when (and not before) the X11 - window that is used for OpenGl output really has that size (as reported by + window that is used for OpenGL output really has that size (as reported by GTK). IV) If someone at some point of time feels the immense desire to have a look at, - change or attempt to optimse the Refresh() logic, this person will need an - intimate understanding of what a "draw" and what an "expose" events are and - what there are used for, in particular when used in connection with GTK's + change or attempt to optimise the Refresh() logic, this person will need an + intimate understanding of what "draw" and "expose" events are and what + they are used for, in particular when used in connection with GTK's own windowless widgets. Beware. V) @@ -205,7 +199,7 @@ extern GtkContainerClass *pizza_parent_class; and ending with the youngest generation (speaking of parent and child windows). Also don't forget that cursors (like much else) are connected to GdkWindows, not GtkWidgets and that the "window" field of a GtkWidget might very well - point to the GdkWindow of the parent widget (-> "window less widget") and + point to the GdkWindow of the parent widget (-> "window-less widget") and that the two obviously have very different meanings. */ @@ -237,10 +231,6 @@ wxWindowGTK *g_focusWindowLast = (wxWindowGTK*) NULL; // yet, defer setting the focus to idle time. wxWindowGTK *g_delayedFocus = (wxWindowGTK*) NULL; -// hack: we need something to pass to gtk_menu_popup, so we store the time of -// the last click here -static guint32 gs_timeLastClick = 0; - extern bool g_mainThreadLocked; //----------------------------------------------------------------------------- @@ -270,14 +260,9 @@ gdk_window_warp_pointer (GdkWindow *window, gint x, gint y) { -#ifndef __WXGTK20__ - GdkWindowPrivate *priv; -#endif - if (!window) window = GDK_ROOT_PARENT(); -#ifdef __WXGTK20__ if (!GDK_WINDOW_DESTROYED(window)) { XWarpPointer (GDK_WINDOW_XDISPLAY(window), @@ -286,18 +271,6 @@ gdk_window_warp_pointer (GdkWindow *window, 0, 0, 0, 0, /* not source window -> move from anywhere */ x, y ); } -#else - priv = (GdkWindowPrivate*) window; - - if (!priv->destroyed) - { - XWarpPointer (priv->xdisplay, - None, /* not source window -> move from anywhere */ - priv->xwindow, /* dest window */ - 0, 0, 0, 0, /* not source window -> move from anywhere */ - x, y ); - } -#endif } //----------------------------------------------------------------------------- @@ -386,23 +359,25 @@ static void draw_frame( GtkWidget *widget, wxWindowGTK *win ) if (win->HasFlag(wxRAISED_BORDER)) { - gtk_draw_shadow( widget->style, - widget->window, - GTK_STATE_NORMAL, - GTK_SHADOW_OUT, - dx, dy, - widget->allocation.width-dw, widget->allocation.height-dh ); + gtk_paint_shadow (widget->style, + widget->window, + GTK_STATE_NORMAL, + GTK_SHADOW_OUT, + NULL, NULL, NULL, // FIXME: No clipping? + dx, dy, + widget->allocation.width-dw, widget->allocation.height-dh ); return; } if (win->HasFlag(wxSUNKEN_BORDER)) { - gtk_draw_shadow( widget->style, - widget->window, - GTK_STATE_NORMAL, - GTK_SHADOW_IN, - dx, dy, - widget->allocation.width-dw, widget->allocation.height-dh ); + gtk_paint_shadow (widget->style, + widget->window, + GTK_STATE_NORMAL, + GTK_SHADOW_IN, + NULL, NULL, NULL, // FIXME: No clipping? + dx, dy, + widget->allocation.width-dw, widget->allocation.height-dh ); return; } @@ -431,30 +406,12 @@ static gint gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g draw_frame( widget, win ); -#ifdef __WXGTK20__ - (* GTK_WIDGET_CLASS (pizza_parent_class)->expose_event) (widget, gdk_event); -#endif return TRUE; } } -//----------------------------------------------------------------------------- -// "draw" of m_widget -//----------------------------------------------------------------------------- - -#ifndef __WXGTK20__ - -extern "C" { -static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNUSED(rect), wxWindowGTK *win ) -{ - draw_frame( widget, win ); -} -} - -#endif // GTK+ < 2.0 - //----------------------------------------------------------------------------- // "size_request" of m_widget //----------------------------------------------------------------------------- @@ -520,7 +477,6 @@ static int gtk_window_expose_callback( GtkWidget *widget, if (g_isIdle) wxapp_install_idle_handler(); -#ifdef __WXGTK20__ // This callback gets called in drawing-idle time under // GTK 2.0, so we don't need to defer anything to idle // time anymore. @@ -558,149 +514,13 @@ static int gtk_window_expose_callback( GtkWidget *widget, win->GtkSendPaintEvents(); - // Let parent window draw window less widgets + // Let parent window draw window-less widgets (* GTK_WIDGET_CLASS (pizza_parent_class)->expose_event) (widget, gdk_event); -#else - // This gets called immediately after an expose event - // under GTK 1.2 so we collect the calls and wait for - // the idle handler to pick things up. - - win->GetUpdateRegion().Union( gdk_event->area.x, - gdk_event->area.y, - gdk_event->area.width, - gdk_event->area.height ); - win->m_clearRegion.Union( gdk_event->area.x, - gdk_event->area.y, - gdk_event->area.width, - gdk_event->area.height ); - - // Actual redrawing takes place in idle time. - // win->GtkUpdate(); -#endif return FALSE; } } -//----------------------------------------------------------------------------- -// "event" of m_wxwindow -//----------------------------------------------------------------------------- - -#ifndef __WXGTK20__ - -// GTK thinks it is clever and filters out a certain amount of "unneeded" -// expose events. We need them, of course, so we override the main event -// procedure in GtkWidget by giving our own handler for all system events. -// There, we look for expose events ourselves whereas all other events are -// handled normally. - -extern "C" { -static -gint gtk_window_event_event_callback( GtkWidget *widget, - GdkEventExpose *event, - wxWindow *win ) -{ - if (event->type == GDK_EXPOSE) - { - gint ret = gtk_window_expose_callback( widget, event, win ); - return ret; - } - - return FALSE; -} -} - -#endif // !GTK+ 2 - -//----------------------------------------------------------------------------- -// "draw" of m_wxwindow -//----------------------------------------------------------------------------- - -#ifndef __WXGTK20__ - -// This callback is a complete replacement of the gtk_pizza_draw() function, -// which is disabled. - -extern "C" { -static void gtk_window_draw_callback( GtkWidget *widget, - GdkRectangle *rect, - wxWindow *win ) -{ - DEBUG_MAIN_THREAD - - if (g_isIdle) - wxapp_install_idle_handler(); - - // if there are any children we must refresh everything - // - // VZ: why? - if ( !win->HasFlag(wxFULL_REPAINT_ON_RESIZE) && - win->GetChildren().IsEmpty() ) - { - return; - } - -#if 0 - if (win->GetName()) - { - wxPrintf( wxT("OnDraw from ") ); - if (win->GetClassInfo() && win->GetClassInfo()->GetClassName()) - wxPrintf( win->GetClassInfo()->GetClassName() ); - wxPrintf( wxT(" %d %d %d %d\n"), (int)rect->x, - (int)rect->y, - (int)rect->width, - (int)rect->height ); - } -#endif - -#ifndef __WXUNIVERSAL__ - GtkPizza *pizza = GTK_PIZZA (widget); - - if (win->GetThemeEnabled() && win->GetBackgroundStyle() == wxBG_STYLE_SYSTEM) - { - wxWindow *parent = win->GetParent(); - while (parent && !parent->IsTopLevel()) - parent = parent->GetParent(); - if (!parent) - parent = win; - - gtk_paint_flat_box (parent->m_widget->style, - pizza->bin_window, - GTK_STATE_NORMAL, - GTK_SHADOW_NONE, - rect, - parent->m_widget, - (char *)"base", - 0, 0, -1, -1); - } -#endif - - win->m_clearRegion.Union( rect->x, rect->y, rect->width, rect->height ); - win->GetUpdateRegion().Union( rect->x, rect->y, rect->width, rect->height ); - - // Update immediately, not in idle time. - win->GtkUpdate(); - -#ifndef __WXUNIVERSAL__ - // Redraw child widgets - GList *children = pizza->children; - while (children) - { - GtkPizzaChild *child = (GtkPizzaChild*) children->data; - children = children->next; - - GdkRectangle child_area; - if (gtk_widget_intersect (child->widget, rect, &child_area)) - { - gtk_widget_draw (child->widget, &child_area /* (GdkRectangle*) NULL*/ ); - } - } -#endif -} -} - -#endif - //----------------------------------------------------------------------------- // "key_press_event" from any window //----------------------------------------------------------------------------- @@ -1011,6 +831,10 @@ static void wxFillOtherKeyEventFields(wxKeyEvent& event, event.m_rawFlags = 0; #if wxUSE_UNICODE event.m_uniChar = gdk_keyval_to_unicode(gdk_event->keyval); + if ( gdk_event->type == GDK_KEY_PRESS || gdk_event->type == GDK_KEY_RELEASE ) + { + event.m_uniChar = toupper(event.m_uniChar); + } #endif wxGetMousePosition( &x, &y ); win->ScreenToClient( &x, &y ); @@ -1059,7 +883,7 @@ wxTranslateGTKKeyEventToWx(wxKeyEvent& event, } // we want to always get the same key code when the same key is - // pressed regardless of the state of the modifies, i.e. on a + // pressed regardless of the state of the modifiers, i.e. on a // standard US keyboard pressing '5' or '%' ('5' key with // Shift) should result in the same key code in OnKeyDown(): // '5' (although OnChar() will get either '5' or '%'). @@ -1123,7 +947,6 @@ wxTranslateGTKKeyEventToWx(wxKeyEvent& event, } -#ifdef __WXGTK20__ struct wxGtkIMData { GtkIMContext *context; @@ -1139,7 +962,6 @@ struct wxGtkIMData g_object_unref(context); } }; -#endif extern "C" { static gint gtk_window_key_press_callback( GtkWidget *widget, @@ -1173,7 +995,6 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, return_after_IM = true; } -#ifdef __WXGTK20__ // 2005.01.26 modified by Hong Jen Yee (hzysoft@sina.com.tw): // When we get a key_press event here, it could be originate // from the current widget or its child widgets. However, only the widget @@ -1198,71 +1019,10 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, return true; } } -#endif + if (return_after_IM) return false; -#ifndef __WXGTK20__ - // This is for GTK+ 1.2 only. The char event generatation for GTK+ 2.0 is done - // in the "commit" handler. - - // 2005.02.02 modified by Hong Jen Yee (hzysoft@sina.com.tw). - // In GTK+ 1.2, strings sent by IMs are also regarded as key_press events whose - // keyCodes cannot be recognized by wxWidgets. These MBCS strings, however, are - // composed of more than one character, which means gdk_event->length will always - // greater than one. When gtk_event->length == 1, this may be an ASCII character - // and can be translated by wx. However, when MBCS characters are sent by IM, - // gdk_event->length will >= 2. So neither should we pass it to accelerator table, - // nor should we pass it to controls. The following explanation was excerpted - // from GDK documentation. - // gint length : the length of string. - // gchar *string : a null-terminated multi-byte string containing the composed - // characters resulting from the key press. When text is being input, in a GtkEntry - // for example, it is these characters which should be added to the input buffer. - // When using Input Methods to support internationalized text input, the composed - // characters appear here after the pre-editing has been completed. - - if ( (!ret) && (gdk_event->length > 1) ) // If this event contains a pre-edited string from IM. - { - // We should translate this key event into wxEVT_CHAR not wxEVT_KEY_DOWN. - #if wxUSE_UNICODE // GTK+ 1.2 is not UTF-8 based. - const wxWCharBuffer string = wxConvLocal.cMB2WC( gdk_event->string ); - if( !string ) - return false; - #else - const char* string = gdk_event->string; - #endif - - // Implement OnCharHook by checking ancesteror top level windows - wxWindow *parent = win; - while (parent && !parent->IsTopLevel()) - parent = parent->GetParent(); - - for( const wxChar* pstr = string; *pstr; pstr++ ) - { - #if wxUSE_UNICODE - event.m_uniChar = *pstr; - // Backward compatible for ISO-8859-1 - event.m_keyCode = *pstr < 256 ? event.m_uniChar : 0; - #else - event.m_keyCode = *pstr; - #endif - if (parent) - { - event.SetEventType( wxEVT_CHAR_HOOK ); - ret = parent->GetEventHandler()->ProcessEvent( event ); - } - if (!ret) - { - event.SetEventType(wxEVT_CHAR); - win->GetEventHandler()->ProcessEvent( event ); - } - } - return true; - } - -#endif // #ifndef __WXGTK20__ - #if wxUSE_ACCEL if (!ret) { @@ -1311,7 +1071,17 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, event.m_keyCode = key_code; - // Implement OnCharHook by checking ancesteror top level windows + // To conform to the docs we need to translate Ctrl-alpha + // characters to values in the range 1-26. + if (event.ControlDown() && key_code >= 'a' && key_code <= 'z' ) + { + event.m_keyCode = key_code - 'a' + 1; +#if wxUSE_UNICODE + event.m_uniChar = event.m_keyCode; +#endif + } + + // Implement OnCharHook by checking ancestor top level windows wxWindow *parent = win; while (parent && !parent->IsTopLevel()) parent = parent->GetParent(); @@ -1336,7 +1106,7 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, // win is a control: tab can be propagated up if ( !ret && ((gdk_event->keyval == GDK_Tab) || (gdk_event->keyval == GDK_ISO_Left_Tab)) && -// VZ: testing for wxTE_PROCESS_TAB shouldn't be done here the control may +// VZ: testing for wxTE_PROCESS_TAB shouldn't be done here - the control may // have this style, yet choose not to process this particular TAB in which // case TAB must still work as a navigational character // JS: enabling again to make consistent with other platforms @@ -1388,15 +1158,15 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, if ( btnCancel ) { - wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL); - event.SetEventObject(btnCancel); - ret = btnCancel->GetEventHandler()->ProcessEvent(event); + wxCommandEvent eventClick(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL); + eventClick.SetEventObject(btnCancel); + ret = btnCancel->GetEventHandler()->ProcessEvent(eventClick); } } if (ret) { - gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" ); + g_signal_stop_emission_by_name (widget, "key_press_event"); return TRUE; } @@ -1404,7 +1174,6 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, } } -#ifdef __WXGTK20__ extern "C" { static void gtk_wxwindow_commit_cb (GtkIMContext *context, const gchar *str, @@ -1446,6 +1215,17 @@ static void gtk_wxwindow_commit_cb (GtkIMContext *context, #else event.m_keyCode = *pstr; #endif // wxUSE_UNICODE + + // To conform to the docs we need to translate Ctrl-alpha + // characters to values in the range 1-26. + if (event.ControlDown() && *pstr >= 'a' && *pstr <= 'z' ) + { + event.m_keyCode = *pstr - 'a' + 1; +#if wxUSE_UNICODE + event.m_uniChar = event.m_keyCode; +#endif + } + if (parent) { event.SetEventType( wxEVT_CHAR_HOOK ); @@ -1460,7 +1240,6 @@ static void gtk_wxwindow_commit_cb (GtkIMContext *context, } } } -#endif //----------------------------------------------------------------------------- @@ -1486,14 +1265,14 @@ static gint gtk_window_key_release_callback( GtkWidget *widget, wxKeyEvent event( wxEVT_KEY_UP ); if ( !wxTranslateGTKKeyEventToWx(event, win, gdk_event) ) { - // unknown key pressed, ignore (the event would be useless anyhow + // unknown key pressed, ignore (the event would be useless anyhow) return FALSE; } if ( !win->GetEventHandler()->ProcessEvent( event ) ) return FALSE; - gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_release_event" ); + g_signal_stop_emission_by_name (widget, "key_release_event"); return TRUE; } } @@ -1673,7 +1452,7 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, */ } - // GDK sends surplus button down event + // GDK sends surplus button down events // before a double click event. We // need to filter these out. if (gdk_event->type == GDK_BUTTON_PRESS) @@ -1789,35 +1568,19 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, AdjustEventButtonState(event); - // wxListBox actually get mouse events from the item, so we need to give it + // wxListBox actually gets mouse events from the item, so we need to give it // a chance to correct this win->FixUpMouseEvent(widget, event.m_x, event.m_y); - // find the correct window to send the event too: it may be a different one - // from the one which got it at GTK+ level because some control don't have + // find the correct window to send the event to: it may be a different one + // from the one which got it at GTK+ level because some controls don't have // their own X window and thus cannot get any events. if ( !g_captureWindow ) win = FindWindowForMouseEvent(win, event.m_x, event.m_y); - gs_timeLastClick = gdk_event->time; - -#ifndef __WXGTK20__ - if (event_type == wxEVT_LEFT_DCLICK) - { - // GTK 1.2 crashes when intercepting double - // click events from both wxSpinButton and - // wxSpinCtrl - if (GTK_IS_SPIN_BUTTON(win->m_widget)) - { - // Just disable this event for now. - return FALSE; - } - } -#endif - if (win->GetEventHandler()->ProcessEvent( event )) { - gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "button_press_event" ); + g_signal_stop_emission_by_name (widget, "button_press_event"); return TRUE; } @@ -1896,7 +1659,7 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, if (win->GetEventHandler()->ProcessEvent( event )) { - gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "button_release_event" ); + g_signal_stop_emission_by_name (widget, "button_release_event"); return TRUE; } @@ -1958,11 +1721,11 @@ static gint gtk_window_motion_notify_callback( GtkWidget *widget, // the mouse changed window g_captureWindowHasMouse = hasMouse; - wxMouseEvent event(g_captureWindowHasMouse ? wxEVT_ENTER_WINDOW - : wxEVT_LEAVE_WINDOW); - InitMouseEvent(win, event, gdk_event); - event.SetEventObject(win); - win->GetEventHandler()->ProcessEvent(event); + wxMouseEvent eventM(g_captureWindowHasMouse ? wxEVT_ENTER_WINDOW + : wxEVT_LEAVE_WINDOW); + InitMouseEvent(win, eventM, gdk_event); + eventM.SetEventObject(win); + win->GetEventHandler()->ProcessEvent(eventM); } } else // no capture @@ -1972,7 +1735,7 @@ static gint gtk_window_motion_notify_callback( GtkWidget *widget, if (win->GetEventHandler()->ProcessEvent( event )) { - gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "motion_notify_event" ); + g_signal_stop_emission_by_name (widget, "motion_notify_event"); return TRUE; } @@ -1980,7 +1743,6 @@ static gint gtk_window_motion_notify_callback( GtkWidget *widget, } } -#ifdef __WXGTK20__ //----------------------------------------------------------------------------- // "mouse_wheel_event" //----------------------------------------------------------------------------- @@ -2030,7 +1792,7 @@ static gint gtk_window_wheel_callback (GtkWidget * widget, if (win->GetEventHandler()->ProcessEvent( event )) { - gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "scroll_event" ); + g_signal_stop_emission_by_name (widget, "scroll_event"); return TRUE; } @@ -2052,7 +1814,6 @@ static gboolean wxgtk_window_popup_menu_callback(GtkWidget*, wxWindowGTK* win) return win->GetEventHandler()->ProcessEvent(event); } } -#endif // __WXGTK20__ //----------------------------------------------------------------------------- // "focus_in_event" @@ -2083,10 +1844,8 @@ static gint gtk_window_focus_in_callback( GtkWidget *widget, if (g_isIdle) wxapp_install_idle_handler(); -#ifdef __WXGTK20__ if (win->m_imData) gtk_im_context_focus_in(win->m_imData->context); -#endif g_focusWindowLast = g_focusWindow = win; @@ -2116,7 +1875,7 @@ static gint gtk_window_focus_in_callback( GtkWidget *widget, if ( DoSendFocusEvents(win) ) { - gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "focus_in_event" ); + g_signal_stop_emission_by_name (widget, "focus_in_event"); return TRUE; } } @@ -2137,10 +1896,8 @@ static gint gtk_window_focus_out_callback( GtkWidget *widget, GdkEventFocus *gdk if (g_isIdle) wxapp_install_idle_handler(); -#ifdef __WXGTK20__ if (win->m_imData) gtk_im_context_focus_out(win->m_imData->context); -#endif wxLogTrace( TRACE_FOCUS, _T("%s: focus out"), win->GetName().c_str() ); @@ -2223,7 +1980,7 @@ gint gtk_window_enter_callback( GtkWidget *widget, if (win->GetEventHandler()->ProcessEvent( event )) { - gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "enter_notify_event" ); + g_signal_stop_emission_by_name (widget, "enter_notify_event"); return TRUE; } @@ -2275,7 +2032,7 @@ static gint gtk_window_leave_callback( GtkWidget *widget, GdkEventCrossing *gdk_ if (win->GetEventHandler()->ProcessEvent( event )) { - gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "leave_notify_event" ); + g_signal_stop_emission_by_name (widget, "leave_notify_event"); return TRUE; } @@ -2289,7 +2046,6 @@ static gint gtk_window_leave_callback( GtkWidget *widget, GdkEventCrossing *gdk_ extern "C" { static void gtk_window_vscroll_callback( GtkAdjustment *adjust, - SCROLLBAR_CBACK_ARG wxWindowGTK *win ) { DEBUG_MAIN_THREAD @@ -2306,10 +2062,7 @@ static void gtk_window_vscroll_callback( GtkAdjustment *adjust, win->m_oldVerticalPos = adjust->value; -#ifndef __WXGTK20__ - GtkScrolledWindow *sw = GTK_SCROLLED_WINDOW(win->m_widget); -#endif - wxEventType command = GtkScrollWinTypeToWx(GET_SCROLL_TYPE(sw->vscrollbar)); + wxEventType command = GtkScrollWinTypeToWx(GTK_SCROLL_JUMP); int value = (int)(adjust->value+0.5); @@ -2325,7 +2078,6 @@ static void gtk_window_vscroll_callback( GtkAdjustment *adjust, extern "C" { static void gtk_window_hscroll_callback( GtkAdjustment *adjust, - SCROLLBAR_CBACK_ARG wxWindowGTK *win ) { DEBUG_MAIN_THREAD @@ -2339,10 +2091,7 @@ static void gtk_window_hscroll_callback( GtkAdjustment *adjust, float diff = adjust->value - win->m_oldHorizontalPos; if (fabs(diff) < 0.2) return; -#ifndef __WXGTK20__ - GtkScrolledWindow *sw = GTK_SCROLLED_WINDOW(win->m_widget); -#endif - wxEventType command = GtkScrollWinTypeToWx(GET_SCROLL_TYPE(sw->hscrollbar)); + wxEventType command = GtkScrollWinTypeToWx(GTK_SCROLL_JUMP); win->m_oldHorizontalPos = adjust->value; @@ -2371,8 +2120,8 @@ static gint gtk_scrollbar_button_press_callback( GtkRange *widget, g_blockEventsOnScroll = true; - // FIXME: there is no 'slider' field in GTK+ 2.0 any more -#ifndef __WXGTK20__ +// FIXME: there is no 'slider' field in GTK+ 2.0 any more +#if 0 win->m_isScrolling = (gdk_event->window == widget->slider); #endif @@ -2454,14 +2203,12 @@ gtk_window_realized_callback( GtkWidget *m_widget, wxWindow *win ) if (g_isIdle) wxapp_install_idle_handler(); -#ifdef __WXGTK20__ if (win->m_imData) { GtkPizza *pizza = GTK_PIZZA( m_widget ); gtk_im_context_set_client_window( win->m_imData->context, pizza->bin_window ); } -#endif wxWindowCreateEvent event( win ); event.SetEventObject( win ); @@ -2670,6 +2417,31 @@ wxWindow *wxGetActiveWindow() return wxWindow::FindFocus(); } + +wxMouseState wxGetMouseState() +{ + wxMouseState ms; + + gint x; + gint y; + GdkModifierType mask; + + gdk_window_get_pointer(NULL, &x, &y, &mask); + + ms.SetX(x); + ms.SetY(y); + ms.SetLeftDown(mask & GDK_BUTTON1_MASK); + ms.SetMiddleDown(mask & GDK_BUTTON2_MASK); + ms.SetRightDown(mask & GDK_BUTTON3_MASK); + + ms.SetControlDown(mask & GDK_CONTROL_MASK); + ms.SetShiftDown(mask & GDK_SHIFT_MASK); + ms.SetAltDown(mask & GDK_MOD1_MASK); + ms.SetMetaDown(mask & GDK_MOD2_MASK); + + return ms; +} + //----------------------------------------------------------------------------- // wxWindowGTK //----------------------------------------------------------------------------- @@ -2726,16 +2498,8 @@ void wxWindowGTK::Init() m_cursor = *wxSTANDARD_CURSOR; -#ifdef __WXGTK20__ m_imData = NULL; - m_x11Context = NULL; m_dirtyTabOrder = false; -#else -#ifdef HAVE_XIM - m_ic = (GdkIC*) NULL; - m_icattr = (GdkICAttr*) NULL; -#endif -#endif } wxWindowGTK::wxWindowGTK() @@ -2819,39 +2583,35 @@ bool wxWindowGTK::Create( wxWindow *parent, m_vAdjust->step_increment = 1.0; m_vAdjust->page_increment = 1.0; m_vAdjust->page_size = 5.0; - gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "changed" ); + g_signal_emit_by_name (m_vAdjust, "changed"); m_hAdjust->lower = 0.0; m_hAdjust->upper = 1.0; m_hAdjust->value = 0.0; m_hAdjust->step_increment = 1.0; m_hAdjust->page_increment = 1.0; m_hAdjust->page_size = 5.0; - gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "changed" ); + g_signal_emit_by_name (m_hAdjust, "changed"); // these handlers block mouse events to any window during scrolling such as // motion events and prevent GTK and wxWidgets from fighting over where the // slider should be - - gtk_signal_connect( GTK_OBJECT(scrolledWindow->vscrollbar), "button_press_event", - (GtkSignalFunc)gtk_scrollbar_button_press_callback, (gpointer) this ); - - gtk_signal_connect( GTK_OBJECT(scrolledWindow->hscrollbar), "button_press_event", - (GtkSignalFunc)gtk_scrollbar_button_press_callback, (gpointer) this ); - - gtk_signal_connect( GTK_OBJECT(scrolledWindow->vscrollbar), "button_release_event", - (GtkSignalFunc)gtk_scrollbar_button_release_callback, (gpointer) this ); - - gtk_signal_connect( GTK_OBJECT(scrolledWindow->hscrollbar), "button_release_event", - (GtkSignalFunc)gtk_scrollbar_button_release_callback, (gpointer) this ); + g_signal_connect (scrolledWindow->vscrollbar, "button_press_event", + G_CALLBACK (gtk_scrollbar_button_press_callback), this); + g_signal_connect (scrolledWindow->hscrollbar, "button_press_event", + G_CALLBACK (gtk_scrollbar_button_press_callback), this); + g_signal_connect (scrolledWindow->vscrollbar, "button_release_event", + G_CALLBACK (gtk_scrollbar_button_release_callback), this); + g_signal_connect (scrolledWindow->hscrollbar, "button_release_event", + G_CALLBACK (gtk_scrollbar_button_release_callback), this); // these handlers get notified when screen updates are required either when // scrolling or when the window size (and therefore scrollbar configuration) // has changed - gtk_signal_connect( GTK_OBJECT(m_hAdjust), "value_changed", - (GtkSignalFunc) gtk_window_hscroll_callback, (gpointer) this ); - gtk_signal_connect( GTK_OBJECT(m_vAdjust), "value_changed", - (GtkSignalFunc) gtk_window_vscroll_callback, (gpointer) this ); + g_signal_connect (m_hAdjust, "value_changed", + G_CALLBACK (gtk_window_hscroll_callback), this); + g_signal_connect (m_vAdjust, "value_changed", + G_CALLBACK (gtk_window_vscroll_callback), this); gtk_widget_show( m_wxwindow ); @@ -2885,10 +2645,12 @@ wxWindowGTK::~wxWindowGTK() // propagated to this (soon to be) dead object if (m_focusWidget != NULL) { - gtk_signal_disconnect_by_func( GTK_OBJECT(m_focusWidget), - (GtkSignalFunc) gtk_window_focus_in_callback, (gpointer) this ); - gtk_signal_disconnect_by_func( GTK_OBJECT(m_focusWidget), - (GtkSignalFunc) gtk_window_focus_out_callback, (gpointer) this ); + g_signal_handlers_disconnect_by_func (m_focusWidget, + (gpointer) gtk_window_focus_in_callback, + this); + g_signal_handlers_disconnect_by_func (m_focusWidget, + (gpointer) gtk_window_focus_out_callback, + this); } if (m_widget) @@ -2901,6 +2663,9 @@ wxWindowGTK::~wxWindowGTK() gdk_ic_attr_destroy (m_icattr); #endif + // delete before the widgets to avoid a crash on solaris + delete m_imData; + if (m_wxwindow) { gtk_widget_destroy( m_wxwindow ); @@ -2912,10 +2677,6 @@ wxWindowGTK::~wxWindowGTK() gtk_widget_destroy( m_widget ); m_widget = (GtkWidget*) NULL; } - -#ifdef __WXGTK20__ - delete m_imData; -#endif } bool wxWindowGTK::PreCreation( wxWindowGTK *parent, const wxPoint &pos, const wxSize &size ) @@ -2945,42 +2706,24 @@ void wxWindowGTK::PostCreation() gtk_pizza_set_external( GTK_PIZZA(m_wxwindow), TRUE ); - gtk_signal_connect( GTK_OBJECT(m_wxwindow), "expose_event", - GTK_SIGNAL_FUNC(gtk_window_expose_callback), (gpointer)this ); - -#ifndef __WXGTK20__ - gtk_signal_connect( GTK_OBJECT(m_wxwindow), "draw", - GTK_SIGNAL_FUNC(gtk_window_draw_callback), (gpointer)this ); + g_signal_connect (m_wxwindow, "expose_event", + G_CALLBACK (gtk_window_expose_callback), this); - if (!HasFlag(wxFULL_REPAINT_ON_RESIZE)) - { - gtk_signal_connect( GTK_OBJECT(m_wxwindow), "event", - GTK_SIGNAL_FUNC(gtk_window_event_event_callback), (gpointer)this ); - } -#else // gtk_widget_set_redraw_on_allocate( GTK_WIDGET(m_wxwindow), !HasFlag( wxFULL_REPAINT_ON_RESIZE ) ); -#endif } -#ifdef __WXGTK20__ // Create input method handler m_imData = new wxGtkIMData; // Cannot handle drawing preedited text yet gtk_im_context_set_use_preedit( m_imData->context, FALSE ); - g_signal_connect (G_OBJECT (m_imData->context), "commit", + g_signal_connect (m_imData->context, "commit", G_CALLBACK (gtk_wxwindow_commit_cb), this); -#endif // these are called when the "sunken" or "raised" borders are drawn - gtk_signal_connect( GTK_OBJECT(m_widget), "expose_event", - GTK_SIGNAL_FUNC(gtk_window_own_expose_callback), (gpointer)this ); - -#ifndef __WXGTK20__ - gtk_signal_connect( GTK_OBJECT(m_widget), "draw", - GTK_SIGNAL_FUNC(gtk_window_own_draw_callback), (gpointer)this ); -#endif + g_signal_connect (m_widget, "expose_event", + G_CALLBACK (gtk_window_own_expose_callback), this); } // focus handling @@ -2990,11 +2733,10 @@ void wxWindowGTK::PostCreation() if (m_focusWidget == NULL) m_focusWidget = m_widget; - gtk_signal_connect( GTK_OBJECT(m_focusWidget), "focus_in_event", - GTK_SIGNAL_FUNC(gtk_window_focus_in_callback), (gpointer)this ); - - gtk_signal_connect_after( GTK_OBJECT(m_focusWidget), "focus_out_event", - GTK_SIGNAL_FUNC(gtk_window_focus_out_callback), (gpointer)this ); + g_signal_connect (m_focusWidget, "focus_in_event", + G_CALLBACK (gtk_window_focus_in_callback), this); + g_signal_connect_after (m_focusWidget, "focus_out_event", + G_CALLBACK (gtk_window_focus_out_callback), this); } // connect to the various key and mouse handlers @@ -3005,31 +2747,31 @@ void wxWindowGTK::PostCreation() /* We cannot set colours, fonts and cursors before the widget has been realized, so we do this directly after realization */ - gtk_signal_connect( GTK_OBJECT(connect_widget), "realize", - GTK_SIGNAL_FUNC(gtk_window_realized_callback), (gpointer) this ); + g_signal_connect (connect_widget, "realize", + G_CALLBACK (gtk_window_realized_callback), this); if (m_wxwindow) { // Catch native resize events - gtk_signal_connect( GTK_OBJECT(m_wxwindow), "size_allocate", - GTK_SIGNAL_FUNC(gtk_window_size_callback), (gpointer)this ); + g_signal_connect (m_wxwindow, "size_allocate", + G_CALLBACK (gtk_window_size_callback), this); // Initialize XIM support - gtk_signal_connect( GTK_OBJECT(m_wxwindow), "realize", - GTK_SIGNAL_FUNC(gtk_wxwindow_realized_callback), (gpointer) this ); + g_signal_connect (m_wxwindow, "realize", + G_CALLBACK (gtk_wxwindow_realized_callback), this); // And resize XIM window - gtk_signal_connect( GTK_OBJECT(m_wxwindow), "size_allocate", - GTK_SIGNAL_FUNC(gtk_wxwindow_size_callback), (gpointer)this ); + g_signal_connect (m_wxwindow, "size_allocate", + G_CALLBACK (gtk_wxwindow_size_callback), this); } if (GTK_IS_COMBO(m_widget)) { GtkCombo *gcombo = GTK_COMBO(m_widget); - gtk_signal_connect( GTK_OBJECT(gcombo->entry), "size_request", - GTK_SIGNAL_FUNC(wxgtk_combo_size_request_callback), - (gpointer) this ); + g_signal_connect (gcombo->entry, "size_request", + G_CALLBACK (wxgtk_combo_size_request_callback), + this); } else { @@ -3037,9 +2779,9 @@ void wxWindowGTK::PostCreation() // GTK controls, such as the toolbar. With this callback, the // toolbar gets to know the correct size (the one set by the // programmer). Sadly, it misbehaves for wxComboBox. - gtk_signal_connect( GTK_OBJECT(m_widget), "size_request", - GTK_SIGNAL_FUNC(wxgtk_window_size_request_callback), - (gpointer) this ); + g_signal_connect (m_widget, "size_request", + G_CALLBACK (wxgtk_window_size_request_callback), + this); } InheritAttributes(); @@ -3054,33 +2796,24 @@ void wxWindowGTK::PostCreation() void wxWindowGTK::ConnectWidget( GtkWidget *widget ) { - gtk_signal_connect( GTK_OBJECT(widget), "key_press_event", - GTK_SIGNAL_FUNC(gtk_window_key_press_callback), (gpointer)this ); - - gtk_signal_connect( GTK_OBJECT(widget), "key_release_event", - GTK_SIGNAL_FUNC(gtk_window_key_release_callback), (gpointer)this ); - - gtk_signal_connect( GTK_OBJECT(widget), "button_press_event", - GTK_SIGNAL_FUNC(gtk_window_button_press_callback), (gpointer)this ); - - gtk_signal_connect( GTK_OBJECT(widget), "button_release_event", - GTK_SIGNAL_FUNC(gtk_window_button_release_callback), (gpointer)this ); - - gtk_signal_connect( GTK_OBJECT(widget), "motion_notify_event", - GTK_SIGNAL_FUNC(gtk_window_motion_notify_callback), (gpointer)this ); - -#ifdef __WXGTK20__ - gtk_signal_connect( GTK_OBJECT(widget), "scroll_event", - GTK_SIGNAL_FUNC(gtk_window_wheel_callback), (gpointer)this ); - g_signal_connect(widget, "popup_menu", - G_CALLBACK(wxgtk_window_popup_menu_callback), this); -#endif - - gtk_signal_connect( GTK_OBJECT(widget), "enter_notify_event", - GTK_SIGNAL_FUNC(gtk_window_enter_callback), (gpointer)this ); - - gtk_signal_connect( GTK_OBJECT(widget), "leave_notify_event", - GTK_SIGNAL_FUNC(gtk_window_leave_callback), (gpointer)this ); + g_signal_connect (widget, "key_press_event", + G_CALLBACK (gtk_window_key_press_callback), this); + g_signal_connect (widget, "key_release_event", + G_CALLBACK (gtk_window_key_release_callback), this); + g_signal_connect (widget, "button_press_event", + G_CALLBACK (gtk_window_button_press_callback), this); + g_signal_connect (widget, "button_release_event", + 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 (gtk_window_wheel_callback), this); + g_signal_connect (widget, "popup_menu", + G_CALLBACK (wxgtk_window_popup_menu_callback), this); + g_signal_connect (widget, "enter_notify_event", + G_CALLBACK (gtk_window_enter_callback), this); + g_signal_connect (widget, "leave_notify_event", + G_CALLBACK (gtk_window_leave_callback), this); } bool wxWindowGTK::Destroy() @@ -3173,7 +2906,6 @@ void wxWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags /* the default button has a border around it */ if (GTK_WIDGET_CAN_DEFAULT(m_widget)) { -#ifdef __WXGTK20__ GtkBorder *default_border = NULL; gtk_widget_style_get( m_widget, "default_border", &default_border, NULL ); if (default_border) @@ -3184,12 +2916,6 @@ void wxWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags bottom_border += default_border->bottom; g_free( default_border ); } -#else - left_border = 6; - right_border = 6; - top_border = 6; - bottom_border = 5; -#endif } DoMoveWindow( m_x-top_border, @@ -3228,10 +2954,12 @@ void wxWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags void wxWindowGTK::OnInternalIdle() { -#ifdef __WXGTK20__ if ( m_dirtyTabOrder ) + { + m_dirtyTabOrder = false; RealizeTabOrder(); -#endif + } + // Update style if the window was not yet realized // and SetBackgroundStyle(wxBG_STYLE_CUSTOM) was called if (m_needsStyleChange) @@ -3565,7 +3293,6 @@ int wxWindowGTK::GetCharHeight() const wxFont font = GetFont(); wxCHECK_MSG( font.Ok(), 12, wxT("invalid font") ); -#ifdef __WXGTK20__ PangoContext *context = NULL; if (m_widget) context = gtk_widget_get_pango_context( m_widget ); @@ -3585,11 +3312,6 @@ int wxWindowGTK::GetCharHeight() const g_object_unref( G_OBJECT( layout ) ); return (int) PANGO_PIXELS(rect.height); -#else - GdkFont *gfont = font.GetInternalFont( 1.0 ); - - return gfont->ascent + gfont->descent; -#endif } int wxWindowGTK::GetCharWidth() const @@ -3599,7 +3321,6 @@ int wxWindowGTK::GetCharWidth() const wxFont font = GetFont(); wxCHECK_MSG( font.Ok(), 8, wxT("invalid font") ); -#ifdef __WXGTK20__ PangoContext *context = NULL; if (m_widget) context = gtk_widget_get_pango_context( m_widget ); @@ -3619,11 +3340,6 @@ int wxWindowGTK::GetCharWidth() const g_object_unref( G_OBJECT( layout ) ); return (int) PANGO_PIXELS(rect.width); -#else - GdkFont *gfont = font.GetInternalFont( 1.0 ); - - return gdk_string_width( gfont, "g" ); -#endif } void wxWindowGTK::GetTextExtent( const wxString& string, @@ -3644,7 +3360,6 @@ void wxWindowGTK::GetTextExtent( const wxString& string, return; } -#ifdef __WXGTK20__ PangoContext *context = NULL; if (m_widget) context = gtk_widget_get_pango_context( m_widget ); @@ -3685,13 +3400,6 @@ void wxWindowGTK::GetTextExtent( const wxString& string, if (externalLeading) (*externalLeading) = 0; // ?? g_object_unref( G_OBJECT( layout ) ); -#else - GdkFont *font = fontToUse.GetInternalFont( 1.0 ); - if (x) (*x) = gdk_string_width( font, wxGTK_CONV( string ) ); - if (y) (*y) = font->ascent + font->descent; - if (descent) (*descent) = font->descent; - if (externalLeading) (*externalLeading) = 0; // ?? -#endif } void wxWindowGTK::SetFocus() @@ -3712,13 +3420,11 @@ void wxWindowGTK::SetFocus() } else if (m_widget) { -#ifdef __WXGTK20__ if (GTK_IS_CONTAINER(m_widget)) { gtk_widget_child_focus( m_widget, GTK_DIR_TAB_FORWARD ); } else -#endif if (GTK_WIDGET_CAN_FOCUS(m_widget) && !GTK_WIDGET_HAS_FOCUS (m_widget) ) { @@ -3743,13 +3449,6 @@ void wxWindowGTK::SetFocus() } } else -#ifndef __WXGTK20__ - if (GTK_IS_CONTAINER(m_widget)) - { - gtk_container_focus( GTK_CONTAINER(m_widget), GTK_DIR_TAB_FORWARD ); - } - else -#endif { wxLogTrace(TRACE_FOCUS, _T("Can't set focus to %s(%s)"), @@ -3814,8 +3513,6 @@ void wxWindowGTK::DoAddChild(wxWindowGTK *child) (*m_insertCallback)(this, child); } -#ifdef __WXGTK20__ - void wxWindowGTK::AddChild(wxWindowBase *child) { wxWindowBase::AddChild(child); @@ -3844,14 +3541,42 @@ void wxWindowGTK::RealizeTabOrder() { if (m_wxwindow) { - if (m_children.size() > 0) + if ( !m_children.empty() ) { +#if wxUSE_STATTEXT + // we don't only construct the correct focus chain but also use + // this opportunity to update the mnemonic widgets for all labels + // + // it would be nice to extract this code from here and put it in + // stattext.cpp to reduce dependencies but there is no really easy + // way to do it unfortunately + wxStaticText *lastLabel = NULL; +#endif // wxUSE_STATTEXT + GList *chain = NULL; - for (wxWindowList::const_iterator i = m_children.begin(); - i != m_children.end(); ++i) + for ( wxWindowList::const_iterator i = m_children.begin(); + i != m_children.end(); + ++i ) { - chain = g_list_prepend(chain, (*i)->m_widget); + wxWindowGTK *win = *i; +#if wxUSE_STATTEXT + if ( lastLabel ) + { + if ( win->AcceptsFocusFromKeyboard() ) + { + GtkLabel *l = GTK_LABEL(lastLabel->m_widget); + gtk_label_set_mnemonic_widget(l, win->m_widget); + lastLabel = NULL; + } + } + else // check if this one is a label + { + lastLabel = wxDynamicCast(win, wxStaticText); + } +#endif // wxUSE_STATTEXT + + chain = g_list_prepend(chain, win->m_widget); } chain = g_list_reverse(chain); @@ -3859,17 +3584,13 @@ void wxWindowGTK::RealizeTabOrder() gtk_container_set_focus_chain(GTK_CONTAINER(m_wxwindow), chain); g_list_free(chain); } - else + else // no children { gtk_container_unset_focus_chain(GTK_CONTAINER(m_wxwindow)); } } - - m_dirtyTabOrder = false; } -#endif // __WXGTK20__ - void wxWindowGTK::Raise() { wxCHECK_RET( (m_widget != NULL), wxT("invalid window") ); @@ -3939,67 +3660,6 @@ void wxWindowGTK::Refresh( bool eraseBackground, const wxRect *rect ) if (!m_widget->window) return; -#ifndef __WXGTK20__ - if (g_isIdle) - wxapp_install_idle_handler(); - - wxRect myRect; - if (m_wxwindow && rect) - { - myRect.SetSize(wxSize( m_wxwindow->allocation.width, - m_wxwindow->allocation.height)); - if ( myRect.Intersect(*rect).IsEmpty() ) - { - // nothing to do, rectangle is empty - return; - } - - rect = &myRect; - } - - // schedule the area for later updating in GtkUpdate() - if (eraseBackground && m_wxwindow && m_wxwindow->window) - { - if (rect) - { - m_clearRegion.Union( rect->x, rect->y, rect->width, rect->height ); - } - else - { - m_clearRegion.Clear(); - m_clearRegion.Union( 0, 0, m_wxwindow->allocation.width, m_wxwindow->allocation.height ); - } - } - - if (rect) - { - if (m_wxwindow) - { - m_updateRegion.Union( rect->x, rect->y, rect->width, rect->height ); - } - else - { - GdkRectangle gdk_rect; - gdk_rect.x = rect->x; - gdk_rect.y = rect->y; - gdk_rect.width = rect->width; - gdk_rect.height = rect->height; - gtk_widget_draw( m_widget, &gdk_rect ); - } - } - else - { - if (m_wxwindow) - { - m_updateRegion.Clear(); - m_updateRegion.Union( 0, 0, m_wxwindow->allocation.width, m_wxwindow->allocation.height ); - } - else - { - gtk_widget_draw( m_widget, (GdkRectangle*) NULL ); - } - } -#else // GTK+ 2 if (m_wxwindow) { GdkRectangle gdk_rect, @@ -4019,7 +3679,6 @@ void wxWindowGTK::Refresh( bool eraseBackground, const wxRect *rect ) gdk_window_invalidate_rect( GTK_PIZZA(m_wxwindow)->bin_window, p, TRUE ); } -#endif // GTK+ 1/2 } void wxWindowGTK::Update() @@ -4027,7 +3686,7 @@ void wxWindowGTK::Update() GtkUpdate(); // when we call Update() we really want to update the window immediately on - // screen, even if itmeans flushing the entire queue and hence slowing down + // screen, even if it means flushing the entire queue and hence slowing down // everything -- but it should still be done, it's just that Update() should // be called very rarely gdk_flush(); @@ -4035,13 +3694,8 @@ void wxWindowGTK::Update() void wxWindowGTK::GtkUpdate() { -#ifdef __WXGTK20__ if (m_wxwindow && GTK_PIZZA(m_wxwindow)->bin_window) gdk_window_process_updates( GTK_PIZZA(m_wxwindow)->bin_window, FALSE ); -#else - if (!m_updateRegion.IsEmpty()) - GtkSendPaintEvents(); -#endif // for consistency with other platforms (and also because it's convenient // to be able to update an entire TLW by calling Update() only once), we @@ -4058,9 +3712,6 @@ void wxWindowGTK::GtkSendPaintEvents() { if (!m_wxwindow) { -#ifndef __WXGTK20__ - m_clearRegion.Clear(); -#endif m_updateRegion.Clear(); return; } @@ -4104,7 +3755,6 @@ void wxWindowGTK::GtkSendPaintEvents() } else -#ifdef __WXGTK20__ { wxWindowDC dc( (wxWindow*)this ); dc.SetClippingRegion( m_updateRegion ); @@ -4114,38 +3764,6 @@ void wxWindowGTK::GtkSendPaintEvents() GetEventHandler()->ProcessEvent(erase_event); } -#else - // if (!m_clearRegion.IsEmpty()) // Always send an erase event under GTK 1.2 - { - wxWindowDC dc( (wxWindow*)this ); - if (m_clearRegion.IsEmpty()) - dc.SetClippingRegion( m_updateRegion ); - else - dc.SetClippingRegion( m_clearRegion ); - - wxEraseEvent erase_event( GetId(), &dc ); - erase_event.SetEventObject( this ); - - if (!GetEventHandler()->ProcessEvent(erase_event) && GetBackgroundStyle() != wxBG_STYLE_CUSTOM) - { - if (!g_eraseGC) - { - g_eraseGC = gdk_gc_new( pizza->bin_window ); - gdk_gc_set_fill( g_eraseGC, GDK_SOLID ); - } - gdk_gc_set_foreground( g_eraseGC, GetBackgroundColour().GetColor() ); - - wxRegionIterator upd( m_clearRegion ); - while (upd) - { - gdk_draw_rectangle( pizza->bin_window, g_eraseGC, 1, - upd.GetX(), upd.GetY(), upd.GetWidth(), upd.GetHeight() ); - upd ++; - } - } - m_clearRegion.Clear(); - } -#endif wxNcPaintEvent nc_paint_event( GetId() ); nc_paint_event.SetEventObject( this ); @@ -4157,67 +3775,12 @@ void wxWindowGTK::GtkSendPaintEvents() m_clipPaintRegion = false; -#if !defined(__WXUNIVERSAL__) && !defined(__WXGTK20__) - // The following code will result in all window-less widgets - // being redrawn because the wxWidgets class is allowed to - // paint over the window-less widgets. - - GList *children = pizza->children; - while (children) - { - GtkPizzaChild *child = (GtkPizzaChild*) children->data; - children = children->next; - - if (GTK_WIDGET_NO_WINDOW (child->widget) && - GTK_WIDGET_DRAWABLE (child->widget)) - { - // Get intersection of widget area and update region - wxRegion region( m_updateRegion ); - - GdkEventExpose gdk_event; - gdk_event.type = GDK_EXPOSE; - gdk_event.window = pizza->bin_window; - gdk_event.count = 0; - gdk_event.send_event = TRUE; - - wxRegionIterator upd( m_updateRegion ); - while (upd) - { - GdkRectangle rect; - rect.x = upd.GetX(); - rect.y = upd.GetY(); - rect.width = upd.GetWidth(); - rect.height = upd.GetHeight(); - - if (gtk_widget_intersect (child->widget, &rect, &gdk_event.area)) - { - gtk_widget_event (child->widget, (GdkEvent*) &gdk_event); - } - - upd ++; - } - } - } -#endif // native GTK 1 - m_updateRegion.Clear(); } void wxWindowGTK::ClearBackground() { wxCHECK_RET( m_widget != NULL, wxT("invalid window") ); - -#ifndef __WXGTK20__ - if (m_wxwindow && m_wxwindow->window) - { - m_clearRegion.Clear(); - wxSize size( GetClientSize() ); - m_clearRegion.Union( 0,0,size.x,size.y ); - - // Better do this in idle? - GtkUpdate(); - } -#endif } #if wxUSE_TOOLTIPS @@ -4279,19 +3842,11 @@ bool wxWindowGTK::SetForegroundColour( const wxColour &colour ) return true; } -#ifdef __WXGTK20__ PangoContext *wxWindowGTK::GtkGetPangoDefaultContext() { return gtk_widget_get_pango_context( m_widget ); } -// MR: Returns the same as GtkGetPangoDefaultContext until the symbol can be removed in 2.7.x -PangoContext *wxWindowGTK::GtkGetPangoX11Context() -{ - return gtk_widget_get_pango_context( m_widget ); -} -#endif - GtkRcStyle *wxWindowGTK::CreateWidgetStyle(bool forceStyle) { // do we need to apply any changes at all? @@ -4306,13 +3861,8 @@ GtkRcStyle *wxWindowGTK::CreateWidgetStyle(bool forceStyle) if ( m_font.Ok() ) { -#ifdef __WXGTK20__ style->font_desc = pango_font_description_copy( m_font.GetNativeFontInfo()->description ); -#else - wxString xfontname = m_font.GetNativeFontInfo()->GetXFontName(); - style->fontset_name = g_strdup(xfontname.c_str()); -#endif } if ( m_foregroundColour.Ok() ) @@ -4416,120 +3966,6 @@ bool wxWindowGTK::SetBackgroundStyle(wxBackgroundStyle style) return true; } -//----------------------------------------------------------------------------- -// Pop-up menu stuff -//----------------------------------------------------------------------------- - -#if wxUSE_MENUS_NATIVE - -extern "C" WXDLLIMPEXP_CORE -void gtk_pop_hide_callback( GtkWidget *WXUNUSED(widget), bool* is_waiting ) -{ - *is_waiting = FALSE; -} - -WXDLLIMPEXP_CORE void SetInvokingWindow( wxMenu *menu, wxWindow* win ) -{ - menu->SetInvokingWindow( win ); - - wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst(); - while (node) - { - wxMenuItem *menuitem = node->GetData(); - if (menuitem->IsSubMenu()) - { - SetInvokingWindow( menuitem->GetSubMenu(), win ); - } - - node = node->GetNext(); - } -} - -extern "C" WXDLLIMPEXP_CORE -void wxPopupMenuPositionCallback( GtkMenu *menu, - gint *x, gint *y, -#ifdef __WXGTK20__ - gboolean * WXUNUSED(whatever), -#endif - gpointer user_data ) -{ - // ensure that the menu appears entirely on screen - GtkRequisition req; - gtk_widget_get_child_requisition(GTK_WIDGET(menu), &req); - - wxSize sizeScreen = wxGetDisplaySize(); - wxPoint *pos = (wxPoint*)user_data; - - gint xmax = sizeScreen.x - req.width, - ymax = sizeScreen.y - req.height; - - *x = pos->x < xmax ? pos->x : xmax; - *y = pos->y < ymax ? pos->y : ymax; -} - -bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y ) -{ - wxCHECK_MSG( m_widget != NULL, false, wxT("invalid window") ); - - wxCHECK_MSG( menu != NULL, false, wxT("invalid popup-menu") ); - - // NOTE: if you change this code, you need to update - // the same code in taskbar.cpp as well. This - // is ugly code duplication, I know, - - SetInvokingWindow( menu, this ); - - menu->UpdateUI(); - - bool is_waiting = true; - - gulong handler = gtk_signal_connect( GTK_OBJECT(menu->m_menu), - "hide", - GTK_SIGNAL_FUNC(gtk_pop_hide_callback), - (gpointer)&is_waiting ); - - wxPoint pos; - gpointer userdata; - GtkMenuPositionFunc posfunc; - if ( x == -1 && y == -1 ) - { - // use GTK's default positioning algorithm - userdata = NULL; - posfunc = NULL; - } - else - { - pos = ClientToScreen(wxPoint(x, y)); - userdata = &pos; - posfunc = wxPopupMenuPositionCallback; - } - - gtk_menu_popup( - GTK_MENU(menu->m_menu), - (GtkWidget *) NULL, // parent menu shell - (GtkWidget *) NULL, // parent menu item - posfunc, // function to position it - userdata, // client data - 0, // button used to activate it -#ifdef __WXGTK20__ - gtk_get_current_event_time() -#else - gs_timeLastClick // the time of activation -#endif - ); - - while (is_waiting) - { - gtk_main_iteration(); - } - - gtk_signal_disconnect(GTK_OBJECT(menu->m_menu), handler); - - return true; -} - -#endif // wxUSE_MENUS_NATIVE - #if wxUSE_DRAG_AND_DROP void wxWindowGTK::SetDropTarget( wxDropTarget *dropTarget ) @@ -4697,60 +4133,43 @@ void wxWindowGTK::SetScrollbar( int orient, int pos, int thumbVisible, } if (orient == wxHORIZONTAL) - gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "changed" ); + g_signal_emit_by_name (m_hAdjust, "changed"); else - gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "changed" ); + g_signal_emit_by_name (m_vAdjust, "changed"); +} + +void wxWindowGTK::GtkUpdateScrollbar(int orient) +{ + GtkAdjustment *adj = orient == wxHORIZONTAL ? m_hAdjust : m_vAdjust; + gpointer fn = orient == wxHORIZONTAL + ? (gpointer) gtk_window_hscroll_callback + : (gpointer) gtk_window_vscroll_callback; + + g_signal_handlers_disconnect_by_func (adj, fn, this); + g_signal_emit_by_name (adj, "value_changed"); + g_signal_connect (adj, "value_changed", G_CALLBACK (fn), this); } void wxWindowGTK::SetScrollPos( int orient, int pos, bool WXUNUSED(refresh) ) { wxCHECK_RET( m_widget != NULL, wxT("invalid window") ); - wxCHECK_RET( m_wxwindow != NULL, wxT("window needs client area for scrolling") ); - if (orient == wxHORIZONTAL) - { - float fpos = (float)pos; - if (fpos > m_hAdjust->upper - m_hAdjust->page_size) fpos = m_hAdjust->upper - m_hAdjust->page_size; - if (fpos < 0.0) fpos = 0.0; - m_oldHorizontalPos = fpos; + GtkAdjustment *adj = orient == wxHORIZONTAL ? m_hAdjust : m_vAdjust; - if (fabs(fpos-m_hAdjust->value) < 0.2) return; - m_hAdjust->value = fpos; - } - else - { - float fpos = (float)pos; - if (fpos > m_vAdjust->upper - m_vAdjust->page_size) fpos = m_vAdjust->upper - m_vAdjust->page_size; - if (fpos < 0.0) fpos = 0.0; - m_oldVerticalPos = fpos; + float fpos = (float)pos; + if (fpos > adj->upper - adj->page_size) + fpos = adj->upper - adj->page_size; + if (fpos < 0.0) + fpos = 0.0; + *(orient == wxHORIZONTAL ? &m_oldHorizontalPos : &m_oldVerticalPos) = fpos; - if (fabs(fpos-m_vAdjust->value) < 0.2) return; - m_vAdjust->value = fpos; - } + if (fabs(fpos-adj->value) < 0.2) + return; + adj->value = fpos; - if (m_wxwindow->window) + if ( m_wxwindow->window ) { - if (orient == wxHORIZONTAL) - { - gtk_signal_disconnect_by_func( GTK_OBJECT(m_hAdjust), - (GtkSignalFunc) gtk_window_hscroll_callback, (gpointer) this ); - - gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "value_changed" ); - - gtk_signal_connect( GTK_OBJECT(m_hAdjust), "value_changed", - (GtkSignalFunc) gtk_window_hscroll_callback, (gpointer) this ); - } - else - { - gtk_signal_disconnect_by_func( GTK_OBJECT(m_vAdjust), - (GtkSignalFunc) gtk_window_vscroll_callback, (gpointer) this ); - - gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "value_changed" ); - - gtk_signal_connect( GTK_OBJECT(m_vAdjust), "value_changed", - (GtkSignalFunc) gtk_window_vscroll_callback, (gpointer) this ); - } } } @@ -4799,28 +4218,6 @@ void wxWindowGTK::ScrollWindow( int dx, int dy, const wxRect* WXUNUSED(rect) ) // No scrolling requested. if ((dx == 0) && (dy == 0)) return; -#ifndef __WXGTK20__ - if (!m_updateRegion.IsEmpty()) - { - m_updateRegion.Offset( dx, dy ); - - int cw = 0; - int ch = 0; - GetClientSize( &cw, &ch ); - m_updateRegion.Intersect( 0, 0, cw, ch ); - } - - if (!m_clearRegion.IsEmpty()) - { - m_clearRegion.Offset( dx, dy ); - - int cw = 0; - int ch = 0; - GetClientSize( &cw, &ch ); - m_clearRegion.Intersect( 0, 0, cw, ch ); - } -#endif - m_clipPaintRegion = true; gtk_pizza_scroll( GTK_PIZZA(m_wxwindow), -dx, -dy ); @@ -4828,6 +4225,11 @@ void wxWindowGTK::ScrollWindow( int dx, int dy, const wxRect* WXUNUSED(rect) ) m_clipPaintRegion = false; } +void wxWindowGTK::SetWindowStyleFlag( long style ) +{ + // Updates the internal variable. NB: Now m_windowStyle bits carry the _new_ style values already + wxWindowBase::SetWindowStyleFlag(style); +} // Find the wxWindow at the current mouse position, also returning the mouse // position. @@ -4868,8 +4270,19 @@ wxPoint wxGetMousePosition() } +// Needed for implementing e.g. combobox on wxGTK within a modal dialog. +void wxAddGrab(wxWindow* window) +{ + gtk_grab_add( (GtkWidget*) window->GetHandle() ); +} + +void wxRemoveGrab(wxWindow* window) +{ + gtk_grab_remove( (GtkWidget*) window->GetHandle() ); +} + // ---------------------------------------------------------------------------- -// wxDCModule +// wxWinModule // ---------------------------------------------------------------------------- class wxWinModule : public wxModule @@ -4898,4 +4311,3 @@ void wxWinModule::OnExit() gdk_gc_unref( g_eraseGC ); } -// vi:sts=4:sw=4:et