Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor corrections to new theme code.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8369 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2000-09-15 16:51:07 +00:00
parent a2d93e735a
commit 9cc7121f68
4 changed files with 50 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gtk/tbargtk.cpp
View File

@@ -222,7 +222,6 @@ void wxToolBar::Init()
m_bg = (GdkColor *)NULL; m_bg = (GdkColor *)NULL;
m_toolbar = (GtkToolbar *)NULL; m_toolbar = (GtkToolbar *)NULL;
m_blockNextEvent = FALSE; m_blockNextEvent = FALSE;
m_themeEnabled = TRUE;
} }
wxToolBar::~wxToolBar() wxToolBar::~wxToolBar()

68
src/gtk/window.cpp
View File

@@ -681,22 +681,6 @@ static int gtk_window_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_ev
GtkPizza *pizza = GTK_PIZZA (widget); 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()) if (win->GetThemeEnabled())
{ {
wxWindow *parent = win->GetParent(); 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.width,
gdk_event->area.height ); gdk_event->area.height );
if (gdk_event->count == 0) if (gdk_event->count == 0)
{ {
wxEraseEvent eevent( win->GetId() ); wxEraseEvent eevent( win->GetId() );
eevent.SetEventObject( win ); eevent.SetEventObject( win );
win->GetEventHandler()->ProcessEvent(eevent); win->GetEventHandler()->ProcessEvent(eevent);
wxPaintEvent event( win->GetId() ); wxPaintEvent event( win->GetId() );
event.SetEventObject( win ); event.SetEventObject( win );
win->GetEventHandler()->ProcessEvent( event ); win->GetEventHandler()->ProcessEvent( event );
win->GetUpdateRegion().Clear(); win->GetUpdateRegion().Clear();
} }
/* The following code will result in all window-less widgets /* The following code will result in all window-less widgets
being redrawn if the wxWindows class is given a chance to 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); GtkPizza *pizza = GTK_PIZZA (widget);
if (win->IsTopLevel()) if (win->GetThemeEnabled())
{ {
gtk_paint_flat_box (win->m_widget->style, pizza->bin_window, GTK_STATE_NORMAL, wxWindow *parent = win->GetParent();
GTK_SHADOW_NONE, rect, win->m_widget, "base", 0, 0, -1, -1); while (parent && !parent->IsTopLevel())
}
wxWindow *parent = win->GetParent();
if (parent && GTK_IS_NOTEBOOK(parent->m_widget))
{
while (!parent->IsTopLevel())
parent = parent->GetParent(); parent = parent->GetParent();
if (!parent)
parent = win;
gtk_paint_flat_box (parent->m_widget->style, pizza->bin_window, GTK_STATE_NORMAL, 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); GTK_SHADOW_NONE, rect, parent->m_widget, "base", 0, 0, -1, -1);
} }
if (!(GTK_WIDGET_APP_PAINTABLE (widget)) &&
(pizza->clear_on_draw)) if (!(GTK_WIDGET_APP_PAINTABLE (widget)) &&
{ (pizza->clear_on_draw))
gdk_window_clear_area( pizza->bin_window, {
gdk_window_clear_area( pizza->bin_window,
rect->x, rect->y, rect->width, rect->height); 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() ); wxEraseEvent eevent( win->GetId() );
eevent.SetEventObject( win ); eevent.SetEventObject( win );

1
src/gtk1/tbargtk.cpp
View File

@@ -222,7 +222,6 @@ void wxToolBar::Init()
m_bg = (GdkColor *)NULL; m_bg = (GdkColor *)NULL;
m_toolbar = (GtkToolbar *)NULL; m_toolbar = (GtkToolbar *)NULL;
m_blockNextEvent = FALSE; m_blockNextEvent = FALSE;
m_themeEnabled = TRUE;
} }
wxToolBar::~wxToolBar() wxToolBar::~wxToolBar()

68
src/gtk1/window.cpp
View File

@@ -681,22 +681,6 @@ static int gtk_window_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_ev
GtkPizza *pizza = GTK_PIZZA (widget); 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()) if (win->GetThemeEnabled())
{ {
wxWindow *parent = win->GetParent(); 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.width,
gdk_event->area.height ); gdk_event->area.height );
if (gdk_event->count == 0) if (gdk_event->count == 0)
{ {
wxEraseEvent eevent( win->GetId() ); wxEraseEvent eevent( win->GetId() );
eevent.SetEventObject( win ); eevent.SetEventObject( win );
win->GetEventHandler()->ProcessEvent(eevent); win->GetEventHandler()->ProcessEvent(eevent);
wxPaintEvent event( win->GetId() ); wxPaintEvent event( win->GetId() );
event.SetEventObject( win ); event.SetEventObject( win );
win->GetEventHandler()->ProcessEvent( event ); win->GetEventHandler()->ProcessEvent( event );
win->GetUpdateRegion().Clear(); win->GetUpdateRegion().Clear();
} }
/* The following code will result in all window-less widgets /* The following code will result in all window-less widgets
being redrawn if the wxWindows class is given a chance to 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); GtkPizza *pizza = GTK_PIZZA (widget);
if (win->IsTopLevel()) if (win->GetThemeEnabled())
{ {
gtk_paint_flat_box (win->m_widget->style, pizza->bin_window, GTK_STATE_NORMAL, wxWindow *parent = win->GetParent();
GTK_SHADOW_NONE, rect, win->m_widget, "base", 0, 0, -1, -1); while (parent && !parent->IsTopLevel())
}
wxWindow *parent = win->GetParent();
if (parent && GTK_IS_NOTEBOOK(parent->m_widget))
{
while (!parent->IsTopLevel())
parent = parent->GetParent(); parent = parent->GetParent();
if (!parent)
parent = win;
gtk_paint_flat_box (parent->m_widget->style, pizza->bin_window, GTK_STATE_NORMAL, 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); GTK_SHADOW_NONE, rect, parent->m_widget, "base", 0, 0, -1, -1);
} }
if (!(GTK_WIDGET_APP_PAINTABLE (widget)) &&
(pizza->clear_on_draw)) if (!(GTK_WIDGET_APP_PAINTABLE (widget)) &&
{ (pizza->clear_on_draw))
gdk_window_clear_area( pizza->bin_window, {
gdk_window_clear_area( pizza->bin_window,
rect->x, rect->y, rect->width, rect->height); 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() ); wxEraseEvent eevent( win->GetId() );
eevent.SetEventObject( win ); eevent.SetEventObject( win );