Notebook theme attampt.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8365 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 5288cfcfd85146e32b5332d5080816c51904c269..1bd4d35d8331da5ca1232996165a8ead5698f464 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -683,8 +683,17 @@ static int gtk_window_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_ev
         
     if (win->IsTopLevel())
     {
         
     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);
+        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);

     }
         
     win->GetUpdateRegion().Union( gdk_event->area.x,
     }
         
     win->GetUpdateRegion().Union( gdk_event->area.x,


@@ -789,6 +798,15 @@ static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxW
                      GTK_SHADOW_NONE, rect, win->m_widget, "base", 0, 0, -1, -1);
     }
         
                      GTK_SHADOW_NONE, rect, 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, 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))
         {

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 5288cfcfd85146e32b5332d5080816c51904c269..1bd4d35d8331da5ca1232996165a8ead5698f464 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -683,8 +683,17 @@ static int gtk_window_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_ev
         
     if (win->IsTopLevel())
     {
         
     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);
+        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);

     }
         
     win->GetUpdateRegion().Union( gdk_event->area.x,
     }
         
     win->GetUpdateRegion().Union( gdk_event->area.x,


@@ -789,6 +798,15 @@ static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxW
                      GTK_SHADOW_NONE, rect, win->m_widget, "base", 0, 0, -1, -1);
     }
         
                      GTK_SHADOW_NONE, rect, 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, 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))
         {