Author: zbowling
Date: 2006-05-19 00:12:29 -0400 (Fri, 19 May 2006)
New Revision: 60856

Modified:
   trunk/mozembed/src/EmbedPrivate.cpp
   trunk/mozembed/src/EmbedPrivate.h
   trunk/mozembed/src/EmbedWindow.cpp
Log:
make private

Modified: trunk/mozembed/src/EmbedPrivate.cpp
===================================================================
--- trunk/mozembed/src/EmbedPrivate.cpp 2006-05-19 03:27:01 UTC (rev 60855)
+++ trunk/mozembed/src/EmbedPrivate.cpp 2006-05-19 04:12:29 UTC (rev 60856)
@@ -90,6 +90,7 @@
 char        *EmbedPrivate::sProfileDir  = nsnull;
 char        *EmbedPrivate::sProfileName = nsnull;
 nsIPref     *EmbedPrivate::sPrefs       = nsnull;
+list<Handle> EmbedPrivate::sWindowList(10);
 nsIDirectoryServiceProvider *EmbedPrivate::sAppFileLocProvider = nsnull;
 nsProfileDirServiceProvider *EmbedPrivate::sProfileDirServiceProvider = nsnull;
 
@@ -962,8 +963,13 @@
 }
 
 void
-EmbedPrivate::QueryControlSize()
+EmbedPrivate::QueryControlSize(void)
 {
+  printf("EmbedPrivate->QueryControlSize\n");
+  if (!events)
+  {
+    printf("Shit, events are broken\n");
+  }
   SizeInfo sizeInfo;
   sizeInfo = events->GetControlSize();
   mWidth = sizeInfo.width;

Modified: trunk/mozembed/src/EmbedPrivate.h
===================================================================
--- trunk/mozembed/src/EmbedPrivate.h   2006-05-19 03:27:01 UTC (rev 60855)
+++ trunk/mozembed/src/EmbedPrivate.h   2006-05-19 04:12:29 UTC (rev 60856)
@@ -192,8 +192,6 @@
   // the currently loaded uri
   nsEmbedString                 mURI;
   
-  static list<Handle>          sWindowList;
-   
   PRUint32                                             mHeight;
   PRUint32                                             mWidth;
   // the number of widgets that have been created
@@ -227,7 +225,10 @@
 
   CallbackBin                                  *events;
  private:
+  
+  static list<Handle>           sWindowList;
 
+  
   // is the chrome listener attached yet?
   PRBool                        mListenersAttached;
 

Modified: trunk/mozembed/src/EmbedWindow.cpp
===================================================================
--- trunk/mozembed/src/EmbedWindow.cpp  2006-05-19 03:27:01 UTC (rev 60855)
+++ trunk/mozembed/src/EmbedWindow.cpp  2006-05-19 04:12:29 UTC (rev 60856)
@@ -12,7 +12,7 @@
  * Portions created by Christopher Blizzard are Copyright (C) Christopher 
Blizzard.  All Rights Reserved.
  */
 
-
+#include <printf.h>
 #include <nsCWebBrowser.h>
 #include <nsIDocShellTreeItem.h>
 //#include <nsIComponentManager.h>
@@ -46,12 +46,13 @@
 {
   // save our owner for later
   mOwner = aOwner;
-
+  printf("Init Embed Window\n");
   // create our nsIWebBrowser object and set up some basic defaults.
   mWebBrowser = do_CreateInstance(NS_WEBBROWSER_CONTRACTID);
   if (!mWebBrowser)
     return NS_ERROR_FAILURE;
-
+  
+  
   mWebBrowser->SetContainerWindow(NS_STATIC_CAST(nsIWebBrowserChrome *, this));
   
   nsCOMPtr<nsIDocShellTreeItem> item = do_QueryInterface(mWebBrowser);
@@ -64,19 +65,24 @@
 EmbedWindow::CreateWindow(void)
 {
   nsresult rv;
-
+  printf("EmbedWindow::CreateWindow\n");
   // Get the base window interface for the web browser object and
   // create the window.
-  mOwner->QueryControlSize();
+  if (!mOwner->mOwningWidget)
+   printf("Oh shit, mOwner is null\n");
+  //mOwner->QueryControlSize();
+  printf("mOwner->QueryControlSize()\n");
   mBaseWindow = do_QueryInterface(mWebBrowser);
+  
   rv = mBaseWindow->InitWindow(mOwner->mOwningWidget,
                               nsnull,
-                              0, 0, 
-                              mOwner->mWidth,
-                              mOwner->mHeight);
+                              1, 0, 
+                              200,200);
+                              //mOwner->mWidth,
+                              //mOwner->mHeight);
   if (NS_FAILED(rv))
     return rv;
-
+  printf("InitWindow done\n");
   rv = mBaseWindow->Create();
   if (NS_FAILED(rv))
     return rv;

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to