From: Robert Roebling Date: Fri, 15 Sep 2000 16:51:07 +0000 (+0000) Subject: Minor corrections to new theme code. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9cc7121f68faafefe947eba3e9dafb7228debad3 Minor corrections to new theme code. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8369 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp index 06a06a0d5c..80802da42e 100644 --- a/src/gtk/tbargtk.cpp +++ b/src/gtk/tbargtk.cpp @@ -222,7 +222,6 @@ void wxToolBar::Init() m_bg = (GdkColor *)NULL; m_toolbar = (GtkToolbar *)NULL; m_blockNextEvent = FALSE; - m_themeEnabled = TRUE; } wxToolBar::~wxToolBar() diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index cdbcf62cf0..725ba77679 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -681,22 +681,6 @@ static int gtk_window_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_ev GtkPizza *pizza = GTK_PIZZA (widget); -/* - if (win->IsTopLevel()) - { - gtk_paint_flat_box (win->m_widget->style, pizza->bin_window, GTK_STATE_NORMAL, - GTK_SHADOW_NONE, &gdk_event->area, win->m_widget, "base", 0, 0, -1, -1); - } - - wxWindow *parent = win->GetParent(); - if (parent && GTK_IS_NOTEBOOK(parent->m_widget)) - { - while (!parent->IsTopLevel()) - parent = parent->GetParent(); - gtk_paint_flat_box (parent->m_widget->style, pizza->bin_window, GTK_STATE_NORMAL, - GTK_SHADOW_NONE, &gdk_event->area, parent->m_widget, "base", 0, 0, -1, -1); - } -*/ if (win->GetThemeEnabled()) { wxWindow *parent = win->GetParent(); @@ -714,18 +698,18 @@ static int gtk_window_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_ev gdk_event->area.width, gdk_event->area.height ); - if (gdk_event->count == 0) - { - wxEraseEvent eevent( win->GetId() ); - eevent.SetEventObject( win ); - win->GetEventHandler()->ProcessEvent(eevent); - - wxPaintEvent event( win->GetId() ); - event.SetEventObject( win ); - win->GetEventHandler()->ProcessEvent( event ); + if (gdk_event->count == 0) + { + wxEraseEvent eevent( win->GetId() ); + eevent.SetEventObject( win ); + win->GetEventHandler()->ProcessEvent(eevent); - win->GetUpdateRegion().Clear(); - } + wxPaintEvent event( win->GetId() ); + event.SetEventObject( win ); + win->GetEventHandler()->ProcessEvent( event ); + + win->GetUpdateRegion().Clear(); + } /* The following code will result in all window-less widgets being redrawn if the wxWindows class is given a chance to @@ -805,31 +789,29 @@ static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxW GtkPizza *pizza = GTK_PIZZA (widget); - if (win->IsTopLevel()) - { - gtk_paint_flat_box (win->m_widget->style, pizza->bin_window, GTK_STATE_NORMAL, - GTK_SHADOW_NONE, rect, win->m_widget, "base", 0, 0, -1, -1); - } - - wxWindow *parent = win->GetParent(); - if (parent && GTK_IS_NOTEBOOK(parent->m_widget)) + if (win->GetThemeEnabled()) { - while (!parent->IsTopLevel()) + 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, "base", 0, 0, -1, -1); } - if (!(GTK_WIDGET_APP_PAINTABLE (widget)) && - (pizza->clear_on_draw)) - { - gdk_window_clear_area( pizza->bin_window, + + if (!(GTK_WIDGET_APP_PAINTABLE (widget)) && + (pizza->clear_on_draw)) + { + gdk_window_clear_area( pizza->bin_window, rect->x, rect->y, rect->width, rect->height); - } + } - win->GetUpdateRegion().Union( rect->x, rect->y, rect->width, rect->height ); + win->GetUpdateRegion().Union( rect->x, rect->y, rect->width, rect->height ); - win->m_clipPaintRegion = TRUE; + win->m_clipPaintRegion = TRUE; wxEraseEvent eevent( win->GetId() ); eevent.SetEventObject( win ); diff --git a/src/gtk1/tbargtk.cpp b/src/gtk1/tbargtk.cpp index 06a06a0d5c..80802da42e 100644 --- a/src/gtk1/tbargtk.cpp +++ b/src/gtk1/tbargtk.cpp @@ -222,7 +222,6 @@ void wxToolBar::Init() m_bg = (GdkColor *)NULL; m_toolbar = (GtkToolbar *)NULL; m_blockNextEvent = FALSE; - m_themeEnabled = TRUE; } wxToolBar::~wxToolBar() diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index cdbcf62cf0..725ba77679 100644 --- a/src/gtk1/window.cpp +++ b/src/gtk1/window.cpp @@ -681,22 +681,6 @@ static int gtk_window_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_ev GtkPizza *pizza = GTK_PIZZA (widget); -/* - if (win->IsTopLevel()) - { - gtk_paint_flat_box (win->m_widget->style, pizza->bin_window, GTK_STATE_NORMAL, - GTK_SHADOW_NONE, &gdk_event->area, win->m_widget, "base", 0, 0, -1, -1); - } - - wxWindow *parent = win->GetParent(); - if (parent && GTK_IS_NOTEBOOK(parent->m_widget)) - { - while (!parent->IsTopLevel()) - parent = parent->GetParent(); - gtk_paint_flat_box (parent->m_widget->style, pizza->bin_window, GTK_STATE_NORMAL, - GTK_SHADOW_NONE, &gdk_event->area, parent->m_widget, "base", 0, 0, -1, -1); - } -*/ if (win->GetThemeEnabled()) { wxWindow *parent = win->GetParent(); @@ -714,18 +698,18 @@ static int gtk_window_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_ev gdk_event->area.width, gdk_event->area.height ); - if (gdk_event->count == 0) - { - wxEraseEvent eevent( win->GetId() ); - eevent.SetEventObject( win ); - win->GetEventHandler()->ProcessEvent(eevent); - - wxPaintEvent event( win->GetId() ); - event.SetEventObject( win ); - win->GetEventHandler()->ProcessEvent( event ); + if (gdk_event->count == 0) + { + wxEraseEvent eevent( win->GetId() ); + eevent.SetEventObject( win ); + win->GetEventHandler()->ProcessEvent(eevent); - win->GetUpdateRegion().Clear(); - } + wxPaintEvent event( win->GetId() ); + event.SetEventObject( win ); + win->GetEventHandler()->ProcessEvent( event ); + + win->GetUpdateRegion().Clear(); + } /* The following code will result in all window-less widgets being redrawn if the wxWindows class is given a chance to @@ -805,31 +789,29 @@ static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxW GtkPizza *pizza = GTK_PIZZA (widget); - if (win->IsTopLevel()) - { - gtk_paint_flat_box (win->m_widget->style, pizza->bin_window, GTK_STATE_NORMAL, - GTK_SHADOW_NONE, rect, win->m_widget, "base", 0, 0, -1, -1); - } - - wxWindow *parent = win->GetParent(); - if (parent && GTK_IS_NOTEBOOK(parent->m_widget)) + if (win->GetThemeEnabled()) { - while (!parent->IsTopLevel()) + 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, "base", 0, 0, -1, -1); } - if (!(GTK_WIDGET_APP_PAINTABLE (widget)) && - (pizza->clear_on_draw)) - { - gdk_window_clear_area( pizza->bin_window, + + if (!(GTK_WIDGET_APP_PAINTABLE (widget)) && + (pizza->clear_on_draw)) + { + gdk_window_clear_area( pizza->bin_window, rect->x, rect->y, rect->width, rect->height); - } + } - win->GetUpdateRegion().Union( rect->x, rect->y, rect->width, rect->height ); + win->GetUpdateRegion().Union( rect->x, rect->y, rect->width, rect->height ); - win->m_clipPaintRegion = TRUE; + win->m_clipPaintRegion = TRUE; wxEraseEvent eevent( win->GetId() ); eevent.SetEventObject( win );