X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4e5a4c69c540b430fba8efe5dae1bc1ffd5caeca..07d2031dde57711bee35fa0e8ca886fdb7ea0a41:/src/gtk1/window.cpp?ds=inline diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index 9e821ad94e..2699f573a8 100644 --- a/src/gtk1/window.cpp +++ b/src/gtk1/window.cpp @@ -25,6 +25,7 @@ #include "wx/utils.h" #include "wx/dialog.h" #include "wx/msgdlg.h" +#include "wx/module.h" #if wxUSE_DRAG_AND_DROP #include "wx/dnd.h" @@ -39,7 +40,7 @@ #endif // wxUSE_CARET #if wxUSE_TEXTCTRL -#include "wx/textctrl.h" + #include "wx/textctrl.h" #endif #include "wx/menu.h" @@ -76,6 +77,10 @@ #endif #endif +#ifdef __WXGTK20__ +extern GtkContainerClass *pizza_parent_class; +#endif + //----------------------------------------------------------------------------- // documentation on internals //----------------------------------------------------------------------------- @@ -385,7 +390,6 @@ static wxWindowGTK* wxGetTopLevelParent(wxWindowGTK *win) return p; } - static void draw_frame( GtkWidget *widget, wxWindowGTK *win ) { // wxUniversal widgets draw the borders and scrollbars themselves @@ -481,6 +485,11 @@ gint gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_even draw_frame( widget, win ); +#ifdef __WXGTK20__ + + (* GTK_WIDGET_CLASS (pizza_parent_class)->expose_event) (widget, gdk_event); + +#endif return TRUE; } @@ -488,11 +497,15 @@ gint gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_even // "draw" of m_widget //----------------------------------------------------------------------------- +#ifndef __WXGTK20__ + static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNUSED(rect), wxWindowGTK *win ) { draw_frame( widget, win ); } +#endif + //----------------------------------------------------------------------------- // key code mapping routines //----------------------------------------------------------------------------- @@ -818,6 +831,12 @@ static int gtk_window_expose_callback( GtkWidget *widget, // Actual redrawing takes place in idle time. win->Update(); +#ifdef __WXGTK20__ + + (* GTK_WIDGET_CLASS (pizza_parent_class)->expose_event) (widget, gdk_event); + +#endif + return TRUE; } @@ -848,8 +867,10 @@ gint gtk_window_event_event_callback( GtkWidget *widget, // "draw" of m_wxwindow //----------------------------------------------------------------------------- +#ifndef __WXGTK20__ + // This callback is a complete replacement of the gtk_pizza_draw() function, -// which disabled. +// which is disabled. static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, @@ -914,7 +935,7 @@ static void gtk_window_draw_callback( GtkWidget *widget, win->GetUpdateRegion().Union( rect->x, rect->y, rect->width, rect->height ); // Actual redrawing takes place in idle time. - + win->Update(); #ifndef __WXUNIVERSAL__ @@ -934,6 +955,8 @@ static void gtk_window_draw_callback( GtkWidget *widget, #endif } +#endif + //----------------------------------------------------------------------------- // "key_press_event" from any window //----------------------------------------------------------------------------- @@ -980,6 +1003,8 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, event.m_metaDown = (gdk_event->state & GDK_MOD2_MASK); event.m_keyCode = key_code; event.m_scanCode = gdk_event->keyval; + event.m_rawCode = (wxUint32) gdk_event->keyval; + event.m_rawFlags = 0; event.m_x = x; event.m_y = y; event.SetEventObject( win ); @@ -1132,6 +1157,8 @@ static gint gtk_window_key_release_callback( GtkWidget *widget, GdkEventKey *gdk event.m_metaDown = (gdk_event->state & GDK_MOD2_MASK); event.m_keyCode = key_code; event.m_scanCode = gdk_event->keyval; + event.m_rawCode = (wxUint32) gdk_event->keyval; + event.m_rawFlags = 0; event.m_x = x; event.m_y = y; event.SetEventObject( win ); @@ -2329,6 +2356,9 @@ bool wxWindowGTK::Create( wxWindow *parent, } m_insertCallback = wxInsertChildInWindow; + + // always needed for background clearing + m_delayedBackgroundColour = TRUE; m_widget = gtk_scrolled_window_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL ); GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS ); @@ -2344,7 +2374,7 @@ bool wxWindowGTK::Create( wxWindow *parent, m_vAdjust = gtk_range_get_adjustment( GTK_RANGE(scrolledWindow->vscrollbar) ); m_wxwindow = gtk_pizza_new(); - + #ifndef __WXUNIVERSAL__ GtkPizza *pizza = GTK_PIZZA(m_wxwindow); @@ -2525,7 +2555,7 @@ void wxWindowGTK::PostCreation() #ifndef __WXGTK20__ gtk_signal_connect( GTK_OBJECT(m_wxwindow), "draw", GTK_SIGNAL_FUNC(gtk_window_draw_callback), (gpointer)this ); - + if (HasFlag(wxNO_FULL_REPAINT_ON_RESIZE)) { gtk_signal_connect( GTK_OBJECT(m_wxwindow), "event", @@ -2536,7 +2566,7 @@ void wxWindowGTK::PostCreation() #endif } - // these are called when the "sunken" or "raised" borders are drawn */ + // 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 ); @@ -2704,12 +2734,14 @@ void wxWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags int border = 0; int bottom_border = 0; +#ifndef __WXGTK20__ if (GTK_WIDGET_CAN_DEFAULT(m_widget)) { /* the default button has a border around it */ border = 6; bottom_border = 5; } +#endif DoMoveWindow( m_x-border, m_y-border, @@ -2749,7 +2781,7 @@ void wxWindowGTK::OnInternalIdle() { // Update invalidated regions. Update(); - + // Synthetize activate events. if ( g_sendActivateEvent != -1 ) { @@ -3363,18 +3395,23 @@ void wxWindowGTK::GtkSendPaintEvents() { wxWindowDC dc( (wxWindow*)this ); dc.SetClippingRegion( m_clearRegion ); - + wxEraseEvent erase_event( GetId(), &dc ); erase_event.SetEventObject( this ); - + if (!GetEventHandler()->ProcessEvent(erase_event)) { + if (!g_eraseGC) + { + g_eraseGC = gdk_gc_new( GTK_PIZZA(m_wxwindow)->bin_window ); + gdk_gc_set_fill( g_eraseGC, GDK_SOLID ); + } gdk_gc_set_foreground( g_eraseGC, m_backgroundColour.GetColor() ); - + wxRegionIterator upd( m_clearRegion ); while (upd) { - gdk_draw_rectangle( GTK_PIZZA(m_wxwindow)->bin_window, g_eraseGC, 0, + gdk_draw_rectangle( GTK_PIZZA(m_wxwindow)->bin_window, g_eraseGC, 1, upd.GetX(), upd.GetY(), upd.GetWidth(), upd.GetHeight() ); upd ++; } @@ -3397,9 +3434,9 @@ void wxWindowGTK::GtkSendPaintEvents() // The following code will result in all window-less widgets // being redrawn because the wxWindows class is allowed to // paint over the window-less widgets. - + GtkPizza *pizza = GTK_PIZZA(m_wxwindow); - + GList *children = pizza->children; while (children) { @@ -3411,12 +3448,12 @@ void wxWindowGTK::GtkSendPaintEvents() { // 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; - + wxRegionIterator upd( m_updateRegion ); while (upd) { @@ -3425,12 +3462,12 @@ void wxWindowGTK::GtkSendPaintEvents() 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 ++; } } @@ -3449,7 +3486,7 @@ void wxWindowGTK::Clear() if (m_wxwindow && m_wxwindow->window) { -// gdk_window_clear( m_wxwindow->window ); + gdk_window_clear( m_wxwindow->window ); } } @@ -3493,6 +3530,12 @@ bool wxWindowGTK::SetBackgroundColour( const wxColour &colour ) m_delayedBackgroundColour = TRUE; } + if (window) + { + // We need the pixel value e.g. for background clearing. + m_backgroundColour.CalcPixel( gdk_window_get_colormap( window ) ); + } + if ((m_wxwindow) && (m_wxwindow->window) && (m_backgroundColour != wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE))) @@ -3500,7 +3543,6 @@ bool wxWindowGTK::SetBackgroundColour( const wxColour &colour ) /* wxMSW doesn't clear the window here. I don't do that either to provide compatibility. call Clear() to do the job. */ - m_backgroundColour.CalcPixel( gdk_window_get_colormap( window ) ); gdk_window_set_background( window, m_backgroundColour.GetColor() ); } @@ -4039,42 +4081,42 @@ 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 ); } - + m_clipPaintRegion = TRUE; - + gtk_pizza_scroll( GTK_PIZZA(m_wxwindow), -dx, -dy ); - + m_clipPaintRegion = FALSE; #else - gdk_window_scroll( GTK_PIZZA(m_wxwindow)->bin_window, -dx, -dy ); - - GTK_PIZZA(m_wxwindow)->xoffset -= dx; - GTK_PIZZA(m_wxwindow)->yoffset -= dy; - -#endif - + gdk_window_scroll( GTK_PIZZA(m_wxwindow)->bin_window, dx, dy ); + + GTK_PIZZA(m_wxwindow)->xoffset += dx; + GTK_PIZZA(m_wxwindow)->yoffset += dy; + +#endif + } @@ -4137,14 +4179,15 @@ IMPLEMENT_DYNAMIC_CLASS(wxWinModule, wxModule) bool wxWinModule::OnInit() { - g_eraseGC = gdk_gc_new( GDK_ROOT_PARENT() ); - gdk_gc_set_fill( g_eraseGC, GDK_SOLID ); - + // g_eraseGC = gdk_gc_new( GDK_ROOT_PARENT() ); + // gdk_gc_set_fill( g_eraseGC, GDK_SOLID ); + return TRUE; } void wxWinModule::OnExit() { - gdk_gc_unref( g_eraseGC ); + if (g_eraseGC) + gdk_gc_unref( g_eraseGC ); }