Make Webclient compile and run on GNU/Linux with Mozilla 1.0.1.
Continue migration to ant. Start out some JUnit tests. git-svn-id: svn://10.0.0.236/trunk@130858 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -52,11 +52,11 @@ import java.awt.*;
|
||||
|
||||
* See concrete subclasses for scope info.
|
||||
|
||||
* @version $Id: BrowserControlCanvas.java,v 1.3 2001-05-29 18:34:17 ashuk%eng.sun.com Exp $
|
||||
* @version $Id: BrowserControlCanvas.java,v 1.4 2002-10-01 00:39:19 edburns%acm.org Exp $
|
||||
|
||||
* @see org.mozilla.webclient.win32.Win32BrowserControlCanvas
|
||||
|
||||
* @see org.mozilla.webclient.motif.MotifBrowserControlCanvas
|
||||
* @see org.mozilla.webclient.gtk.GtkBrowserControlCanvas
|
||||
|
||||
*/
|
||||
|
||||
|
||||
@@ -44,7 +44,7 @@ import java.io.FileNotFoundException;
|
||||
* This is a static class, it is neven instantiated.
|
||||
|
||||
*
|
||||
* @version $Id: BrowserControlFactory.java,v 1.6 2001-09-10 22:02:05 edburns%acm.org Exp $
|
||||
* @version $Id: BrowserControlFactory.java,v 1.7 2002-10-01 00:39:20 edburns%acm.org Exp $
|
||||
*
|
||||
* @see org.mozilla.webclient.test.EmbeddedMozilla
|
||||
|
||||
@@ -197,7 +197,7 @@ public static void deleteBrowserControl(BrowserControl toDelete)
|
||||
* figures out the proper name for the class that is the
|
||||
* BrowserControlCanvas.
|
||||
|
||||
* @return "org.mozilla.webclient.wrapper_native.win32.Win32BrowserControlCanvas" or "org.mozilla.webclient.wrapper_native.motif.MotifBrowserControlCanvas"
|
||||
* @return "org.mozilla.webclient.wrapper_native.win32.Win32BrowserControlCanvas" or "org.mozilla.webclient.wrapper_native.gtk.GtkBrowserControlCanvas"
|
||||
|
||||
*/
|
||||
|
||||
@@ -225,7 +225,7 @@ private static String determinePlatformCanvasClassName()
|
||||
result = "org.mozilla.webclient.wrapper_native.win32.Win32BrowserControlCanvas";
|
||||
}
|
||||
else {
|
||||
result = "org.mozilla.webclient.wrapper_native.motif.MotifBrowserControlCanvas";
|
||||
result = "org.mozilla.webclient.wrapper_native.gtk.GtkBrowserControlCanvas";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -244,7 +244,7 @@ public static void main(String [] args)
|
||||
Assert.setEnabled(true);
|
||||
Log.setApplicationName("BrowserControlFactory");
|
||||
Log.setApplicationVersion("0.0");
|
||||
Log.setApplicationVersionDate("$Id: BrowserControlFactory.java,v 1.6 2001-09-10 22:02:05 edburns%acm.org Exp $");
|
||||
Log.setApplicationVersionDate("$Id: BrowserControlFactory.java,v 1.7 2002-10-01 00:39:20 edburns%acm.org Exp $");
|
||||
|
||||
BrowserControlCanvas canvas = null;
|
||||
BrowserControl control = null;
|
||||
|
||||
@@ -27,6 +27,12 @@ import org.mozilla.util.Assert;
|
||||
import org.mozilla.util.Log;
|
||||
import org.mozilla.util.ParameterCheck;
|
||||
|
||||
import org.mozilla.webclient.BrowserControlCanvas;
|
||||
|
||||
import java.awt.Graphics;
|
||||
import java.awt.Toolkit;
|
||||
import java.awt.Dimension;
|
||||
|
||||
/**
|
||||
|
||||
* GtkBrowserControlCanvas provides a concrete realization
|
||||
@@ -34,26 +40,16 @@ import org.mozilla.util.ParameterCheck;
|
||||
|
||||
* <B>Lifetime And Scope</B> <P>
|
||||
|
||||
* There is one instance of the WebShellCanvas per top level awt Frame.
|
||||
* There is one instance of GtkBrowserControlCanvas per top level awt Frame.
|
||||
|
||||
* @version $Id: GtkBrowserControlCanvas.java,v 1.1 2002-09-18 18:25:23 edburns%acm.org Exp $
|
||||
* @version $Id: GtkBrowserControlCanvas.java,v 1.2 2002-10-01 00:39:21 edburns%acm.org Exp $
|
||||
*
|
||||
* @see org.mozilla.webclient.BrowserControlCanvasFactory
|
||||
*
|
||||
|
||||
*/
|
||||
|
||||
import sun.awt.*;
|
||||
import sun.awt.motif.*;
|
||||
import java.awt.*;
|
||||
|
||||
import org.mozilla.webclient.*;
|
||||
import org.mozilla.webclient.wrapper_native.*;
|
||||
|
||||
/**
|
||||
* GtkBrowserControlCanvas provides a concrete realization
|
||||
* of the RaptorCanvas.
|
||||
*/
|
||||
public class GtkBrowserControlCanvas extends BrowserControlCanvas /* implements ActionListener*/ {
|
||||
|
||||
static {
|
||||
@@ -70,14 +66,14 @@ public class GtkBrowserControlCanvas extends BrowserControlCanvas /* implements
|
||||
// private MDrawingSurfaceInfo drawingSurfaceInfo;
|
||||
|
||||
static private native void loadMainDll();
|
||||
private native int createTopLevelWindow();
|
||||
private native int createContainerWindow(int parent, int width, int height);
|
||||
private native int getGTKWinID(int gtkWinPtr);
|
||||
private native void reparentWindow(int child, int parent);
|
||||
private native void processEvents();
|
||||
private native void setGTKWindowSize(int gtkWinPtr, int width, int height);
|
||||
native int createTopLevelWindow();
|
||||
native int createContainerWindow(int parent, int width, int height);
|
||||
native int getGTKWinID(int gtkWinPtr);
|
||||
native void reparentWindow(int child, int parent);
|
||||
native void processEvents();
|
||||
native void setGTKWindowSize(int gtkWinPtr, int width, int height);
|
||||
//New method for obtaining access to the Native Peer handle
|
||||
private native int getHandleToPeer();
|
||||
native int getHandleToPeer();
|
||||
|
||||
public GtkBrowserControlCanvas() {
|
||||
super();
|
||||
@@ -143,6 +139,8 @@ public class GtkBrowserControlCanvas extends BrowserControlCanvas /* implements
|
||||
|
||||
return this.gtkWinPtr;
|
||||
}
|
||||
|
||||
// The test for this class is TestGtkBrowserControlCanvas
|
||||
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user