From b08b22d323927f1757b9109eb5899666858a961a Mon Sep 17 00:00:00 2001 From: "pavlov%pavlov.net" Date: Wed, 18 Nov 1998 03:58:54 +0000 Subject: [PATCH] made the gdkcolor to nscolor code a tad cleaner. removed the gtk_layout_freeze and gtk_layout_thaw calls as the object being resized was not always a layout. --- widget/src/gtk/nsLookAndFeel.cpp | 2 +- widget/src/gtk/nsWindow.cpp | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/widget/src/gtk/nsLookAndFeel.cpp b/widget/src/gtk/nsLookAndFeel.cpp index 246e9be02589..74e7877702a7 100644 --- a/widget/src/gtk/nsLookAndFeel.cpp +++ b/widget/src/gtk/nsLookAndFeel.cpp @@ -22,7 +22,7 @@ static NS_DEFINE_IID(kILookAndFeelIID, NS_ILOOKANDFEEL_IID); #define GDK_COLOR_TO_NS_RGB(c) \ - ((nscolor) ((255 << 24) | ((c.blue)<<16) | ((c.green)<<8) | (c.blue))) + ((nscolor) NS_RGB(c.red, c.green, c.blue)) NS_IMPL_ISUPPORTS(nsLookAndFeel, kILookAndFeelIID); diff --git a/widget/src/gtk/nsWindow.cpp b/widget/src/gtk/nsWindow.cpp index 082054191ab5..34df7ff0f605 100644 --- a/widget/src/gtk/nsWindow.cpp +++ b/widget/src/gtk/nsWindow.cpp @@ -770,8 +770,6 @@ void DoResize(GtkWidget *w, GtkAllocation *allocation, gpointer data) // g_print("DoResized called\n"); nsWindow *win = (nsWindow*)data; - gtk_layout_freeze(GTK_LAYOUT(w)); - nsRect bounds; bounds.width = allocation->width; bounds.height = allocation->height; @@ -790,7 +788,6 @@ void DoResize(GtkWidget *w, GtkAllocation *allocation, gpointer data) } win->SetResized(PR_TRUE); - gtk_layout_thaw(GTK_LAYOUT(w)); } NS_METHOD nsWindow::SetMenuBar(nsIMenuBar * aMenuBar)