From 3c48368900e02697eb492558703b93fbcca541be Mon Sep 17 00:00:00 2001 From: "alecf%netscape.com" Date: Fri, 24 Mar 2000 07:57:53 +0000 Subject: [PATCH] fix xlib build (not part of default build) git-svn-id: svn://10.0.0.236/trunk@64015 18797224-902f-48f8-a5cc-f745e15eee43 --- .../embed/xlib/gtk/nsEmbedXlibIntoGtk.cpp | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/mozilla/webshell/embed/xlib/gtk/nsEmbedXlibIntoGtk.cpp b/mozilla/webshell/embed/xlib/gtk/nsEmbedXlibIntoGtk.cpp index 74d42706e55..1fc9b04bcf3 100644 --- a/mozilla/webshell/embed/xlib/gtk/nsEmbedXlibIntoGtk.cpp +++ b/mozilla/webshell/embed/xlib/gtk/nsEmbedXlibIntoGtk.cpp @@ -211,9 +211,11 @@ int main(int argc, char **argv) if (!NS_SUCCEEDED(rv)) return 1; - sgWebShell->Init((nsNativeWidget *)GDK_WINDOW_XWINDOW(main_window->window), - 0, 0, - 500, 500); + // XXX - fix me! + //sgWebShell->Init((nsNativeWidget *)GDK_WINDOW_XWINDOW(main_window->window), + // 0, 0, + //500, 500); + NS_ASSERTION(PR_FALSE, "Please fix this code."); gsWindowService->GetEventDispatcher(&gsEventDispatcher); @@ -228,8 +230,10 @@ int main(int argc, char **argv) sgPrefs->StartUp(); sgPrefs->ReadUserPrefs(); - nsIContentViewer *content_viewer; - rv = sgWebShell->GetContentViewer(&content_viewer); + nsIContentViewer *content_viewer=nsnull; + // XXX fix me! + //rv = sgWebShell->GetContentViewer(&content_viewer); + NS_ASSERTION(PR_FALSE, "Please fix this code."); if (NS_SUCCEEDED(rv) && content_viewer) { content_viewer->Show(); NS_RELEASE(content_viewer); @@ -277,10 +281,12 @@ void handle_size_allocate(GtkWidget *w, GtkAllocation *alloc, gpointer p) { printf("handling size allocate\n"); nsIWebShell *moz_widget = (nsIWebShell *)p; - nsIContentViewer *content_viewer; - nsresult rv; - - rv = moz_widget->GetContentViewer(&content_viewer); + nsIContentViewer *content_viewer=nsnull; + nsresult rv=NS_OK; + + // XXX - fix me! + // rv = moz_widget->GetContentViewer(&content_viewer); + NS_ASSERTION(PR_FALSE, "Please fix this code."); if (NS_SUCCEEDED(rv) && content_viewer) { nsRect bounds(0,0, alloc->width, alloc->height);