X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2109c0243d21e5e94fe3962b6c71da3cb84436fb..f7732fa59a48ada168c88ccd004eca3c848d8a05:/src/gtk/window.cpp diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index ff1855a547..53bf0da0d8 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -332,41 +332,12 @@ void wxgtk_window_size_request_callback(GtkWidget * WXUNUSED(widget), extern "C" { static gboolean -gtk_window_expose_callback( GtkWidget *widget, +gtk_window_expose_callback( GtkWidget*, GdkEventExpose *gdk_event, wxWindow *win ) { DEBUG_MAIN_THREAD - wxPizza *pizza = WX_PIZZA(widget); - GdkWindow *backing_window = pizza->m_backing_window; - - int w = widget->allocation.width; - int h = widget->allocation.height; - - // if this event is for the border-only GdkWindow - if (backing_window && gdk_event->window == pizza->m_backing_window) - { - if (win->HasFlag(wxBORDER_SIMPLE)) - { - GdkGC* gc = gdk_gc_new(gdk_event->window); - gdk_gc_set_foreground(gc, &widget->style->black); - gdk_draw_rectangle(gdk_event->window, gc, false, 0, 0, w - 1, h - 1); - g_object_unref(gc); - } - else - { - GtkShadowType shadow = GTK_SHADOW_IN; - if (win->HasFlag(wxBORDER_RAISED)) - shadow = GTK_SHADOW_OUT; - gtk_paint_shadow( - widget->style, gdk_event->window, GTK_STATE_NORMAL, - shadow, NULL, widget, "viewport", 0, 0, w, h); - } - - return TRUE; - } - #if 0 if (win->GetName()) { @@ -405,14 +376,16 @@ gtk_window_expose_callback( GtkWidget *widget, // "expose_event" from m_widget, for drawing border //----------------------------------------------------------------------------- -#if 0 -ndef __WXUNIVERSAL__ +#ifndef __WXUNIVERSAL__ + +GtkWidget* GetEntryWidget(); + extern "C" { static gboolean -expose_event_border(GtkWidget* widget, GdkEventExpose* event, wxWindow* win) +expose_event_border(GtkWidget* widget, GdkEventExpose* gdk_event, wxWindow* win) { // if this event is not for the GdkWindow the border is drawn on - if (win->m_wxwindow == win->m_widget && event->window == widget->window) + if (win->m_wxwindow == win->m_widget && gdk_event->window == widget->window) return false; int x = 0; @@ -427,10 +400,9 @@ expose_event_border(GtkWidget* widget, GdkEventExpose* event, wxWindow* win) int h = win->m_wxwindow->allocation.height; if (win->HasFlag(wxBORDER_SIMPLE)) { - GdkGC* gc; - gc = gdk_gc_new(event->window); + GdkGC* gc = gdk_gc_new(gdk_event->window); gdk_gc_set_foreground(gc, &widget->style->black); - gdk_draw_rectangle(event->window, gc, false, x, y, w - 1, h - 1); + gdk_draw_rectangle(gdk_event->window, gc, false, x, y, w - 1, h - 1); g_object_unref(gc); } else @@ -438,9 +410,20 @@ expose_event_border(GtkWidget* widget, GdkEventExpose* event, wxWindow* win) GtkShadowType shadow = GTK_SHADOW_IN; if (win->HasFlag(wxBORDER_RAISED)) shadow = GTK_SHADOW_OUT; + + // Style detail to use + const char* detail; + if (widget == win->m_wxwindow) + // for non-scrollable wxWindows + detail = "entry"; + else + // for scrollable ones + detail = "viewport"; + + GtkWidget* styleWidget = GetEntryWidget(); gtk_paint_shadow( - widget->style, event->window, GTK_STATE_NORMAL, - shadow, &event->area, widget, "entry", x, y, w, h); + styleWidget->style, gdk_event->window, GTK_STATE_NORMAL, + shadow, NULL, styleWidget, detail, x, y, w, h); } // no further painting is needed for border-only GdkWindow @@ -931,7 +914,7 @@ gtk_window_key_press_callback( GtkWidget *widget, if( wxTranslateGTKKeyEventToWx(event, win, gdk_event) ) { // Emit KEY_DOWN event - ret = win->GetEventHandler()->ProcessEvent( event ); + ret = win->HandleWindowEvent( event ); } else { @@ -967,7 +950,7 @@ gtk_window_key_press_callback( GtkWidget *widget, if (command != -1) { wxCommandEvent command_event( wxEVT_COMMAND_MENU_SELECTED, command ); - ret = ancestor->GetEventHandler()->ProcessEvent( command_event ); + ret = ancestor->HandleWindowEvent( command_event ); break; } if (ancestor->IsTopLevel()) @@ -1026,13 +1009,13 @@ gtk_window_key_press_callback( GtkWidget *widget, if (parent) { event.SetEventType( wxEVT_CHAR_HOOK ); - ret = parent->GetEventHandler()->ProcessEvent( event ); + ret = parent->HandleWindowEvent( event ); } if (!ret) { event.SetEventType(wxEVT_CHAR); - ret = win->GetEventHandler()->ProcessEvent( event ); + ret = win->HandleWindowEvent( event ); } } } @@ -1102,13 +1085,13 @@ gtk_wxwindow_commit_cb (GtkIMContext * WXUNUSED(context), if (parent) { event.SetEventType( wxEVT_CHAR_HOOK ); - ret = parent->GetEventHandler()->ProcessEvent( event ); + ret = parent->HandleWindowEvent( event ); } if (!ret) { event.SetEventType(wxEVT_CHAR); - ret = window->GetEventHandler()->ProcessEvent( event ); + ret = window->HandleWindowEvent( event ); } } } @@ -1289,7 +1272,7 @@ wxWindowGTK *FindWindowForMouseEvent(wxWindowGTK *win, wxCoord& x, wxCoord& y) bool wxWindowGTK::GTKProcessEvent(wxEvent& event) const { // nothing special at this level - return GetEventHandler()->ProcessEvent(event); + return HandleWindowEvent(event); } int wxWindowGTK::GTKCallbackCommonPrologue(GdkEventAny *event) const @@ -1336,12 +1319,12 @@ static bool DoSendFocusEvents(wxWindow *win) // Notify the parent keeping track of focus for the kbd navigation // purposes that we got it. wxChildFocusEvent eventChildFocus(win); - (void)win->GetEventHandler()->ProcessEvent(eventChildFocus); + (void)win->HandleWindowEvent(eventChildFocus); wxFocusEvent eventFocus(wxEVT_SET_FOCUS, win->GetId()); eventFocus.SetEventObject(win); - return win->GetEventHandler()->ProcessEvent(eventFocus); + return win->HandleWindowEvent(eventFocus); } // all event handlers must have C linkage as they're called from GTK+ C code @@ -1660,6 +1643,8 @@ window_scroll_event(GtkWidget*, GdkEventScroll* gdk_event, wxWindow* win) wxMouseEvent event(wxEVT_MOUSEWHEEL); InitMouseEvent(win, event, gdk_event); + + // FIXME: Get these values from GTK or GDK event.m_linesPerAction = 3; event.m_wheelDelta = 120; if (gdk_event->direction == GDK_SCROLL_UP) @@ -2036,7 +2021,7 @@ gtk_window_grab_broken( GtkWidget*, { wxMouseCaptureLostEvent evt( win->GetId() ); evt.SetEventObject( win ); - win->GetEventHandler()->ProcessEvent( evt ); + win->HandleWindowEvent( evt ); } return false; } @@ -2051,11 +2036,8 @@ void gtk_window_style_set_callback( GtkWidget *WXUNUSED(widget), GtkStyle *previous_style, wxWindow* win ) { - //wxLogDebug(wxT("gtk_window_style_set_callback")); if (win && previous_style) { - wxString name(win->GetName()); - //wxLogDebug(wxT("gtk_window_style_set_callback %s"), name.c_str()); wxSysColourChangedEvent event; event.SetEventObject(win); @@ -2065,40 +2047,28 @@ void gtk_window_style_set_callback( GtkWidget *WXUNUSED(widget), } // extern "C" -// Connect/disconnect style-set - -void wxConnectStyleSet(wxWindow* win) -{ - if (win->m_wxwindow) - g_signal_connect (win->m_wxwindow, "style_set", - G_CALLBACK (gtk_window_style_set_callback), win); -} - -void wxDisconnectStyleSet(wxWindow* win) -{ - if (win->m_wxwindow) - g_signal_handlers_disconnect_by_func (win->m_wxwindow, - (gpointer) gtk_window_style_set_callback, - win); -} - // Helper to suspend colour change event event processing while we change a widget's style class wxSuspendStyleEvents { public: - wxSuspendStyleEvents(wxWindow* win) - { - m_win = win; - if (win->IsTopLevel()) - wxDisconnectStyleSet(win); - } - ~wxSuspendStyleEvents() - { - if (m_win->IsTopLevel()) - wxConnectStyleSet(m_win); - } + wxSuspendStyleEvents(wxWindow* win) + { + m_win = NULL; + if (win->m_wxwindow && win->IsTopLevel()) + { + m_win = win; + g_signal_handlers_block_by_func( + m_win->m_wxwindow, (void*)gtk_window_style_set_callback, m_win); + } + } + ~wxSuspendStyleEvents() + { + if (m_win) + g_signal_handlers_unblock_by_func( + m_win->m_wxwindow, (void*)gtk_window_style_set_callback, m_win); + } - wxWindow* m_win; + wxWindow* m_win; }; // ---------------------------------------------------------------------------- @@ -2258,6 +2228,11 @@ bool wxWindowGTK::Create( wxWindow *parent, long style, const wxString &name ) { + // Get default border + wxBorder border = GetBorder(style); + style &= ~wxBORDER_MASK; + style |= border; + if (!PreCreation( parent, pos, size ) || !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) { @@ -2265,13 +2240,13 @@ bool wxWindowGTK::Create( wxWindow *parent, return false; } + m_wxwindow = wxPizza::New(m_windowStyle); if (!HasFlag(wxHSCROLL) && !HasFlag(wxVSCROLL)) m_widget = m_wxwindow; else { m_widget = gtk_scrolled_window_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL ); - gtk_container_set_resize_mode(GTK_CONTAINER(m_widget), GTK_RESIZE_QUEUE); GtkScrolledWindow *scrolledWindow = GTK_SCROLLED_WINDOW(m_widget); @@ -2439,9 +2414,8 @@ void wxWindowGTK::PostCreation() G_CALLBACK (gtk_wxwindow_commit_cb), this); // border drawing -#if 0 -ndef __WXUNIVERSAL__ - if (HasFlag(wxBORDER_SIMPLE | wxBORDER_RAISED | wxBORDER_SUNKEN)) +#ifndef __WXUNIVERSAL__ + if (HasFlag(wxPizza::BORDER_STYLES)) { g_signal_connect(m_widget, "expose_event", G_CALLBACK(expose_event_border), this); @@ -2687,7 +2661,7 @@ void wxWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags { wxSizeEvent event( wxSize(m_width,m_height), GetId() ); event.SetEventObject( this ); - GetEventHandler()->ProcessEvent( event ); + HandleWindowEvent( event ); } } } @@ -2705,7 +2679,7 @@ bool wxWindowGTK::GtkShowFromOnIdle() gtk_widget_show( m_widget ); wxShowEvent eventShow(GetId(), true); eventShow.SetEventObject(this); - GetEventHandler()->ProcessEvent(eventShow); + HandleWindowEvent(eventShow); m_showOnIdle = false; return true; } @@ -2938,22 +2912,19 @@ bool wxWindowGTK::Show( bool show ) return false; } - if (show) + if (show && m_showOnIdle) { - if (!m_showOnIdle) - { - gtk_widget_show( m_widget ); - wxShowEvent eventShow(GetId(), show); - eventShow.SetEventObject(this); - GetEventHandler()->ProcessEvent(eventShow); - } + // deferred } else { - gtk_widget_hide( m_widget ); + if (show) + gtk_widget_show(m_widget); + else + gtk_widget_hide(m_widget); wxShowEvent eventShow(GetId(), show); eventShow.SetEventObject(this); - GetEventHandler()->ProcessEvent(eventShow); + HandleWindowEvent(eventShow); } return true; @@ -3305,7 +3276,7 @@ wxWindowGTK::AdjustForLayoutDirection(wxCoord x, return x; } -void wxWindowGTK::DoMoveInTabOrder(wxWindow *win, MoveKind move) +void wxWindowGTK::DoMoveInTabOrder(wxWindow *win, WindowOrder move) { wxWindowBase::DoMoveInTabOrder(win, move); m_dirtyTabOrder = true; @@ -3649,7 +3620,6 @@ void wxWindowGTK::GtkSendPaintEvents() } } -#if 0 if (GetThemeEnabled() && (GetBackgroundStyle() == wxBG_STYLE_SYSTEM)) { // find ancestor from which to steal background @@ -3697,20 +3667,16 @@ void wxWindowGTK::GtkSendPaintEvents() wxEraseEvent erase_event( GetId(), &dc ); erase_event.SetEventObject( this ); - GetEventHandler()->ProcessEvent(erase_event); + HandleWindowEvent(erase_event); } - + wxNcPaintEvent nc_paint_event( GetId() ); nc_paint_event.SetEventObject( this ); - GetEventHandler()->ProcessEvent( nc_paint_event ); -#endif - - if (GetName() == "MyMiniControl") - wxPrintf( "MyMini paint\n" ); + HandleWindowEvent( nc_paint_event ); wxPaintEvent paint_event( GetId() ); paint_event.SetEventObject( this ); - GetEventHandler()->ProcessEvent( paint_event ); + HandleWindowEvent( paint_event ); m_clipPaintRegion = false; @@ -4044,7 +4010,7 @@ void wxWindowGTK::GTKReleaseMouseAndNotify() DoReleaseMouse(); wxMouseCaptureLostEvent evt(GetId()); evt.SetEventObject( this ); - GetEventHandler()->ProcessEvent( evt ); + HandleWindowEvent( evt ); } /* static */ @@ -4303,17 +4269,6 @@ 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() ); -} - GdkWindow* wxWindowGTK::GTKGetDrawingWindow() const { GdkWindow* window = NULL;