merge from head

git-svn-id: svn://10.0.0.236/branches/WIDGET_IDL@53628 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/build/mac/build_scripts/BuildMozilla.pl

@@ -1,80 +0,0 @@
-#!perl
-
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#   Simon Fraser <sfraser@netscape.com>
-#
-
-require 5.004;
-
-use strict;
-
-use Cwd;
-use Moz::BuildUtils;
-use Moz::BuildCore;
-
-#-------------------------------------------------------------
-# Where have the build options gone?
-# 
-# The various build flags have been centralized into one place. 
-# The master list of options is in MozBuildFlags.txt. However, 
-# you should never need to edit that file, or this one.
-# 
-# To customize what gets built, or where to start the build, 
-# edit the $prefs_file_name file in
-# System Folder:Preferences:Mozilla build prefs:
-# Documentation is provided in that file.
-#-------------------------------------------------------------
-
-my($prefs_file_name) = "Mozilla opt build prefs";
-my($config_header_file_name) = ":mozilla:config:mac:DefinesOptions.h";
-
-#-------------------------------------------------------------
-# hashes to hold build options
-#-------------------------------------------------------------
-my(%build);
-my(%options);
-my(%filepaths);
-my(%optiondefines);
-
-# Hash of input files for this build. Eventually, there will be
-# input files for manifests, and projects too.
-my(%inputfiles) = (
-  "buildflags",     "MozillaBuildFlags.txt",
-  "checkoutdata",   "MozillaCheckoutList.txt",
-  "buildprogress",  "¥ Mozilla opt progress",
-  "buildmodule",    "MozillaBuildList.pm",
-  "checkouttime",   "Mozilla last checkout"
-);
-#-------------------------------------------------------------
-# end build hashes
-#-------------------------------------------------------------
-
-# set the build root directory, which is the the dir above mozilla
-SetupBuildRootDir(":mozilla:build:mac:build_scripts");
-
-# Set up all the flags on $main::, like DEBUG, CARBON etc.
-# Override the defaults using the preferences files.
-SetupDefaultBuildOptions(0, ":mozilla:dist:viewer:", $config_header_file_name);
-
-my($do_checkout)    = 0;
-my($do_build)       = 1;
-
-RunBuild($do_checkout, $do_build, \%inputfiles, $prefs_file_name);

mozilla/build/mac/build_scripts/BuildMozillaDebug.pl

@@ -1,80 +0,0 @@
-#!perl
-
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#   Simon Fraser <sfraser@netscape.com>
-#
-
-require 5.004;
-
-use strict;
-
-use Cwd;
-use Moz::BuildUtils;
-use Moz::BuildCore;
-
-#-------------------------------------------------------------
-# Where have the build options gone?
-# 
-# The various build flags have been centralized into one place. 
-# The master list of options is in MozBuildFlags.txt. However, 
-# you should never need to edit that file, or this one.
-# 
-# To customize what gets built, or where to start the build, 
-# edit the $prefs_file_name file in
-# System Folder:Preferences:Mozilla build prefs:
-# Documentation is provided in that file.
-#-------------------------------------------------------------
-
-my($prefs_file_name) = "Mozilla debug build prefs";
-my($config_header_file_name) = ":mozilla:config:mac:DefinesOptionsDebug.h";
-
-#-------------------------------------------------------------
-# hashes to hold build options
-#-------------------------------------------------------------
-my(%build);
-my(%options);
-my(%filepaths);
-my(%optiondefines);
-
-# Hash of input files for this build. Eventually, there will be
-# input files for manifests, and projects too.
-my(%inputfiles) = (
-  "buildflags",     "MozillaBuildFlags.txt",
-  "checkoutdata",   "MozillaCheckoutList.txt",
-  "buildprogress",  "¥ Mozilla debug progress",
-  "buildmodule",    "MozillaBuildList.pm",
-  "checkouttime",   "Mozilla last checkout"
-);
-#-------------------------------------------------------------
-# end build hashes
-#-------------------------------------------------------------
-
-# set the build root directory, which is the the dir above mozilla
-SetupBuildRootDir(":mozilla:build:mac:build_scripts");
-
-# Set up all the flags on $main::, like DEBUG, CARBON etc.
-# Override the defaults using the preferences files.
-SetupDefaultBuildOptions(1, ":mozilla:dist:viewer_debug:", $config_header_file_name);
-
-my($do_pull)        = 0;    # overridden by flags and prefs
-my($do_build)       = 1;
-
-RunBuild($do_pull, $do_build, \%inputfiles, $prefs_file_name);

mozilla/build/mac/build_scripts/Moz/BuildCore.pm

@@ -1,595 +0,0 @@
-#!perl -w
-package Moz::BuildCore;
-
-require 5.004;
-require Exporter;
-
-use strict;
-use vars qw( @ISA @EXPORT );
-
-# perl includes
-use Cwd;
-use POSIX;
-use Time::Local;
-use File::Basename;
-use LWP::Simple;
-
-# homegrown
-use Moz::Moz;
-use Moz::Jar;
-use Moz::BuildFlags;
-use Moz::BuildUtils;
-use Moz::CodeWarriorLib;
-
-# use MozillaBuildList;   # eventually, this should go away, and be replaced by data input
-
-
-@ISA        = qw(Exporter);
-@EXPORT     = qw(
-                    RunBuild
-                );
-
-
-#//--------------------------------------------------------------------------------------------------
-#// DoPrebuildCheck
-#//
-#// Check the build tools etc before running the build.
-#//--------------------------------------------------------------------------------------------------
-sub DoPrebuildCheck()
-{
-    SanityCheckBuildOptions();
-
-    # launch codewarrior and persist its location. Have to call this before first
-    # call to getCodeWarriorPath().
-    my($ide_path_file) = $main::filepaths{"idepath"};
-    $ide_path_file = full_path_to($ide_path_file);
-    LaunchCodeWarrior($ide_path_file);
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// SanityCheckBuildOptions
-#//--------------------------------------------------------------------------------------------------
-sub SanityCheckBuildOptions()
-{
-    my($bad_options) = 0;
-
-    # Jar options
-    if (!$main::options{chrome_jars} && !$main::options{chrome_files})
-    {
-        print "Warning: Both \$options{chrome_jars} and \$options{chrome_files} are off. You won't get any chrome.\n";
-        $bad_options = 1;
-    }
-
-    if (!$main::options{chrome_jars} && $main::options{use_jars})
-    {
-        print "Warning: \$options{chrome_jars} is off but \$options{use_jars} is on. Your build won't run (expects jars, got files).\n";
-        $bad_options = 1;
-    }
-
-    if (!$main::options{chrome_files} && !$main::options{use_jars})
-    {
-        print "Warning: \$options{chrome_jars} is off but \$options{chrome_files} is on. Your build won't run (expects files, got jars).\n";
-        $bad_options = 1;
-    }
-
-    if ($main::options{ldap_experimental} && !$main::options{ldap})
-    {
-        print "Warning: \$options{ldap_experimental} is on but \$options{ldap} is off. LDAP experimental features will not be built.\n";
-        $bad_options = 1;
-    }
-
-    if ($main::options{wsp} && !$main::options{xmlextras})
-    {
-        print "Warning: \$options{wsp} is on but \$options{xmlextras} is off. wsp will not be built.\n";
-        $bad_options = 1;
-    }
-
-    if ($bad_options) {
-        print "Build will start in 5 seconds. Press command-. to stop\n";
-        
-        DelayFor(5);
-    }
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// GenBuildSystemInfo
-#//--------------------------------------------------------------------------------------------------
-
-sub GenBuildSystemInfo()
-{
-    # always rebuild the configuration program.
-    BuildProjectClean(":mozilla:build:mac:tools:BuildSystemInfo:BuildSystemInfo.mcp", "BuildSystemInfo");
-
-    # delete the configuration file.
-    unlink(":mozilla:build:mac:BuildSystemInfo.pm");
-    
-    # run the program.
-    system(":mozilla:build:mac:BuildSystemInfo");
-
-    # wait for the file to be created.
-    while (!(-e ":mozilla:build:mac:BuildSystemInfo.pm")) { WaitNextEvent(); }
-    
-    # wait for BuildSystemInfo to finish, so that we see correct results.
-    while (IsProcessRunning("BuildSystemInfo")) { WaitNextEvent(); }
-
-    # now, evaluate the contents of the file.
-    open(F, ":mozilla:build:mac:BuildSystemInfo.pm");
-    while (<F>) { eval; }
-    close(F);
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// Make library aliases
-#//--------------------------------------------------------------------------------------------------
-
-sub MakeLibAliases()
-{
-    my($dist_dir) = GetBinDirectory();
-
-    #// ProfilerLib
-    if ($main::PROFILE)
-    {
-        my($profilerlibpath) = Moz::CodeWarriorLib::getCodeWarriorPath("MacOS Support:Profiler:Profiler Common:ProfilerLib");
-        MakeAlias("$profilerlibpath", "$dist_dir"."Essential Files:");
-    }
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// ConfigureBuildSystem
-#//
-#// defines some build-system configuration variables.
-#//--------------------------------------------------------------------------------------------------
-sub ConfigureBuildSystem()
-{
-    #// In the future, we may want to do configurations based on the actual build system itself.
-    #// GenBuildSystemInfo();
-        
-    #// For now, if we discover a newer header file than existed in Universal Interfaces 3.2,
-    #// we'll assume that 3.3 or later is in use.
-    my($universal_interfaces) = Moz::CodeWarriorLib::getCodeWarriorPath("MacOS Support:Universal:Interfaces:CIncludes:");
-    if (-e ($universal_interfaces . "ControlDefinitions.h")) {
-        $main::UNIVERSAL_INTERFACES_VERSION = 0x0330;
-    }
-
-    #// Rename IC SDK folder in the Mac OS Support folder
-    my($ic_sdk_folder) = Moz::CodeWarriorLib::getCodeWarriorPath("MacOS Support:ICProgKit2.0.2");
-    if( -e $ic_sdk_folder)
-    {
-        my($new_ic_folder_name) = Moz::CodeWarriorLib::getCodeWarriorPath("MacOS Support:(ICProgKit2.0.2)");
-        rename ($ic_sdk_folder, $new_ic_folder_name);
-        # note that CodeWarrior doesn't descend into folders with () the name
-        print "Mozilla no longer needs the Internet Config SDK to build:\n  Renaming the 'ICProgKit2.0.2' folder to '(ICProgKit2.0.2)'\n";
-    }
-
-    printf("UNIVERSAL_INTERFACES_VERSION = 0x%04X\n", $main::UNIVERSAL_INTERFACES_VERSION);
-
-    # alias required CodeWarrior libs into the Essential Files folder (only the Profiler lib now)
-    MakeLibAliases();
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// CheckOutModule. Takes variable number of args; first two are required
-#//--------------------------------------------------------------------------------------------------
-sub CheckOutModule($$$$)
-{
-    my($session, $module, $revision, $date) = @_;
-
-    my($result) = $session->checkout($module, $revision, $date);
-    
-    # result of 1 is success
-    if ($result) { return; }
-    
-    my($checkout_err) = $session->getLastError();
-    if ($checkout_err == 708) {
-        die "Error: Checkout was cancelled.\n";
-    } elsif ($checkout_err == 911) {
-        die "Error: CVS session settings are incorrect. Check your password, and the CVS root settings.\n";
-    } elsif ($checkout_err == 703) {
-        die "Error: CVS checkout failed. Unknown module, unknown tag, bad username, or other CVS error.\n";
-    } elsif ($checkout_err == 711) {
-        print "Checkout of '$module' failed.\n";
-    }
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// getScriptFolder
-#//--------------------------------------------------------------------------------------------------
-sub getScriptFolder()
-{
-    return dirname($0);
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// getScriptFolder
-#//--------------------------------------------------------------------------------------------------
-sub get_url_contents($)
-{
-    my($url) = @_;
-
-    my($url_contents) = LWP::Simple::get($url);
-    $url_contents =~ s/\r\n/\n/g;     # normalize linebreaks
-    $url_contents =~ s/\r/\n/g;       # normalize linebreaks
-    return $url_contents;
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// get_files_from_content
-#//--------------------------------------------------------------------------------------------------
-sub uniq
-{
-    my $lastval;
-    grep(($_ ne $lastval, $lastval = $_)[$[], @_);
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// get_files_from_content
-#//--------------------------------------------------------------------------------------------------
-sub get_files_from_content($)
-{
-    my($content) = @_;
-  
-    my(@jscalls) = grep (/return js_file_menu[^{]*/, split(/\n/, $content));
-    my $i;
-  
-    for ($i = 0; $i < @jscalls ; $i++)
-    {
-        $jscalls[$i] =~ s/.*\(|\).*//g;
-        my(@callparams) = split(/,/, $jscalls[$i]);
-        my ($repos, $dir, $file, $rev) = grep(s/['\s]//g, @callparams);
-        $jscalls[$i] = "$dir/$file";
-    }
-
-  &uniq(sort(@jscalls));
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// getLastUpdateTime
-#// 
-#// Get the last time we updated. Return 0 on failure
-#//--------------------------------------------------------------------------------------------------
-sub getLastUpdateTime($)
-{
-    my($timestamp_file) = @_;
- 
-    my($time_string);
-    
-    local(*TIMESTAMP_FILE);  
-    unless (open(TIMESTAMP_FILE, "< $timestamp_file")) { return 0; }
-
-    while (<TIMESTAMP_FILE>)
-    {
-        my($line) = $_;
-        chomp($line);
-
-        # ignore comments and empty lines
-        if ($line =~ /^\#/ || $line =~ /^\s*$/) {
-            next;
-        }
-        
-        $time_string = $line;
-    }
-
-    # get the epoch seconds
-    my($last_update_secs) = $time_string;
-    $last_update_secs =~ s/\s#.+$//;
-    
-    print "FAST_UPDATE found that you last updated at ".localtime($last_update_secs)."\n";
-    
-    # how long ago was this, in hours?
-    my($gm_now) = time();
-    my($update_hours) = 1 + ceil(($gm_now - $last_update_secs) / (60 * 60));
-    
-    return $update_hours;
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// saveCheckoutTimestamp
-#// 
-#// Create a file on disk containing the current time. Param is time(), which is an Epoch seconds
-#// (and therefore in GMT).
-#// 
-#//--------------------------------------------------------------------------------------------------
-sub saveCheckoutTimestamp($$)
-{
-    my($gm_secs, $timestamp_file) = @_;
-        
-    local(*TIMESTAMP_FILE);
-    open(TIMESTAMP_FILE, ">$timestamp_file") || die "Failed to open $timestamp_file\n";
-    print(TIMESTAMP_FILE "# time of last checkout or update, in GMT. Used by FAST_UPDATE\n");
-    print(TIMESTAMP_FILE "$gm_secs \# around ".localtime()." local time\n");
-    close(TIMESTAMP_FILE);
-
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// FastUpdate
-#// 
-#// Use Bonsai url data to update only those dirs which have new files
-#// 
-#//--------------------------------------------------------------------------------------------------
-sub FastUpdate($$)
-{
-    my($modules, $timestamp_file) = @_;          # list of modules to check out
-
-    my($num_hours) = getLastUpdateTime($timestamp_file);
-    if ($num_hours == 0 || $num_hours > 170) {
-        print "Can't fast_update; last update was too long ago, or never. Doing normal checkout.\n";
-        return 0;
-    }
-
-    print "Doing fast update, pulling files changed in the last $num_hours hours\n";
-
-    my($cvsfile) = AskAndPersistFile($main::filepaths{"sessionpath"});
-    my($session) = Moz::MacCVS->new( $cvsfile );
-    unless (defined($session)) { die "Error: Checkout aborted. Cannot create session file: $session" }
-
-    # activate MacCVS
-    ActivateApplication('Mcvs');
-    
-    my($checkout_start_time) = time();
-
-    #print "Time now is $checkout_start_time ($checkout_start_time + 0)\n";
-    
-    my($this_co);
-    foreach $this_co (@$modules)
-    {
-        my($module, $revision, $date) = ($this_co->[0], $this_co->[1], $this_co->[2]);        
-        
-        # assume that things pulled by date wont change
-        if ($date ne "") {
-            print "$module is pulled by date, so ignoring in FastUpdate.\n";
-            next;
-        }
-
-        my($search_type) = "hours";
-        my($min_date) = "";
-        my($max_date) = "";
-        my($url) = "http://bonsai.mozilla.org/cvsquery.cgi?treeid=default&module=${module}&branch=${revision}&branchtype=match&dir=&file=&filetype=match&who=&whotype=match&sortby=Date&hours=${num_hours}&date=${search_type}&mindate=${min_date}&maxdate=${max_date}&cvsroot=%2Fcvsroot";
-
-        if ($revision eq "") {
-            print "Getting list of checkins to $module from Bonsai...\n";
-        } else {
-            print "Getting list of checkins to $module on branch $revision from Bonsai...\n";
-        }
-        my(@files) = &get_files_from_content(&get_url_contents($url));
-
-        if ($#files > 0)
-        {
-           my(@cvs_co_list);
-        
-           my($co_file);
-           foreach $co_file (@files)
-           {
-               print "Updating $co_file\n";
-               push(@cvs_co_list, $co_file);
-           }
-
-            my($result) = $session->update($revision, \@cvs_co_list);
-            # result of 1 is success
-            if (!$result) { die "Error: Fast update failed\n"; }
-        } else {
-            print "No files in this module changed\n";        
-        }
-    }
-    
-    saveCheckoutTimestamp($checkout_start_time, $timestamp_file);
-    return 1;
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// Checkout
-#//--------------------------------------------------------------------------------------------------
-sub CheckoutModules($$$)
-{
-    my($modules, $pull_date, $timestamp_file) = @_;          # list of modules to check out
-
-    my($start_time) = TimeStart();
-
-#    assertRightDirectory();
-    my($cvsfile) = AskAndPersistFile($main::filepaths{"sessionpath"});
-    my($session) = Moz::MacCVS->new( $cvsfile );
-    unless (defined($session)) { die "Error: Checkout aborted. Cannot create session file: $session" }
-
-    my($checkout_start_time) = time();
-    
-    # activate MacCVS
-    ActivateApplication('Mcvs');
-
-    my($this_co);
-    foreach $this_co (@$modules)
-    {
-        my($module, $revision, $date) = ($this_co->[0], $this_co->[1], $this_co->[2]);
-        if ($date eq "") {
-            $date = $pull_date;
-        }
-        CheckOutModule($session, $module, $revision, $date);
-        # print "Checking out $module with ref $revision, date $date\n";
-    }
-
-    saveCheckoutTimestamp($checkout_start_time, $timestamp_file);
-    TimeEnd($start_time, "Checkout");
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// ReadCheckoutModulesFile
-#//--------------------------------------------------------------------------------------------------
-sub ReadCheckoutModulesFile($$)
-{
-    my($modules_file, $co_list) = @_;
-
-    my($checkout_file) = getScriptFolder().":".$modules_file;
-    local(*CHECKOUT_FILE);  
-    open(CHECKOUT_FILE, "< $checkout_file") || die "Error: failed to open checkout list $checkout_file\n";
-    while (<CHECKOUT_FILE>)
-    {
-        my($line) = $_;
-        chomp($line);
-    
-        # ignore comments and empty lines
-        if ($line =~ /^\#/ || $line =~ /^\s*$/) {
-            next;
-        }
-    
-        my(@cvs_co) = ["", "", ""];
-        
-        my($module, $revision, $date) = (0, 1, 2);
-        
-        if ($line =~ /\s*([^#,\s]+)\s*\,\s*([^#,\s]+)\s*\,\s*([^#]+)/)
-        {
-            @cvs_co[$module] = $1;
-            @cvs_co[$revision] = $2;
-            @cvs_co[$date] = $3;
-        }
-        elsif ($line =~ /\s*([^#,\s]+)\s*\,\s*([^#,\s]+)\s*(#.+)?/)
-        {
-            @cvs_co[$module] = $1;
-            @cvs_co[$revision] = $2;
-        }
-        elsif ($line =~ /\s*([^#,\s]+)\s*\,\s*,\s*([^#,]+)/)       
-        {
-            @cvs_co[$module] = $1;
-            @cvs_co[$date] = $2;
-        }
-        elsif ($line =~ /\s*([^#,\s]+)/)
-        {
-            @cvs_co[$module] = $1;
-        }
-        else
-        {
-            die "Error: unrecognized line '$line' in $modules_file\n";
-        }
-        
-        # strip surrounding space from date
-        @cvs_co[$date] =~ s/^\s*|\s*$//g;
-        
-        # print "Going to check out '@cvs_co[$module]', '@cvs_co[$revision]', '@cvs_co[$date]'\n";
-        push(@$co_list, \@cvs_co);
-    }
-
-    close(CHECKOUT_FILE);
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// PullFromCVS
-#//--------------------------------------------------------------------------------------------------
-sub PullFromCVS($$)
-{
-    unless ( $main::build{pull} ) { return; }
-    
-    my($modules_file, $timestamp_file) = @_;
-
-    StartBuildModule("pull");
-    
-    my(@cvs_co_list);
-    ReadCheckoutModulesFile($modules_file, \@cvs_co_list);
-
-    if ($main::FAST_UPDATE && $main::options{pull_by_date})
-    {
-        die "Error: you can't use FAST_UPDATE if you are pulling by date.\n";
-    }
-
-    my($did_fast_update) = $main::FAST_UPDATE && FastUpdate(\@cvs_co_list, $timestamp_file);
-    if (!$did_fast_update)
-    {
-        my($pull_date) = "";
-        if ($main::options{pull_by_date})
-        {
-            # acceptable CVS date formats are (in local time):
-            # ISO8601 (e.g. "1972-09-24 20:05") and Internet (e.g. "24 Sep 1972 20:05").
-            # Perl's localtime() string format also seems to work.
-            $pull_date = localtime().""; # force string interp.
-            print "Pulling by date $pull_date\n";
-        }
-
-        CheckoutModules(\@cvs_co_list, $pull_date, $timestamp_file);
-    }
-
-    EndBuildModule("pull");
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// RunBuild
-#//--------------------------------------------------------------------------------------------------
-sub RunBuild($$$$)
-{
-    my($do_pull, $do_build, $input_files, $build_prefs) = @_;
-
-    InitBuildProgress($input_files->{"buildprogress"});
-    
-    # if we are pulling, we probably want to do a full build, so clear the build progress
-    if ($do_pull) {
-        ClearBuildProgress();    
-    }
-    
-    # read local prefs, and the build progress file, and set flags to say what to build
-    SetupBuildParams(\%main::build,
-                     \%main::options,
-                     \%main::optiondefines,
-                     \%main::filepaths,
-                     $input_files->{"buildflags"},
-                     $build_prefs);
-    
-    # If we were told to pull, make sure we do, overriding prefs etc.
-    if ($do_pull)
-    {
-        $main::build{"pull"} = 1;
-    }
-    
-    # transfer this flag
-    $CodeWarriorLib::CLOSE_PROJECTS_FIRST = $main::CLOSE_PROJECTS_FIRST;
-    
-    # setup the build log
-    SetupBuildLog($main::filepaths{"buildlogfilepath"}, $main::USE_TIMESTAMPED_LOGS);
-    StopForErrors();
-    
-    if ($main::LOG_TO_FILE) {
-        RedirectOutputToFile($main::filepaths{"scriptlogfilepath"});
-    }
-        
-    # run a pre-build check to see that the tools etc are in order
-    DoPrebuildCheck();
-    
-    # do the pull
-    PullFromCVS($input_files->{"checkoutdata"}, $input_files->{"checkouttime"});
-    
-    unless ($do_build) { return; }
-
-    my($build_start) = TimeStart();
-
-    # check the build environment
-    ConfigureBuildSystem();
-
-    # here we load and call methods in the build module indirectly.
-    # we have to use indirection because the build module can be named
-    # differently for different builds.
-    chdir(dirname($0));     # change to the script dir
-    my($build_module) = $input_files->{"buildmodule"};
-    # load the build module
-    require $build_module;
-    {   # scope for no strict 'refs'
-        no strict 'refs';
-        
-        my($package_name) = $build_module;
-        $package_name =~ s/\.pm$//;
-        
-        chdir($main::MOZ_SRC);
-        &{$package_name."::BuildDist"}();
-        
-        chdir($main::MOZ_SRC);
-        &{$package_name."::BuildProjects"}();
-    }
-    
-    # the build finished, so clear the build progress state
-    ClearBuildProgress();
-    
-    TimeEnd($build_start, "Build");
-    print "Build complete\n";
-}
-
-1;

mozilla/build/mac/build_scripts/Moz/BuildFlags.pm

@@ -1,425 +0,0 @@
-#!perl -w
-package Moz::BuildFlags;
-
-require 5.004;
-require Exporter;
-
-# Package that attempts to read a file from the Preferences folder,
-# and get build settings out of it
-
-use strict;
-use Exporter;
-
-use Cwd;
-use File::Basename;
-
-use Moz::Moz;
-use Moz::Prefs;
-
-use vars qw(@ISA @EXPORT);
-
-@ISA      = qw(Exporter);
-@EXPORT   = qw(
-                SetupBuildParams
-                InitBuildProgress
-                WriteBuildProgress
-                ClearBuildProgress
-                ReadBuildProgress
-              );
-
-
-my(@build_flags);
-my(@options_flags);
-my(@filepath_flags);
-
-my(%arrays_list) = (
-  "build_flags",    \@build_flags,
-  "options_flags",  \@options_flags,
-  "filepath_flags", \@filepath_flags
-);
-
-my($progress_file) = "¥ÊBuild progress";
-
-#-------------------------------------------------------------------------------
-# appendArrayFlag
-# 
-# Set a flag in the array
-#-------------------------------------------------------------------------------
-sub appendArrayFlag(@)
-{
-  my($array_name) = shift;
-  my($setting) = shift;
-  my($value) = shift;
-  
-  my(@optional_values);
-  foreach (@_) {
-    push(@optional_values, $_);
-  }
-
-  my(@this_flag) = [$setting, $value, @optional_values];
-  my($flags_array) = $arrays_list{$array_name};
-  if ($flags_array)
-  {
-    push(@{$flags_array}, @this_flag) || die "Failed to append\n";
-  }
-  else
-  {
-    die "Error: unknown build flags array $array_name\n";
-  }
-}
-
-#-------------------------------------------------------------------------------
-# readFlagsFile
-# 
-# Read the file of build flags from disk. File path is relative to the
-# script directory.
-#-------------------------------------------------------------------------------
-sub readFlagsFile($)
-{
-  my($flags_file) = @_;
-
-  my($file_path) = $0;
-  $file_path =~ s/[^:]+$/$flags_file/;
-  
-  print "Reading build flags from '$file_path'\n";
-
-  local(*FLAGS_FILE);
-  open(FLAGS_FILE, "< $file_path") || die "Error: failed to open flags file $file_path\n";
-
-  my($cur_array) = "";
-  
-  while(<FLAGS_FILE>)
-  {
-      my($line) = $_;
-      chomp($line);
-      
-      # ignore comments and empty lines  
-      if ($line =~ /^\#/ || $line =~ /^\s*$/) {
-        next;
-      }
-
-      # 1-word line, probably array name
-      if ($line =~ /^([^#\s]+)\s*$/)
-      {
-        $cur_array = $1;
-        next;  
-      }
-      elsif ($line =~ /^([^#\s]+)\s+\"(.+)\"(\s+#.+)?$/)    # quoted option, possible comment
-      {
-        my($flag) = $1;
-        my($setting) = $2;
-        
-        appendArrayFlag($cur_array, $flag, $setting);
-      }
-      elsif ($line =~ /^([^#\s]+)((\s+[^#\s]+)+)(\s+#.+)?$/)  # multiple word line, possible comment
-      {
-        my($flag) = $1;
-        
-        appendArrayFlag($cur_array, $flag, split(' ', $2));
-      }
-      else
-      {
-        die "Error: unknown build flag at '$line'\n";
-      }
-  
-  }
-  
-  close(FLAGS_FILE);
-}
-
-
-
-#-------------------------------------------------------------------------------
-# flagsArrayToHash
-# 
-# Utility routine to migrate flag from a 2D array to a hash, where
-# item[n][0] is the hash entry name, and item[n][1] is the hash entry value.
-#-------------------------------------------------------------------------------
-
-sub flagsArrayToHash($$)
-{
-  my($src_array, $dest_hash) = @_;
-  
-  my($item);
-  foreach $item (@$src_array)
-  {
-    $dest_hash->{$item->[0]} = $item->[1];
-  }
-}
-
-#-----------------------------------------------
-# printHash
-#
-# Utility routine to print a hash
-#-----------------------------------------------
-sub printHash($)
-{
-  my($hash_ref) = @_;
- 
-  print "Printing hash:\n";
-  
-  my($key, $value);
-  
-  while (($key, $value) = each (%$hash_ref))
-  {
-    print "  $key $value\n";
-  }
-}
-
-
-#-----------------------------------------------
-# printBuildArray
-#
-# Utility routine to print a 2D array
-#-----------------------------------------------
-sub printBuildArray($)
-{
-  my($build_array) = @_;
-  
-  my($entry);
-  foreach $entry (@$build_array)
-  {  
-    print "$entry->[0] = $entry->[1]\n";
-  }
-
-}
-
-#-------------------------------------------------------------------------------
-# SetBuildFlags
-#-------------------------------------------------------------------------------
-sub SetBuildFlags($)
-{
-  my($build) = @_;
-
-  flagsArrayToHash(\@build_flags, $build);
-}
-
-#-------------------------------------------------------------------------------
-# SetBuildOptions
-#-------------------------------------------------------------------------------
-sub SetBuildOptions($)
-{
-  my($options) = @_;
-
-  flagsArrayToHash(\@options_flags, $options);
-}
-
-#-------------------------------------------------------------------------------
-# SetFilepathFlags
-#-------------------------------------------------------------------------------
-sub SetFilepathFlags($)
-{
-  my($filepath) = @_;
-
-  flagsArrayToHash(\@filepath_flags, $filepath);
-}
-
-#-------------------------------------------------------------------------------
-# SetOptionDefines
-#-------------------------------------------------------------------------------
-sub SetOptionDefines($)
-{
-  my($optiondefines) = @_;
-
-  foreach my $entry (@options_flags)
-  {
-    if (defined($entry->[2])) {
-      $optiondefines->{$entry->[0]}{$entry->[2]} = 1;
-    }
-  }
-}
-
-
-#-------------------------------------------------------------------------------
-# PropagateAllFlags
-#-------------------------------------------------------------------------------
-sub PropagateAllFlags($)
-{
-  my($build_array) = @_;
-  
-  # if "all" is set, set all the flags to 1
-  unless ($build_array->[0][0] eq "all") { die "Error: 'all' must come first in the flags array\n"; }
-  
-  if ($build_array->[0][1] == 1)
-  {
-    my($index);
-    foreach $index (@$build_array)
-    {
-      $index->[1] = 1;
-    }
-  }
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// _getBuildProgressFile
-#//--------------------------------------------------------------------------------------------------
-sub _getBuildProgressFile()
-{
-  return $progress_file;
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// setBuildProgressStart
-#// 
-#// This automagically sets $build{"all"} to 0
-#//--------------------------------------------------------------------------------------------------
-sub setBuildProgressStart($$)
-{
-  my($build_array, $name) = @_;
-
-  my($index);
-  foreach $index (@$build_array)
-  {
-    $index->[1] = 0;
-    if ($index->[0] eq $name) {
-      last;
-    }    
-  }
-
-  print "Building from module after $name, as specified by build progress\n";
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// InitBuildProgress
-#//--------------------------------------------------------------------------------------------------
-sub InitBuildProgress($)
-{
-  my($prog_file) = @_;
-  if ($prog_file ne "") {
-    $progress_file = full_path_to($prog_file);
-    print "Writing build progress to $progress_file\n";
-  }
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// WriteBuildProgress
-#//--------------------------------------------------------------------------------------------------
-sub WriteBuildProgress($)
-{
-  my($module_built) = @_;
-
-  my($progress_file) = _getBuildProgressFile();
-  
-  if ($progress_file ne "")
-  {
-    open(PROGRESS_FILE, ">>$progress_file") || die "Failed to open $progress_file\n";
-    print(PROGRESS_FILE "$module_built\n");
-    close(PROGRESS_FILE);
-  }
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// ClearBuildProgress
-#//--------------------------------------------------------------------------------------------------
-sub ClearBuildProgress()
-{
-  my($progress_file) = _getBuildProgressFile();
-  if ($progress_file ne "") {
-    unlink $progress_file;
-  }
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// WipeBuildProgress
-#//--------------------------------------------------------------------------------------------------
-sub WipeBuildProgress()
-{
-  print "Ignoring build progress\n";
-  ClearBuildProgress();
-  $progress_file = "";
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// ReadBuildProgress
-#//--------------------------------------------------------------------------------------------------
-sub ReadBuildProgress($)
-{
-  my($build_array) = @_;
-  my($progress_file) = _getBuildProgressFile();
-
-  my($last_module);
-  
-  if (open(PROGRESS_FILE, "< $progress_file"))
-  {
-    print "Getting build progress from $progress_file\n";
-    
-    while (<PROGRESS_FILE>)
-    {
-      my($line) = $_;
-      chomp($line);
-      $last_module = $line;
-    }
-    
-    close(PROGRESS_FILE);
-  }
-  
-  if ($last_module)
-  {
-    setBuildProgressStart($build_array, $last_module);
-  }
-}
-
-#-------------------------------------------------------------------------------
-# clearOldBuildSettings
-#-------------------------------------------------------------------------------
-sub clearOldBuildSettings($$$$)
-{
-  my($build, $options, $optiondefines, $filepaths) = @_;
-
-  # empty the arrays in case we're being called twice
-  @build_flags = ();
-  @options_flags = ();
-  @filepath_flags = ();
-  
-  # and empty the hashes
-  %$build = ();
-  %$options = ();
-  %$optiondefines = ();
-  %$filepaths = ();
-}
-
-#-------------------------------------------------------------------------------
-# SetupBuildParams
-#-------------------------------------------------------------------------------
-sub SetupBuildParams($$$$$$)
-{
-  my($build, $options, $optiondefines, $filepaths, $flags_file, $prefs_file) = @_;
-  
-  # Empty the hashes and arrays, to wipe out any stale data.
-  # Needed because these structures persist across two build scripts
-  # called using 'do' from a parent script.
-  clearOldBuildSettings($build, $options, $optiondefines, $filepaths);
-  
-  # Read from the flags file, which sets up the various arrays
-  readFlagsFile($flags_file);
-  
-  # If 'all' is set in the build array, propagate that to all entries
-  PropagateAllFlags(\@build_flags);
-  
-  # read the user pref file, that can change values in the array
-  ReadMozUserPrefs($prefs_file, \@build_flags, \@options_flags, \@filepath_flags);
-
-  # If build progress exists, this clears flags in the array up to a certain point
-  if ($main::USE_BUILD_PROGRESS) {
-    ReadBuildProgress(\@build_flags);
-  } else {
-    WipeBuildProgress();
-  }
-  
-#  printBuildArray(\@build_flags);
-#  printBuildArray(\@options_flags);
-  
-  SetBuildFlags($build);
-  SetBuildOptions($options);
-  SetOptionDefines($optiondefines);
-  SetFilepathFlags($filepaths);
-  
-#  printHash($build);
-#  printHash($options);
-}
-
-
-1;

mozilla/build/mac/build_scripts/Moz/BuildUtils.pm

@@ -1,786 +0,0 @@
-
-package Moz::BuildUtils;
-
-require 5.004;
-require Exporter;
-
-# Package that contains build util functions specific to the Mozilla build
-# process.
-
-use strict;
-use Exporter;
-
-use Cwd;
-use File::Path;
-use File::Basename;
-
-use Mac::Events;
-use Mac::StandardFile;
-
-use Moz::Moz;
-use Moz::BuildFlags;
-use Moz::MacCVS;
-#use Moz::ProjectXML;  #optional; required for static build only
-
-use vars qw(@ISA @EXPORT);
-
-@ISA      = qw(Exporter);
-@EXPORT   = qw(
-                SetupDefaultBuildOptions
-                SetupBuildRootDir
-                StartBuildModule
-                EndBuildModule
-                GetBinDirectory
-                BuildOneProjectWithOutput
-                BuildOneProject
-                BuildProject
-                BuildProjectClean
-                BuildIDLProject
-                BuildFolderResourceAliases
-                AskAndPersistFile
-                DelayFor
-                TimeStart
-                TimeEnd
-                EmptyTree
-                SetupBuildLog
-                SetBuildNumber
-                SetTimeBomb
-                UpdateConfigHeader
-              );
-
-#//--------------------------------------------------------------------------------------------------
-#// SetupDefaultBuildOptions
-#//--------------------------------------------------------------------------------------------------
-sub SetupDefaultBuildOptions($$$)
-{
-    my($debug, $bin_dir, $config_header_file_name) = @_;
-
-    # Here we set up defaults for the various build flags.
-    # If you want to override any of these, it's best to do
-    # so via the relevant preferences file, which lives in
-    # System Folder:Preferences:Mozilla build prefs:{build prefs file}.
-    # For the name of the prefs file, see the .pl script that you
-    # run to start this build. The prefs files are created when
-    # you run the build, and contain some documentation.
-    
-    #-------------------------------------------------------------
-    # configuration variables that globally affect what is built
-    #-------------------------------------------------------------
-    $main::DEBUG                  = $debug;
-    $main::PROFILE                = 0;
-    $main::RUNTIME                = 0;    # turn on to just build runtime support and NSPR projects
-    $main::GC_LEAK_DETECTOR       = 0;    # turn on to use GC leak detection
-    $main::MOZILLA_OFFICIAL       = 0;    # generate build number
-    $main::LOG_TO_FILE            = 0;    # write perl output to a file
-    
-    #-------------------------------------------------------------
-    # configuration variables that affect the manner of building, 
-    # but possibly affecting the outcome.
-    #-------------------------------------------------------------    
-    $main::ALIAS_SYM_FILES        = $main::DEBUG;
-    $main::CLOBBER_LIBS           = 1;      # turn on to clobber existing libs and .xSYM files before
-                                            # building each project                         
-    # The following two options will delete all dist files (if you have $main::build{dist} turned on),
-    # but leave the directory structure intact.
-    $main::CLOBBER_DIST_ALL       = 1;    # turn on to clobber all aliases/files inside dist (headers/xsym/libs)
-    $main::CLOBBER_DIST_LIBS      = 0;    # turn on to clobber only aliases/files for libraries/sym files in dist
-    $main::CLOBBER_IDL_PROJECTS   = 0;    # turn on to clobber all IDL projects.
-    $main::CLOBBER_PROJECTS       = 0;    # turn on to remove object code from each project before building it
-    
-    $main::UNIVERSAL_INTERFACES_VERSION = 0x0320;
-    
-    #-------------------------------------------------------------
-    # configuration variables that are preferences for the build,
-    # style and do not affect what is built.
-    #-------------------------------------------------------------
-    $main::CLOSE_PROJECTS_FIRST   = 0;
-                                    # 1 = close then make (for development),
-                                    # 0 = make then close (for tinderbox).
-    $main::USE_TIMESTAMPED_LOGS   = 0;
-    $main::USE_BUILD_PROGRESS     = 1;    # track build progress for restartable builds
-    #-------------------------------------------------------------
-    # END OF CONFIG SWITCHES
-    #-------------------------------------------------------------
-    
-    $main::BIN_DIRECTORY = $bin_dir;
-    $main::DEFINESOPTIONS_FILE = $config_header_file_name;
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// SetupBuildRootDir
-#//--------------------------------------------------------------------------------------------------
-sub SetupBuildRootDir($)
-{
-    my($rel_path_to_script) = @_;
-
-    my($cur_dir) = cwd();
-    $cur_dir =~ s/$rel_path_to_script$//;
-    chdir($cur_dir) || die "Error: failed to set build root directory to '$cur_dir'.\nYou probably need to put 'mozilla' one level down (in a folder).\n";
-    $main::MOZ_SRC = cwd();
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// StartBuildModule
-#//--------------------------------------------------------------------------------------------------
-sub StartBuildModule($)
-{
-    my($module) = @_;
-
-    print("---- Start of $module ----\n");
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// EndBuildModule
-#//--------------------------------------------------------------------------------------------------
-sub EndBuildModule($)
-{
-    my($module) = @_;
-    WriteBuildProgress($module);
-    print("---- End of $module ----\n");
-}
-
-#--------------------------------------------------------------------------------------------------
-# GetBinDirectory
-#--------------------------------------------------------------------------------------------------
-sub GetBinDirectory()
-{
-    if ($main::BIN_DIRECTORY eq "") { die "Dist directory not set\n"; }
-    return $main::BIN_DIRECTORY;
-}
-
-#--------------------------------------------------------------------------------------------------
-# AskAndPersistFile stores the information about the user pick inside
-# the file $session_storage
-#--------------------------------------------------------------------------------------------------
-sub AskAndPersistFile($)
-{
-    my ($sessionStorage) = @_;
-    my $cvsfile;
-
-    if (( -e $sessionStorage) &&
-        open( SESSIONFILE, $sessionStorage ))
-    {
-    # Read in the path if available
-        $cvsfile = <SESSIONFILE>;
-        chomp $cvsfile;
-        close SESSIONFILE;
-        if ( ! -e $cvsfile )
-        {
-            print STDERR "$cvsfile has disappeared\n";
-            undef $cvsfile;
-        }
-    }
-    unless (defined ($cvsfile))
-    {
-        # make sure that MacPerl is a front process
-        ActivateApplication('McPL');
-        MacPerl::Answer("Could not find your MacCVS session file. Please choose one", "OK");
-        
-        # prompt user for the file name, and store it
-        my $macFile = StandardGetFile( 0, "McvD");  
-        if ( $macFile->sfGood() )
-        {
-            $cvsfile = $macFile->sfFile();
-            # save the choice if we can
-            if ( open (SESSIONFILE, ">" . $sessionStorage))
-            {
-                printf SESSIONFILE $cvsfile, "\n";
-                close SESSIONFILE;
-            }
-            else
-            {
-                print STDERR "Could not open storage file $sessionStorage for saving $cvsfile\n";
-            }
-        }
-    }
-    return $cvsfile;
-}
-
-
-#--------------------------------------------------------------------------------------------------
-# BuildIDLProject
-#
-#--------------------------------------------------------------------------------------------------
-
-sub BuildIDLProject($$)
-{
-    my ($project_path, $module_name) = @_;
-
-    if ($main::CLOBBER_IDL_PROJECTS)
-    {
-        my (@suffix_list) = (".mcp", ".xml");
-        my ($project_name, $project_dir, $suffix) = fileparse($project_path, @suffix_list);
-        if ($suffix eq "") { die "Error: Project, $project_path must end in .xml or .mcp\n"; }
-
-        my($datafolder_path);
-        if ($suffix eq ".xml")
-        {
-            $datafolder_path = $project_dir . "_" . $project_name . " Data:";
-        }
-        else {
-            $datafolder_path = $project_dir . $project_name . " Data:";
-        }
-
-        print STDERR "Deleting IDL data folder: $datafolder_path\n";
-        EmptyTree($datafolder_path);
-    }
-
-    BuildOneProject($project_path,  "headers", 0, 0, 0);
-    BuildOneProject($project_path,  $module_name.".xpt", 1, 0, 1);
-}
-
-
-#--------------------------------------------------------------------------------------------------
-# CreateStaticLibTargets
-#
-#--------------------------------------------------------------------------------------------------
-sub CreateXMLStaticLibTargets($)
-{
-    my($xml_path) = @_;
-
-    my (@suffix_list) = (".xml");
-    my ($project_name, $project_dir, $suffix) = fileparse($xml_path, @suffix_list);
-    if ($suffix eq "") { die "XML munging: $xml_path must end in .xml\n"; }
-
-    #sniff the file to see if we need to fix up broken Pro5-exported XML
-    print "Parsing $xml_path\n";
-    
-    my $ide_version = Moz::ProjectXML::SniffProjectXMLIDEVersion($xml_path);
-    if ($ide_version eq "4.0")
-    {
-        my $new_file = $project_dir.$project_name."2.xml";
-        
-        print "Cleaning up Pro 5 xml to $new_file\n";
-        
-        Moz::ProjectXML::CleanupPro5XML($xml_path, $new_file);
-
-        unlink $xml_path;
-        rename ($new_file, $xml_path);
-    }
-    
-    my $doc = Moz::ProjectXML::ParseXMLDocument($xml_path);
-    my @target_list = Moz::ProjectXML::GetTargetsList($doc);
-    my $target;
-    
-    my %target_hash;    # for easy lookups below
-    foreach $target (@target_list) { $target_hash{$target} = 1; }
-    
-    foreach $target (@target_list)
-    {
-        if ($target =~ /(.+).shlb$/)        # if this is a shared lib target
-        {
-            my $target_base = $1;
-            my $static_target = $target_base.".o";
-            
-            # ensure that this does not exist already
-            if ($target_hash{$static_target}) {
-                print "Static target $static_target already exists in project. Not making\n";
-                next;
-            }
-            
-            print "Making static target '$static_target' from target '$target'\n";
-
-            Moz::ProjectXML::CloneTarget($doc, $target, $static_target);
-            Moz::ProjectXML::SetAsStaticLibraryTarget($doc, $static_target, $static_target);
-        }
-    }
-    
-    print "Writing XML file to $xml_path\n";
-    my $temp_path = $project_dir."_".$project_name.".xml";
-    Moz::ProjectXML::WriteXMLDocument($doc, $temp_path, $ide_version);
-    Moz::ProjectXML::DisposeXMLDocument($doc);
-    
-    if (-e $temp_path)
-    {
-        unlink $xml_path;
-        rename ($temp_path, $xml_path);
-    }
-    else
-    {
-        die "Error: Failed to add new targets to XML project\n";
-    }
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// ProcessProjectXML
-#// 
-#// Helper routine to allow for XML pre-processing. This should read in the XML, process it,
-#// and replace the original file with the processed version.
-#//--------------------------------------------------------------------------------------------------
-sub ProcessProjectXML($)
-{
-    my($xml_path) = @_;
-  
-    # we need to manually load Moz::ProjectXML, becaues not everyone will have the
-    # required perl modules in their distro.
-    my($cur_dir) = cwd();
-    
-    chdir(dirname($0));     # change to the script dir
-    eval "require Moz::ProjectXML";
-    if ($@) { die "Error: could not do Project XML munging because you do not have the correct XML modules installed. Error is:\n################\n $@################"; }
-    
-    chdir($cur_dir);
-    
-    CreateXMLStaticLibTargets($xml_path);
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// Build one project, and make the alias. Parameters are project path, target name, shared  library
-#// name, make shlb alias (boolean), make xSYM alias (boolean), and is component (boolean).
-#//--------------------------------------------------------------------------------------------------
-
-sub BuildOneProjectWithOutput($$$$$$)
-{
-    my ($project_path, $target_name, $output_name, $alias_lib, $alias_xSYM, $component) = @_;
-
-    unless ($project_path =~ m/^$main::BUILD_ROOT.+/) { return; }
-
-    my (@suffix_list) = (".mcp", ".xml");
-    my ($project_name, $project_dir, $suffix) = fileparse($project_path, @suffix_list);
-    if ($suffix eq "") { die "Error: Project, $project_path must end in .xml or .mcp\n"; }
-    
-    my($dist_dir) = GetBinDirectory();
-    
-    # Put libraries in "Essential Files" folder, Components in "Components" folder
-    my($output_dir)  = $component ? "Components:" : "Essential Files:";
-    my($output_path) = $dist_dir.$output_dir;
-
-    if ($main::options{static_build})
-    {      
-      if ($output_name =~ /\.o$/ || $output_name =~ /\.[Ll]ib$/)
-      {
-        $alias_xSYM = 0;
-        $alias_lib  = 1;
-        $output_path = $main::DEBUG ? ":mozilla:dist:static_libs_debug:" : ":mozilla:dist:static_libs:";
-      }
-    }
-
-    # if the flag is on to export projects to XML, export and munge them
-    if ($main::EXPORT_PROJECTS && !($project_path =~ /IDL\.mcp$/))
-    {
-        my $xml_out_path = $project_path;
-
-        $xml_out_path =~ s/\.mcp$/\.xml/;
-
-        # only do this if project is newer?
-        if (! -e $xml_out_path)
-        {
-          ExportProjectToXML(full_path_to($project_path), full_path_to($xml_out_path));
-          ProcessProjectXML($xml_out_path);
-        }
-    }
-        
-    # if the flag is set to use XML projects, default to XML if the file 
-    # is present.
-    if ($main::USE_XML_PROJECTS && !($project_path =~ /IDL\.mcp$/))
-    {
-      my $xml_project_path = $project_dir.$project_name.".xml";
-      if (-e $xml_project_path)
-      {
-        $project_path = $xml_project_path;
-        $suffix = ".xml";
-      }
-    }
-    
-    if ($suffix eq ".xml")
-    {
-        my($xml_path) = $project_path;
-        # Prepend an "_" onto the name of the generated project file so it doesn't conflict
-        $project_path = $project_dir . "_" . $project_name . ".mcp";
-        my($project_modtime) = (-e $project_path ? GetFileModDate($project_path) : 0);
-        my($xml_modtime) = (-e $xml_path ? GetFileModDate($xml_path) : 0);
-
-        if ($xml_modtime > $project_modtime)
-        {
-            print("Importing $project_path from $project_name.xml.\n");
-            unlink($project_path);
-            # Might want to delete the "xxx.mcp Data" dir ???
-            ImportXMLProject(full_path_to($xml_path), full_path_to($project_path));
-        }
-    }
-
-
-    if ($main::CLOBBER_LIBS)
-    {
-        unlink "$project_dir$output_name";              # it's OK if these fail
-        unlink "$project_dir$output_name.xSYM";
-    }
-    
-    DoBuildProject($project_path, $target_name, $main::CLOBBER_PROJECTS);
-    
-    $alias_lib  ? MakeAlias("$project_dir$output_name",      "$output_path") : 0;
-    $alias_xSYM ? MakeAlias("$project_dir$output_name.xSYM", "$output_path") : 0;
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// For compatiblity with existing scripts, BuildOneProject now just calls
-#// BuildOneProjectWithOutput, with the output name and target name identical.
-#// Note that this routine assumes that the target name and the shared libary name
-#// are the same.
-#//--------------------------------------------------------------------------------------------------
-
-sub BuildOneProject($$$$$)
-{
-    my ($project_path, $target_name, $alias_lib, $alias_xSYM, $component) = @_;
-    
-	BuildOneProjectWithOutput($project_path, $target_name, $target_name,
-							  $alias_lib, $alias_xSYM, $component);
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// For compatiblity with existing scripts, BuildProject now just calls
-#// BuildOneProjectWithOutput, with the output name and target name identical.
-#// Note that this routine assumes that the target name and the shared libary name
-#// are the same. No aliases of the output are made.
-#//--------------------------------------------------------------------------------------------------
-
-sub BuildProject($$)
-{
-    my ($project_path, $target_name) = @_;
-    
-	BuildOneProjectWithOutput($project_path, $target_name, $target_name, 0, 0, 0);
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// Identical to BuildProject but clobbers the project before building it.
-#//--------------------------------------------------------------------------------------------------
-
-sub BuildProjectClean($$)
-{
-    my ($project_path, $target_name) = @_;
-    my ($save_clobber_flag) = $main::CLOBBER_PROJECTS;
-    $main::CLOBBER_PROJECTS = 1;
-	BuildOneProjectWithOutput($project_path, $target_name, $target_name, 0, 0, 0);
-	$main::CLOBBER_PROJECTS = $save_clobber_flag;
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// Make resource aliases for one directory
-#//--------------------------------------------------------------------------------------------------
-
-sub BuildFolderResourceAliases($$)
-{
-    my($src_dir, $dest_dir) = @_;
-        
-    # get a list of all the resource files
-    opendir(SRCDIR, $src_dir) || die("can't open $src_dir");
-    my(@resource_files) = readdir(SRCDIR);
-    closedir(SRCDIR);
-    
-    # make aliases for each one into the dest directory
-    print("Placing aliases to all files from $src_dir in $dest_dir\n");
-    for ( @resource_files )
-    {
-        next if $_ eq "CVS";
-        #print("    Doing $_\n");
-        if (-l $src_dir.$_)
-        {
-            print("     $_ is an alias\n");
-            next;
-        }
-        my($file_name) = $src_dir . $_; 
-        MakeAlias($file_name, $dest_dir);
-    }
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// DelayFor
-#//
-#// Delay for the given number of seconds, allowing the script to be cancelled
-#//--------------------------------------------------------------------------------------------------
-
-sub DelayFor($)
-{
-  my($delay_secs) = @_;
-  
-  STDOUT->autoflush(1);
-  
-  my($end_time) = time() + $delay_secs;
-    
-  my($last_time) = 0;
-  my($cur_time) = time();
-  
-  while ($cur_time < $end_time)
-  {
-    $cur_time = time();
-    if ($cur_time > $last_time)
-    {
-      print ".";
-      $last_time = $cur_time;
-    }
-    
-    WaitNextEvent();
-  }
-
-  print "\n";
-  STDOUT->autoflush(0);
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// TimeStart
-#//--------------------------------------------------------------------------------------------------
-sub TimeStart()
-{
-    return time();
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// TimeEnd
-#//--------------------------------------------------------------------------------------------------
-sub TimeEnd($$)
-{
-    use integer;
-    
-    my($start_time, $operation_name) = @_;
-    my($end_time) = time();
-    
-    my($tot_sec) = $end_time - $start_time;
-    
-    my($seconds) = $tot_sec;
-    
-    my($hours) = $seconds / (60 * 60);
-    $seconds -= $hours * (60 * 60);
-    
-    my($minutes) = $seconds / 60;
-    $seconds -= $minutes * 60;
-        
-    print "$operation_name took $hours hours $minutes minutes and $seconds seconds\n";
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// Remove all files from a tree, leaving directories intact (except "CVS").
-#//--------------------------------------------------------------------------------------------------
-
-sub EmptyTree($)
-{
-    my ($root) = @_; 
-    #print "EmptyTree($root)\n";
-    opendir(DIR, $root);
-    my $sub;
-    foreach $sub (readdir(DIR))
-    {
-        my $fullpathname = $root.$sub; # -f, -d only work on full paths
-
-        # Don't call empty tree for the alias of a directory.
-        # -d returns true for the alias of a directory, false for a broken alias)
-
-        if (-d $fullpathname)
-        {
-            if (-l $fullpathname)   # delete aliases
-            {
-                unlink $fullpathname;
-                next;
-            }
-            EmptyTree($fullpathname.":");
-            if ($sub eq "CVS")
-            {
-                #print "rmdir $fullpathname\n";
-                rmdir $fullpathname;
-            }
-        }
-        else
-        {
-            unless (unlink $fullpathname) { die "Failed to delete $fullpathname\n"; }
-        }
-    }
-    closedir(DIR);
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// Recurse through a directory hierarchy, looking for MANIFEST files.
-#// Currently unused.
-#//--------------------------------------------------------------------------------------------------
-
-sub ScanForManifestFiles($$$$)
-{
-    my($dir, $theme_root, $theme_name, $dist_dir) = @_;
-
-    opendir(DIR, $dir) or die "Cannot open dir $dir\n";
-    my @files = readdir(DIR);
-    closedir DIR;
-
-    my $file;
-
-    foreach $file (@files)
-    {    
-        my $filepath = $dir.":".$file;
-
-        if (-d $filepath)
-        {
-            # print "Looking for MANIFEST files in $filepath\n";        
-            ScanForManifestFiles($filepath, $theme_root, $theme_name, $dist_dir);
-        }
-        elsif ($file eq "MANIFEST")
-        {
-            # print "Doing manifest file $filepath\n";
-
-            # Get the dest path from the first line of the file
-
-            open(MANIFEST, $filepath) || die "Could not open file $file";
-            # Read in the path if available
-            my($dest_line) = <MANIFEST>;
-            chomp $dest_line;
-            close MANIFEST;
-
-            $dest_line =~ s|^#!dest[\t ]+|| || die "No destination line found in $filepath\n";
-
-            my($dest_path) = $dist_dir."chrome:skins:$theme_name:$dest_line";
-            # print " Destination is $dest_path\n";
-
-            InstallResources($filepath, "$dest_path", 0);
-        }
-    }
-}
-
-
-#-----------------------------------------------
-# SetupBuildLog
-#-----------------------------------------------
-sub SetupBuildLog($$)
-{
-    my($logfile_path, $timestamped_log) = @_;
-    
-    my($logdir) = "";
-    my($logfile) = $logfile_path;
-    
-    if ($logfile_path =~ /(.+?:)([^:]+)$/)       # ? for non-greedy match
-    {
-        $logdir = $1;
-        $logfile = $2;
-        
-        mkpath($logdir);
-    }
-    
-    if ($timestamped_log)
-    {
-        #Use time-stamped names so that you don't clobber your previous log file!
-        my $now = localtime();
-        while ($now =~ s@:@.@) {} # replace all colons by periods
-        OpenErrorLog("${logdir}${now}");
-    }
-    else
-    {
-        OpenErrorLog("${logdir}${logfile}");
-    }
-}
-
-#-----------------------------------------------
-# SetBuildNumber
-#-----------------------------------------------
-sub SetBuildNumber($$)
-{
-    my($build_num_file, $files_to_touch) = @_;
-
-    # Make sure we add the config dir to search, to pick up mozBDate.pm
-    # Need to do this dynamically, because this module can be used before
-    # mozilla/config has been checked out.
-    
-    my ($inc_path) = $0;        # $0 is the path to the parent script
-    $inc_path =~ s/:build:mac:build_scripts:.+$/:config/;
-    push(@INC, $inc_path);
-
-    require mozBDate;
-    
-    mozBDate::UpdateBuildNumber($build_num_file, $main::MOZILLA_OFFICIAL);
-   
-    my($file);
-    foreach $file (@$files_to_touch)
-    {
-        print "Writing build number to $file from ${file}.in\n";
-        mozBDate::SubstituteBuildNumber($file, $build_num_file, "${file}.in");
-    }
-}
-
-#-----------------------------------------------
-# SetTimeBomb
-#-----------------------------------------------
-sub SetTimeBomb($$)		
-{
-  my ($warn_days, $bomb_days) = @_;
-  
-  system("perl :mozilla:config:mac-set-timebomb.pl $warn_days $bomb_days");
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// Regenerate a configuration header file if necessary
-#//--------------------------------------------------------------------------------------------------
-sub UpdateConfigHeader($)
-{
-    my($config_path) = @_;
-    
-    my($config, $oldconfig) = ("", "");
-    my($define, $definevalue, $defines);
-    my($k, $l,);
-
-    foreach $k (keys(%main::options))
-    {
-        if ($main::options{$k})
-        {
-            foreach $l (keys(%{$main::optiondefines{$k}}))
-            {
-                $my::defines{$l} = $main::optiondefines{$k}{$l};
-                print "Setting up my::defines{$l}\n";
-            }
-        }
-    }
-
-    my $config_headerfile = current_directory().$config_path;
-    if (-e $config_headerfile)
-    {
-        open(CONFIG_HEADER, "< $config_headerfile") || die "$config_headerfile: $!\n";
-        my($line);
-        while ($line = <CONFIG_HEADER>)
-        {
-            if ($line =~ m/#define\s+([^\s]*)\s+([^\s]*)\s*\n/)
-            {
-                $define = $1;
-                $definevalue = $2;
-                
-                #canonicalize so that whitespace changes are not significant
-                my $canon_value = "#define " . $define . " " . $definevalue . "\n";
-                $oldconfig .= $canon_value;
-                
-                if (exists ($my::defines{$define}) and ($my::defines{$define} == $definevalue))
-                {
-                    delete $my::defines{$define};
-                    $config .= $canon_value;
-                }
-            }
-        }
-        close(CONFIG_HEADER);
-    }
-
-    if (%my::defines)
-    {
-        foreach $k (keys(%my::defines))
-        {
-            $config .= "#define " . $k . " " . $my::defines{$k} . "\n";
-        }
-    }
-
-    my $file_name = basename($config_headerfile);
-    if (($config ne $oldconfig) || (!-e $config_headerfile))
-    {
-        printf("Writing new configuration header $file_name\n");
-        open(CONFIG_HEADER, "> $config_headerfile") || die "$config_headerfile: $!\n";
-        print(CONFIG_HEADER "/* This file is auto-generated based on build options. Do not edit. */\n");
-        print CONFIG_HEADER ($config);
-        close(CONFIG_HEADER);
-
-        MacPerl::SetFileInfo("CWIE", "TEXT", $config_headerfile);
-    }
-    else
-    {
-        printf("Configuration header $file_name is up-to-date\n");
-    }
-}
-
-
-1;
-

mozilla/build/mac/build_scripts/Moz/CodeWarriorLib.pm

@@ -1,660 +0,0 @@
-#!perl
-package Moz::CodeWarriorLib;
-
-=pod
-
-=head1 NAME
-
-CodeWarriorLib - supply interface to CodeWarrior
-
-=head1 SYNOPSIS
-
-	#!perl
-	use CodeWarriorLib;
-	CodeWarriorLib::activate();
-	$had_errors = CodeWarriorLib::build_project(
-		$project_path, $target_name, $recent_errors_file, $clean_build
-	);
-
-=head1 DESCRIPTION
-
-Replaces the AppleScript library I<CodeWarriorLib>.
-
-=over 4
-
-=cut
-
-use strict;
-
-use Cwd;
-use File::Basename;
-
-use Mac::Types;
-use Mac::Events;
-use Mac::AppleEvents;
-use Mac::AppleEvents::Simple;
-use Mac::Processes;
-use Mac::MoreFiles;
-use Mac::StandardFile;
-
-
-use vars qw($VERSION);
-$VERSION = '1.02';
-
-my($app)  = 'CWIE';
-my($scriptDir) = cwd();         # could use $0 for this
-my($ide_loc_file) = "";
-
-# 0 == don't switch CWIE to front app in do_event(), 1 == do switch
-# note: activate() still switches when called
-$Mac::AppleEvents::Simple::SWITCH = 0;
-# $Mac::AppleEvents::Simple::WARN = 1;
-
-# supply your own path to the source here
-#_test('PowerPudgeIV:mozilla:mozilla:');
-
-# If you want to understand the gobbldeygook that's used to build Apple Events,
-# you should start by reading the AEGizmos documentation.
-
-=pod
-
-=item _get_project($full_path)
-
-A private routine returning a reference to the open project with the given name,
-or else the empty string (when that project is not open)
-
-full_path is a string identifying the project to be built and is of the form, 
-e.g., "HD:ProjectFolder:MyProject.mcp".  It must be supplied.
-
-=cut
-
-sub _get_project ($) {
-	my(
-		$full_path, $candidate_projects
-	) = @_;
-	$candidate_projects = _doc_named(basename($full_path, '*'));
-	if ($candidate_projects) {
-		my($cps) = _get_dobj($candidate_projects);
-		my($num) = AECountItems($cps);
-		if ($num) {  # is a list
-			foreach (1 .. AECountItems($cps)) {
-				my($cp) = AEGetNthDesc($cps, $_);
-				if (lc $full_path eq lc _full_path($cp)) {
-					return($cp);
-				}
-			}
-		} else {     # is only one, not a list
-			if (lc $full_path eq lc _full_path($cps)) {
-				return($cps);
-			}
-		}
-	}
-	return;
-}
-
-=pod
-
-=item build_project
-
-Build a selected target of a project, saving any errors to a file, if supplied.
-	
-full_path is a string identifying the project to be built and is of the form, 
-e.g., "HD:ProjectFolder:MyProject.mcp".  It must be supplied.
-
-If target_name is the empty string, the current target of the selected project 
-will be built, else, target_name should be a string matching a target name in 
-the selected project.
-	
-If error_path is the empty string, errors will not be saved to a file,
-else, error_path should be the full path of a file to save error messages into.
-
-=cut
-
-$CodeWarriorLib::CLOSE_PROJECTS_FIRST = 0; # If true we close then make. If false, make then close.
-my $last_project_built = "";
-my $last_project_was_closed = 0;
-
-sub build_project ($;$$$) {
-	my(
-		$full_path, $target_name, $error_path,
-		$remove_object, $p, $project_was_closed, $had_errors
-	) = @_;
-	_close_errors_window();
-
-	if ($CodeWarriorLib::CLOSE_PROJECTS_FIRST && ($last_project_built ne $full_path))
-	{
-		# If we're in "close first" mode, we don't close if the current project
-		# is the same as the previous one.
-		if ($last_project_was_closed) {
-			$p = _get_project($last_project_built);
-			_close($p);
-		}
-		$last_project_built = $full_path;
-		$last_project_was_closed = 0; # now refers to the new project
-	}
-	$project_was_closed = 0;
-	while (1) {
-		$p = _get_project($full_path);
-		if (!$p) {
-			if ($project_was_closed) {
-				print "### Error - request for project document failed after opening\n";
-				die "### possibly CW Pro 4 bug: be sure to close your Find window\n";
-			}
-			$project_was_closed = 1;
-			$last_project_was_closed = 1;
-			_open_file($full_path);
-		} else {
-			last;
-		}
-	}
-
-	$had_errors = 0;
-	if ($target_name eq '') {
-		if ($remove_object) {_remove_object($p)}
-		_build($p);
-	} else {
-		if ($remove_object) {_remove_object($p, $target_name)}
-		_build($p, $target_name);
-	}
-
-	if ($error_path ne '') {
-		_save_errors_window($error_path);
-	}
-	$had_errors = _close_errors_window();
-
-	if (!$CodeWarriorLib::CLOSE_PROJECTS_FIRST)
-	{
-		if ($project_was_closed) {
-			$p = _get_project($full_path);
-			_close($p);
-		}
-	}
-
-	return($had_errors);
-}
-
-=pod
-
-=item appIsRunning()
-
-=cut
-sub _appIsRunning($)
-{
-	my ($appSignature) = @_;
-	my ($psi);
-	my ($found) = 0;
-	my ($appPSN);
-
-	foreach $psi (values(%Process))
-	{
-		if ($psi->processSignature() eq $appSignature)
-		{
-			$appPSN = $psi->processNumber();
-			$found = 1;
-            last;
-		}
-	}
-	
-	return $found;
-}
-
-=pod
-
-=item appIsFrontmost()
-
-=cut
-sub _appIsFrontmost($)
-{
-	my ($appSignature) = @_;
-	my ($psi);
-	my ($found) = 0;
-	my ($appPSN);
-
-	foreach $psi (values(%Process))
-	{
-		if ($psi->processSignature() eq $appSignature)
-		{
-			$appPSN = $psi->processNumber();
-			$found = 1;
-            last;
-		}
-	}
-	
-	return (GetFrontProcess() == $appPSN);
-}
-
-
-=pod
-
-=item activate()
-
-Launches CodeWarrior and brings it to the front.
-
-Once found, path will be saved in $idepath_file for future reference.
-Edit or delete this file to change the location of the IDE.  If app is
-moved, C<activate()> will prompt for a new location.
-
-First looks for an open CodeWarrior app.  Second, tries to open previously
-saved location in ':idepath.txt'.  Third, tries to find it and allow user
-to choose it with Navigation Services (if present).  Fourth, uses good old
-GUSI routines built-in to MacPerl for a Choose Directory dialog box.
-
-=cut
-
-sub activate ($) {
-
-    $ide_loc_file = $_[0];     # save in global
-        
-	my($filepath, $appath, $psi) = ($ide_loc_file);
-
-	foreach $psi (values(%Process)) {
-		if ($psi->processSignature() eq $app) {
-			$appath = $psi->processAppSpec();
-			_save_appath($filepath, $appath);
-			last;
-		}
-	}
-
-	if (!$appath || !-x $appath) {
-		$appath = _read_appath($filepath);
-	}
-	
-	if (!$appath || ! -x $appath)
-	{
-		# make sure that MacPerl is a front process
-		#ActivateApplication('McPL');
-		MacPerl::Answer("Please locate the CodeWarrior application.", "OK");
-		
-		# prompt user for the file name, and store it
-		my $macFile = StandardGetFile( 0, "APPL");
-		if ( $macFile->sfGood() )
-		{
-			$appath = $macFile->sfFile();
-		}
-		else
-		{
-			die "Operation canceled\n";
-		}
-	
-#		if (eval {require Mac::Navigation}) {
-#			my($options, $nav);
-#			Mac::Navigation->import();
-#			$options = NavGetDefaultDialogOptions();
-#			$options->message('Where is CodeWarrior IDE?');
-#			$options->windowTitle('Find CodeWarrior IDE');
-#			$nav = NavChooseObject($Application{$app}, $options);
-#			die "CodeWarrior IDE not found.\n" if (!$nav || !$nav->file(1));
-#			$appath = $nav->file(1);
-#		} else {
-#			local(*D);
-#			my $cwd = `pwd`;
-#			$appath = _get_folder(
-#                               'Where is the CW IDE folder?',
-#				dirname($Application{$app})
-#			);
-#			die "CodeWarrior IDE not found.\n" if !$appath;
-#			opendir(D, $appath) or die $!;
-#			chdir($appath);
-#			foreach my $file (sort readdir (D)) {
-#				my(@app) = MacPerl::GetFileInfo($file);
-#				if ($app[0] && $app[1] &&
-#					$app[1] eq 'APPL' && $app[0] eq $app
-#				) {
-#					$appath .= $file;
-#					last;
-#				}
-#			}
-#			chomp($cwd);
-#			chdir($cwd);
-#		}
-		_save_appath($filepath, $appath);
-	}
-
-	my($lp) = LaunchParam->new(
-		launchAppSpec => $appath,
-		launchControlFlags => launchContinue() + launchNoFileFlags()
-	);
-	
-	unless (LaunchApplication($lp)) {
-		unlink($filepath);
-		die $^E;
-	}
-	
-	# wait for CodeWarrior to show up in the list of processes
-	while (!_appIsRunning('CWIE'))
-	{
-		WaitNextEvent();
-	}
-
-	# wait for CodeWarrior to come to the front
-	while (!_appIsFrontmost('CWIE'))
-	{
-		WaitNextEvent();
-	}
-}
-
-=pod
-
-=item getCodeWarriorPath()
-
-Returns a file path relative to the CodeWarrior folder
-
-=cut
-
-sub getCodeWarriorPath($)
-{
-    my($subfolder)=@_;
-    
-    my($app_path) = _read_appath($ide_loc_file);
-    if ($app_path eq "") { die "Error: Failed to get CodeWarrior IDE path\n"; }
-    
-    my($codewarrior_root) = $app_path;
-    $codewarrior_root =~ s/[^:]*$//;
-    return ($codewarrior_root . $subfolder);
-}
-
-
-=pod
-
-=item getCodeWarriorIDEName()
-
-Returns the name of the CodeWarrior application
-
-=cut
-
-sub getCodeWarriorIDEName()
-{
-    my($subfolder)=@_;
-
-    my($app_path) = _read_appath($ide_loc_file);
-    if ($app_path eq "") { die "Error: Failed to get CodeWarrior IDE path\n"; }
-
-    my(@codewarrior_path) = split(/:/, $app_path);
-    return pop(@codewarrior_path);
-}
-
-
-=pod
-
-=item quit()
-
-Quits CodeWarrior.
-
-=cut
-
-sub quit() {
-
-	$last_project_built = "";
-	$last_project_was_closed = 0;
-
-	my($evt) = do_event(qw/aevt quit/, $app);
-}
-
-
-sub _build ($;$) {
-	my($evt);
-	if ($_[1]) {
-		my($prm) =
-			q"'----':obj {form:name, want:type(TRGT), seld:TEXT(@), from:" .
-			AEPrint($_[0]) . '}';
-		$evt = do_event(qw/CWIE MAKE/, $app, $prm, $_[1]);
-	} else {
-		my($prm) = q"'----':" . AEPrint($_[0]);
-		$evt = do_event(qw/CWIE MAKE/, $app, $prm);
-	}
-}
-
-sub _remove_object ($;$) {
-	my($evt);
-	if ($_[1]) {
-		my($prm) =
-			q"'----':obj {form:name, want:type(TRGT), seld:TEXT(@), from:" .
-			AEPrint($_[0]) . '}';
-		$evt = do_event(qw/CWIE RMOB/, $app, $prm, $_[1]);
-	} else {
-		my($prm) = q"'----':" . AEPrint($_[0]);
-		$evt = do_event(qw/CWIE RMOB/, $app, $prm);
-	}
-}
-
-sub _open_file ($) {
-	my($prm) =
-		q"'----':obj {form:name, want:type(alis), " .
-		q"seld:TEXT(@), from:'null'()}";
-
-	do_event(qw/aevt odoc/, $app, $prm, $_[0]);
-}
-
-sub import_project ($$) {
-	my($xml_file, $project_path) = @_;
-	
-	my($prm) = "kocl:type(PRJD), rtyp:TEXT(@), data:TEXT(@), &subj:'null'()";
-	
-	my($evt) = do_event(qw/core crel/, $app, $prm, $project_path, $xml_file);    
-	my($result) = _get_event_result($evt);
-	
-	if ($result eq "") {
-		_close(_get_project($project_path));
-	}
-	return $result;
-}
-
-sub export_project ($$) {
-	my($project_path, $xml_out_path) = @_;
-	my($p, $project_was_closed);
-	
-	$project_was_closed = 0;
-	while (1) {
-		$p = _get_project($project_path);
-		if (!$p) {
-			if ($project_was_closed) {
-				print "### Error - request for project document failed after opening\n";
-				die "### possibly CW bug: be sure to close your Find window\n";
-}
-			$project_was_closed = 1;
-			_open_file($project_path);
-		} else {
-			last;
-		}
-	}
-
-    # avoid problems with the Project Messages window
-    _close_named_window("Project Messages");
-    
-	my($prm) =
-		q"'----':obj {form:indx, want:type(PRJD), " .
-		q"seld:1, from:'null'()}, kfil:TEXT(@)";
-
-	my($evt) = do_event(qw/CWIE EXPT/, $app, $prm, $xml_out_path);    
-	
-	if ($project_was_closed) {
-		$p = _get_project($project_path);
-		_close($p);
-	}
-	
-	return _get_event_result($evt);
-}
-
-sub _doc_named ($) {
-	my($prm) =
-		q"'----':obj {form:test, want:type(docu), from:'null'(), " .
-		q"seld:cmpd{relo:'=   ', 'obj1':obj {form:prop, want:type" .
-		q"(prop), seld:type(pnam), from:'exmn'()}, 'obj2':TEXT(@)}}";
-
-	my($evt) = do_event(qw/core getd/, $app, $prm, $_[0]);
-	return($evt->{REPLY} eq 'aevt\ansr{}' ? undef : $evt);
-}
-
-sub _full_path ($) {
-	my($obj) = $_[0];
-	my($prm) =
-		q"'----':obj {form:prop, want:type(prop), seld:type(FILE), " .
-		q"from:" . AEPrint($_[0]) . q"}, rtyp:type(TEXT)";
-	my($evt) = do_event(qw/core getd/, $app, $prm);
-
-	return MacPerl::MakePath(
-		MacUnpack('fss ', (
-			AEGetParamDesc($evt->{REP}, keyDirectObject()))->data()->get()
-		)
-	);
-}
-
-sub _save_errors_window ($) {
-	my($prm) = 
-		q"'----':obj {form:name, want:type(alis), seld:TEXT(@), from:'null'()}";
-	do_event(qw/MMPR SvMs/, $app, $prm, $_[0]);
-}
-
-
-sub _close_errors_window () {
-    return _close_named_window('Errors & Warnings');
-}
-
-
-sub _close_named_window ($) {
-    my($window_name) = @_;
-    
-	my($prm) =
-		q"'----':obj {form:name, want:type(cwin), " .
-		q"seld:TEXT(@), from:'null'()}";
-
-	my($evt) = do_event(qw/core clos/, $app, $prm, $window_name);
-	return($evt->{REPLY} eq 'aevt\ansr{}' ? 1 : 0);
-}
-
-sub _close () {
-	my($prm) = q"'----':" . AEPrint($_[0]);
-	do_event(qw/core clos/, $app, $prm);
-}
-
-sub _get_dobj ($) {
-	return(AEGetParamDesc($_[0]->{REP}, keyDirectObject()));
-}
-
-sub _get_folder ($$) {
-    require 'GUSI.ph';
-    my($prompt, $default) = @_;
-    MacPerl::Choose(
-        GUSI::AF_FILE(), 0, $prompt, '',
-        GUSI::CHOOSE_DIR() + ($default ? &GUSI::CHOOSE_DEFAULT : 0),
-        $default
-    );
-}
-
-sub _get_event_result ($)
-{
-    my($evt) = @_;
-
-    my($result) = $evt->{ERROR};
-    
-    if ( $result eq "" && $evt->{ERRNO} != 0 )
-    {
-        $result = "unknown error (".$evt->{ERRNO}.")";
-    }
-    
-    return $result;
-}
-
-
-sub _save_appath ($$) {
-
-	my($cwd) = cwd();	# remember the current working dir
-	chdir($scriptDir);	# change dir to the script dir
-
-	local(*F);
-	open(F, '>' . $_[0]) or die $!;
-	print F $_[1];
-	close(F);
-		
-	chdir($cwd);		# restore the cwd
-}
-
-sub _read_appath ($) {
-
-	my($filepath) = @_;
-
-	my($cwd) = cwd();	# remember the current working dir
-	chdir($scriptDir);	# change dir to the script dir
-	
-	if (! -e $filepath) {
-		return "";
-	}
-
-	local(*F);
-	open(F, $filepath);
-	my($appath) = <F>;
-	close(F);
-		
-	chdir($cwd);		# restore the cwd
-	return($appath);
-}
-
-
-sub _test ($) {
-	activate($ide_loc_file);
-	my($path) = $_[0];
-	build_project(
-	  "${path}modules:xml:macbuild:XML.mcp", '',
-	  "${path}build:mac:Mozilla.BuildLog.part"
-	);
-}
-
-1;
-
-=pod
-
-=back
-
-=head1 HISTORY
-
-=over 4
-
-=item v1.02, September 23, 1998
-
-Made fixes in finding and saving location of CodeWarrior IDE.
-
-=item v1.01, June 1, 1998
-
-Made fixes to C<chdir()> in C<activate()>, made C<activate()> more robust 
-in finding CodeWarrior IDE, added global variable to NOT switch to IDE
-for each sent event, a few other fixes.
-
-=item v1.00, May 30, 1998
-
-First shot
-
-=back
-
-
-=head1 AUTHORS
-
-Chris Nandor F<E<lt>pudge@pobox.comE<gt>>, and the author of the
-original I<CodeWarriorLib>, Scott Collins F<E<lt>scc@netscape.comE<gt>>.
-
-=head1 SEE ALSO
-
-BuildProject L<Moz>.
-
-=head1 COPYRIGHT
-
-The contents of this file are subject to the Netscape Public
-License Version 1.1 (the "License"); you may not use this file
-except in compliance with the License. You may obtain a copy of
-the License at http://www.mozilla.org/NPL/
-
-Software distributed under the License is distributed on an "AS
-IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-implied. See the License for the specific language governing
-rights and limitations under the License.
-
-The Original Code is Mozilla Communicator client code, released
-March 31, 1998.
-
-The Initial Developer of the Original Code is Netscape
-Communications Corporation. Portions created by Netscape are
-Copyright (C) 1998-1999 Netscape Communications Corporation. All
-Rights Reserved.
-
-Contributor(s): 
-
-=cut

mozilla/build/mac/build_scripts/Moz/Jar.pm

@@ -1,573 +0,0 @@
-#!perl -w
-package Moz::Jar;
-
-#
-# Module for creating jar files, either using a jar manifest, or
-# simply jarring up folders on disk.
-#
-
-require 5.004;
-require Exporter;
-
-use strict;
-use Archive::Zip;
-use File::Path;
-
-use Mac::Files;
-
-use Moz::Moz;
-
-use vars qw( @ISA @EXPORT );
-
-@ISA        = qw(Exporter);
-@EXPORT     = qw(
-                    CreateJarFileFromDirectory
-                    CreateJarFromManifest
-                    WriteOutJarFiles
-                    SanityCheckJarOptions
-                );
-
-
-#-------------------------------------------------------------------------------
-# Add the contents of a directory to the zip file
-#
-#-------------------------------------------------------------------------------
-sub _addDirToJar($$$$)
-{
-    my($dir, $jar_root, $zip, $compress) = @_;
-
-    opendir(DIR, $dir) or die "Error: Cannot open dir $dir\n";
-    my @files = readdir(DIR);
-    closedir DIR;
-    
-    my $unix_jar_root = $jar_root;
-    $unix_jar_root =~ s|:|/|g;       # colon to slash conversion
-    
-    my $file;
-    
-    foreach $file (@files)
-    {        
-        my $filepath = $dir.":".$file;
-        
-        if (-d $filepath)
-        {
-            print "Adding files to jar from $filepath\n";            
-            _addDirToJar($filepath, $jar_root, $zip, $compress);
-        }
-        else
-        {
-            my $member = Archive::Zip::Member->newFromFile($filepath);
-            die "Error: Failed to create zip file member $filepath\n" unless $member;
-            
-            my $unixName = $filepath;
-            $unixName =~ s|:|/|g;               # colon to slash conversion
-            $unixName =~ s|^$unix_jar_root||;   # relativise
-            
-            $member->fileName($unixName);
-            
-            # print "Adding $file as $unixName\n";
-            
-            if ($compress) {
-                $member->desiredCompressionMethod(Archive::Zip::COMPRESSION_DEFLATED);            
-            } else {
-                $member->desiredCompressionMethod(Archive::Zip::COMPRESSION_STORED);
-            }
-            
-            $zip->addMember($member);
-        }
-    }
-}
-
-#-------------------------------------------------------------------------------
-# Add the contents of a directory to the zip file
-#
-#-------------------------------------------------------------------------------
-
-sub CreateJarFileFromDirectory($$$)
-{
-    my($srcdir, $jarpath, $compress) = @_;
-
-    my $zip = Archive::Zip->new();
-
-    _addDirToJar($srcdir, $srcdir, $zip, $compress);
-
-    print "Saving zip file...\n";
-    my $status = $zip->writeToFileNamed($jarpath);
-    if ($status == 0) {
-        print "Zipping completed successfully\n";
-    } else {
-        print "Error saving zip file\n";
-    }
-    
-    # set the file type/creator to something reasonable
-    MacPerl::SetFileInfo("ZIP ", "ZIP ", $jarpath);
-}
-
-
-#-------------------------------------------------------------------------------
-# printZipContents
-# 
-#-------------------------------------------------------------------------------
-sub printZipContents($)
-{
-    my($zip) = @_;
-
-    my(@members) = $zip->memberNames();
-    
-    print "Zip contains:\n";
-    
-    my($member);
-    foreach $member (@members)
-    {
-        print "  $member\n";
-    }
-}
-
-
-#-------------------------------------------------------------------------------
-# safeSaveJarFile
-# 
-# Archive::Zip has a problem where you cannot save a zip file on top of
-# an existing zip file that it has open, because it holds references
-# into that zip. So we have to save to a temp file, then do a swap.
-# 
-# Note that the zip will become invalid after this operation.
-# If you want to do further operations on it, you'll have to reread it.
-#-------------------------------------------------------------------------------
-sub safeSaveJarFile($$)
-{
-    my($zip, $full_dest_path) = @_;
-    
-    my($temp_file_name) = $full_dest_path."_temp";
-
-    ($zip->writeToFileNamed($temp_file_name) == Archive::Zip::AZ_OK) || die "Error: died writing jar to temp file $temp_file_name\n";
-    
-    unlink $full_dest_path;
-    
-    (rename $temp_file_name, $full_dest_path) || die "Error: Failed to rename $temp_file_name\n";
-    
-    MacPerl::SetFileInfo("ZIP ", "ZIP ", $full_dest_path);
-}
-
-
-#-------------------------------------------------------------------------------
-# addToJarFile
-# 
-# Add a file to a jar file
-#
-# Parameters:
-#   1. Jar ID. Unix path of jar file inside chrome.
-#   2. Abs path to jar.mn file (i.e. source)    (mac breaks)
-#   3. File source, relative to jar.mn path     (mac breaks)
-#   4. Abs path to the resulting .jar file      (mac breaks)
-#   5. Relative file path within the jar        (unix breaks)
-#   6. Reference to hash of jar files
-#
-#-------------------------------------------------------------------------------
-
-sub addToJarFile($$$$$$$)
-{
-    my($jar_id, $jar_man_dir, $file_src, $jar_path, $file_jar_path, $override, $jars) = @_;
-
-    # print "addToJarFile with:\n  $jar_man_dir\n  $file_src\n  $jar_path\n  $file_jar_path\n";
-
-    unless ($jar_path =~ m/(.+:)([^:]+)$/) { die "Error: Bad jar path $jar_path\n"; }
-    
-    my($target_dir) = $1;
-    my($jar_name) = $2;
-
-    $target_dir =~ s/[^:]+$//;
-    
-    # print "¥ $target_dir $jar_name\n";
-
-    # find the source file
-    my($src) = $jar_man_dir.":".$file_src;
-    if ((!-e $src) && ($file_src =~ m/.+:([^:]+)$/))    # src does not exist. Fall back to looking for src in jar.mn dir
-    {
-        $file_src = $1;
-        $src = $jar_man_dir.":".$file_src;
-        
-        if (!-e $src) {
-            die "Error: Can't find chrome file $src\n";
-        }
-    }
-    
-    if ($main::options{chrome_jars})
-    {
-        my($zip) = $jars->{$jar_id};
-        unless ($zip) { die "Error: Can't find Zip entry for $jar_id\n"; }
-        
-        # print "Adding $file_src to jar file $jar_path at $file_jar_path\n";
-        my($member) = Archive::Zip::Member->newFromFile($src);
-        unless ($member) { die "Error: Failed to create zip file member $src\n"; }
-
-        $member->fileName($file_jar_path);    
-    
-        my($compress) = 1;
-        if ($compress) {
-            $member->desiredCompressionMethod(Archive::Zip::COMPRESSION_DEFLATED);            
-            $member->desiredCompressionLevel(Archive::Zip::COMPRESSION_LEVEL_DEFAULT);   # defaults to 6
-        } else {
-            $member->desiredCompressionMethod(Archive::Zip::COMPRESSION_STORED);
-        }
-
-        my($old_member) = $zip->memberNamed($file_jar_path);
-        
-        if ($override)
-        {
-            if ($old_member)
-            {
-                # print "Overriding $file_jar_path in jar file $jar_id\n";
-                # need to compare mod dates or use the + here
-                $zip->removeMember($old_member);
-            }
-        
-            $zip->addMember($member);
-        }
-        else
-        {
-            if ($old_member)
-            {
-                #compare dates here
-                my($member_moddate) = $old_member->lastModTime();
-                my($file_moddate) = GetFileModDate($src);
-            
-                if ($file_moddate > $member_moddate)
-                {
-                    print "Updating older file $file_jar_path in $jar_id\n";
-                    $zip->removeMember($old_member);
-                    $zip->addMember($member);
-                }
-                else
-                {
-                    print "File $file_jar_path in $jar_id is more recent. Not updating.\n";
-                }
-            }
-            else
-            {
-                $zip->addMember($member);
-            }
-        }
-    }
-    
-    if ($main::options{chrome_files})  # we install raw files too
-    {
-        my($rel_path) = $file_jar_path;
-        $rel_path =~ s|/|:|g;       # slash to colons
-        
-        my($dir_name) = $jar_name;
-        $dir_name =~ s/\.jar$//;
-        
-        my($dst) = $target_dir.$dir_name.":".$rel_path;
-                
-        # print "Aliassing $src\n to\n$dst\n";        
-        if ($override)
-        {
-            unlink $dst;
-        MakeAlias($src, $dst);      # don't check errors, otherwise we fail on replacement
-    }
-        else
-        {
-            if (-e $dst)
-            {
-                #compare dates here
-                my($dst_moddate) = GetFileModDate($dst);
-                my($file_moddate) = GetFileModDate($src);
-            
-                if ($file_moddate > $dst_moddate)
-                {
-                    print "Updating older file $rel_path in $dir_name\n";
-                    unlink $dst;
-                    MakeAlias($src, $dst);
-                }
-                else
-                {
-                    print "File $file_jar_path in $jar_id is more recent. Not updating.\n";
-                }
-            
-            }
-            else
-            {
-                MakeAlias($src, $dst);
-            }
-        }
-        
-    }
-}
-
-
-#-------------------------------------------------------------------------------
-# setupJarFile
-# 
-# setup a zip for writing
-#-------------------------------------------------------------------------------
-
-sub setupJarFile($$$)
-{
-    my($jar_id, $dest_path, $jar_hash) = @_;
-
-    # print "Creating jar file $jar_id at $jar_path\n";
-    
-    my($jar_file) = $jar_id;
-    $jar_file =~ s|/|:|g;           # slash to colons
-    my($full_jar_path) = full_path_to($dest_path.":".$jar_file);
-
-    if ($main::options{chrome_jars})
-    {
-        my($zip) = $jar_hash->{$jar_id};
-        if (!$zip)      # if we haven't made it already, do so
-        {
-	        my($zip) = Archive::Zip->new();
-	        $jar_hash->{$jar_id} = $zip;
-
-            # does the jar file exist already? If so, read it in
-            if (-e $full_jar_path)
-            {
-                print "Reading in jar file $jar_id\n";
-                if ($zip->read($full_jar_path) != Archive::Zip::AZ_OK) { die "Error: Failed to re-read $full_jar_path\n"; }
-                
-                # printZipContents($zip);
-            }
-
-        }
-    }
-    else
-    {
-        # installing files.
-        # nothing to do. MakeAlias creates dirs as needed.
-
-	    # add this jar to the list
-	    $jar_hash->{$jar_id} = 1;
-    }
-}
-
-
-#-------------------------------------------------------------------------------
-# closeJarFile
-# 
-# We're done with this jar file _for this jar.mn_. We may add more entries
-# to it later, so keep it open in the hash.
-#-------------------------------------------------------------------------------
-sub closeJarFile($$)
-{
-    my($jar_path, $jar_hash) = @_;
-
-    # print "Closing jar file $jar_path\n";
-
-    if ($main::options{chrome_jars})
-    {
-    
-    }
-    else
-    {
-        # installing files.
-        # nothing to do
-    }
-}
-
-
-#-------------------------------------------------------------------------------
-# WriteOutJarFiles
-# 
-# Now we dump out the jars
-#-------------------------------------------------------------------------------
-sub WriteOutJarFiles($$)
-{
-    my($chrome_dir, $jars) = @_;
-
-    unless ($main::options{chrome_jars}) { return; }
-    
-    my($full_chrome_path) = full_path_to($chrome_dir);
-
-    my($key);
-    foreach $key (keys %$jars)
-    {
-        my($zip) = $jars->{$key};
-        
-        my($rel_path) = $key;
-        $rel_path =~ s/\//:/g;
-        
-        my($output_path) = $full_chrome_path.":".$rel_path;
-        
-        print "Writing zip file $key to $output_path\n";
-
-        # ensure the target dirs exist
-        my($path) = $output_path;
-        $path =~ s/[^:]+$//;
-        mkpath($path);
-        
-        # unlink $output_path;        # remove any existing jar
-        safeSaveJarFile($zip, $output_path);
-        # $zip is invalid after this operation, so nuke it here
-        $jars->{$key} = 0;
-    }
-}
-
-
-#-------------------------------------------------------------------------------
-# registerChromePackage
-# 
-# Enter a chrome package into the installed-chrome.txt file
-#-------------------------------------------------------------------------------
-sub registerChromePackage($$$$$$)
-{
-    my($jar_file, $file_path, $chrome_dir, $jar_hash, $chrome_type, $pkg_name) = @_;
-
-    my($manifest_subdir) = $jar_file;
-    $manifest_subdir =~ s/:/\//g;
-    
-    my($chrome_entry);
-    
-    if ($main::options{use_jars}) {
-        $chrome_entry = "$chrome_type,install,url,jar:resource:/chrome/$manifest_subdir!/$chrome_type/$pkg_name";
-    } else {
-        $manifest_subdir =~ s/\.jar$//;
-        $chrome_entry = "$chrome_type,install,url,resource:/chrome/$manifest_subdir/$chrome_type/$pkg_name";
-    }
-
-    # print "Entering $chrome_entry in installed-chrome.txt\n";
-    
-    # ensure chrome_dir exists
-    mkpath($chrome_dir);
-    
-    my($inst_chrome) = ${chrome_dir}.":installed-chrome.txt";
-    
-    if (open(CHROMEFILE, "<$inst_chrome")) {
-        while (<CHROMEFILE>) {
-            chomp;
-            if ($_ eq $chrome_entry) {
-                # $chrome_entry already appears in installed-chrome.txt file
-                # just update the mod date
-                my $now = time;
-                utime($now, $now, $inst_chrome) || die "Error: Couldn't touch $inst_chrome";
-                print "+++ updating chrome $inst_chrome\n+++\t\t$chrome_entry\n";
-                close(CHROMEFILE) || die "Error: can't close $inst_chrome: $!";
-                return 0;
-            }
-        }
-        close(CHROMEFILE) || die "Error: can't close $inst_chrome: $!";
-    }
-    open(CHROMEFILE, ">>${inst_chrome}") || die "Error: Failed to open $inst_chrome\n";
-    print(CHROMEFILE "${chrome_entry}\n");
-    close(CHROMEFILE) || die "Error: Failed to close $inst_chrome\n";
-    print "+++ adding chrome $inst_chrome\n+++\t\t$chrome_entry\n";
-}
-
-#-------------------------------------------------------------------------------
-# Create or add to a jar file from a jar.mn file.
-# Both arguments are relative to the mozilla root dir.
-#
-#
-#-------------------------------------------------------------------------------
-sub CreateJarFromManifest($$$)
-{
-    my($jar_man_path, $dest_path, $jars) = @_;
-    
-    if ($main::options{chrome_jars}) {
-        print "Jarring from $jar_man_path\n";
-    }
-    if ($main::options{chrome_files}) {
-        print "Installing files from $jar_man_path\n";
-    }
-
-    $jar_man_path = full_path_to($jar_man_path);
-    $dest_path = full_path_to($dest_path);
-
-    # if the jars hash is empty, nuke installed-chrome.txt
-    if (! scalar(%$jars))
-    {
-        print "Nuking installed-chrome.txt\n";
-	    my($installed_chrome) = $dest_path.":installed-chrome.txt";
-	    # unlink $installed_chrome;
-    }
-    
-    my $jar_man_dir = "";
-    my $jar_man_file = "";
-    
-    if ($jar_man_path =~ /(.+):([^:]+)$/)
-    {
-        $jar_man_dir = $1;      # no trailing :
-        $jar_man_file = $2;
-    }
-
-    # Keep a hash of jar files, keyed on relative jar path (e.g. "packages/core.jar")
-    # Entries are open Archive::Zips (if zipping), and installed-chrome entries.
-    
-    my($jar_id) = "";       # Current foo/bar.jar from jar.mn file
-    my($jar_file) = "";     # relative path to jar file (from $dest_path), with mac separators
-    my($full_jar_path);
-    
-    open(FILE, "<$jar_man_path") || die "Error: could not open \"$jar_man_path\": $!";
-    while (<FILE>)
-    {
-        my($line) = $_;
-        chomp($line);
-        
-        # print "$line\n";
-        
-        if ($line =~ /^\s*\#.*$/) {     # skip comments
-            next;
-        }
-        
-        if ($line =~/^([\w\d.\-\_\\\/]+)\:\s*$/)                                  # line start jar file entries
-        {
-            $jar_id = $1;
-            $jar_file = $jar_id;
-            $jar_file =~ s|/|:|g;           # slash to colons
-            $full_jar_path = $dest_path.":".$jar_file;
-                        
-            setupJarFile($jar_id, $dest_path, $jars);
-
-        }
-        elsif ($line =~ /^(\+?)\s+([\w\d.\-\_\\\/]+)\s*(\([\w\d.\-\_\\\/]+\))?$\s*/)     # jar file entry
-        {
-            my($override) = ($1 eq "+");
-            my($file_dest) = $2;
-            my($file_src) = $3;
- 
-            if ($file_src) {  
-                $file_src = substr($file_src, 1, -1);      #strip the ()
-            } else {
-                $file_src = $file_dest;
-            }
-            
-            $file_src =~ s|/|:|g;
-            
-            if ($jar_file ne "")    # if jar is open, add to jar
-            {
-                if ($file_dest =~ /([\w\d.\-\_]+)\/([\w\d.\-\_\\\/]+)contents.rdf/)
-                {
-                    my $chrome_type = $1;
-                    my $pkg_name = $2;
-                    registerChromePackage($jar_file, $file_dest, $dest_path, $jars, $chrome_type, $pkg_name);
-                }
-                
-                addToJarFile($jar_id, $jar_man_dir, $file_src, $full_jar_path, $file_dest, $override, $jars);
-            }
-            else
-            {
-                die "Error: bad jar.mn format at $line\n";
-            }
-        }
-        elsif ($line =~ /^\s*$/ )                                               # blank line
-        {
-            if ($jar_file ne "")    #if a jar file is open, close it
-            {
-                closeJarFile($full_jar_path, $jars);
-                
-                $jar_file = "";
-                $full_jar_path = "";
-            }
-        }
-    }
-    
-    close(FILE);
-
-    if ($jar_file ne "")    #if a jar file is open, close it
-    {
-        closeJarFile($full_jar_path, $jars);
-    }
-
-}
-
-1;

mozilla/build/mac/build_scripts/Moz/MacCVS.pm

@@ -1,228 +0,0 @@
-#!perl -w
-package Moz::MacCVS;
-
-# package Mac::Apps::MacCVS; this should really be the name of the package
-# but due to our directory hierarchy in mozilla, I am not doing it
-
-require 5.004;
-require Exporter;
-
-use strict;
-use Exporter;
-
-use vars qw($VERSION @ISA @EXPORT);
-
-use Cwd;
-
-use File::Basename;
-
-use Mac::StandardFile;
-use Mac::AppleEvents;
-use Mac::AppleEvents::Simple;
-
-@ISA        = qw(Exporter);
-@EXPORT     = qw(new describe checkout update);
-$VERSION = "1.00";
-
-# If you want to understand the gobbldeygook that's used to build Apple Events,
-# you should start by reading the AEGizmos documentation.
-
-
-# Architecture:
-# cvs session object:
-# name - session name
-# session_file - session file
-# 
-# 
-
-my($last_error) = 0;
-my($gAppSig)    = 'Mcvs';   # MacCVS Pro
-
-#
-# utility routines
-#
-
-
-sub _checkForEventError($)
-{
-  my($evt) = @_;
-
-  if ($evt->{ERRNO} != 0)
-  {
-    print STDERR "Error. Script returned '$evt->{ERROR} (error $evt->{ERRNO})\n";
-    $last_error = $evt->{ERRNO};
-    return 0;
-  }
-  
-  return 1; # success
-}
-
-
-#
-# Session object methods
-#
-
-sub new
-{
-  my ( $proto, $session_file) = @_;
-  my $class = ref($proto) || $proto;
-  my $self = {};
-
-  if ( defined($session_file) && ( -e $session_file) )
-  {
-    $self->{"name"} = basename( $session_file );
-    $self->{"session_file"} = $session_file;
-    bless $self, $class;
-    return $self;
-  }
-  else
-  {
-    print STDERR "MacCVS->new cvs file < $session_file > does not exist\n";
-    return;
-  }
-}
-
-# makes sure that the session is open
-# assertSessionOpen()
-# returns 1 on success
-sub assertSessionOpen()
-{
-  my ($self) = shift;
-
-  $last_error = 0;
-
-  my($prm) =
-    q"'----':obj {form:name, want:type(alis), seld:TEXT(@), from:'null'()}";
-
-  my($evt) = do_event(qw/aevt odoc/, $gAppSig, $prm, $self->{session_file});
-  return _checkForEventError($evt);
-}
-
-# prints the cvs object, used mostly for debugging
-sub describe
-{
-  my($self) = shift;
-  $last_error = 0;
-  print "MacCVS:: name: ", $self->{name}, " session file: ", $self->{session_file}, "\n";
-}
-
-# checkout( self, module, revision, date)
-# MacCVS checkout command
-# returns 1 on success.
-sub checkout()
-{
-  my($self, $module, $revision, $date ) = @_;
-  unless( defined ($module) ) { $module = ""; } # get rid of the pesky undefined warnings
-  unless( defined ($revision) ) { $revision = ""; }
-  unless( defined ($date) ) { $date = ""; }
-
-  $last_error = 0;
-    
-  $self->assertSessionOpen() || die "Error: failed to open MacCVS session file at $self->{session_file}\n";
-  
-  my($revstring) = ($revision ne "") ? $revision : "(none)";
-  my($datestring) = ($date ne "") ? $date : "(none)";
-  
-  print "Checking out $module with revision $revstring, date $datestring\n";
-
-  my($prm) =
-    q"'----':obj {form:name, want:type(docu), seld:TEXT(@), from:'null'()}, ".
-    q"modl:'TEXT'(@), tagr:'TEXT'(@), tagd:'TEXT'(@) ";
-  
-  my($evt) = do_event(qw/MCvs cout/, $gAppSig, $prm, $self->{name}, $module, $revision, $date);
-  return _checkForEventError($evt);
-}
-
-
-# update( self, branch tag, list of paths)
-# MacCVS udate command
-# returns 1 on success.
-# NOTE: MacCVS Pro does not correctly support this stuff yet (as of version 2.7d5).
-sub update()
-{
-  my($self, $branch, $paths ) = @_;
-
-  $last_error = 0;
-    
-  $self->assertSessionOpen() || die "Error: failed to open MacCVS session file at $self->{session_file}\n";
-
-  if ($branch eq "HEAD") {
-    $branch = "";
-  }
-  
-  my($paths_list) = "";
-  
-  my($path);
-  foreach $path (@$paths)
-  {
-    if ($paths_list ne "") {
-      $paths_list = $paths_list.", ";
-    }
-    
-    $paths_list = $paths_list."Ò".$path."Ó";
-  }
-    
-  my($prm) =
-    q"'----':obj {form:name, want:type(docu), seld:TEXT(@), from:'null'()}, ".
-    q"tagr:'TEXT'(@), tFls:[";
-
-  $prm = $prm.$paths_list."]";
-    
-  my($evt) = do_event(qw/MCvs updt/, $gAppSig, $prm, $self->{name}, $branch);
-  return _checkForEventError($evt);
-};
-
-
-sub getLastError()
-{
-  return $last_error;
-}
-
-1;
-=pod
-
-=head1 NAME
-
-MacCVS - Interface to MacCVS
-
-=head1 SYNOPSIS
-
-  use MacCVS;
-  $session = MacCVS->new( <session_file_path>) || die "cannot create session";
-  $session->checkout([module] [revision] [date]) || die "Could not check out";
-    
-=head1 DESCRIPTION
-
-This is a MacCVS interface for talking to MacCVS Pro client.
-MacCVSSession is the class used to manipulate the session
-
-=item new
-  MacCVS->new( <cvs session file path>);
-  
-  Creates a new session. Returns undef on failure.
-
-=item checkout( <module> [revision] [date] )
-
-  cvs checkout command. Revision and date are optional
-  returns 0 on failure
-  
-=cut
-
-=head1 SEE ALSO
-
-=over
-
-=item MacCVS Home Page
-
-http://www.maccvs.org/
-
-=back 
-
-=head1 AUTHORS
-
-Aleks Totic atotic@netscape.com
-Simon Fraser sfraser@netscape.com
-
-=cut
-
-__END__

mozilla/build/mac/build_scripts/Moz/Moz.pm

@@ -1,603 +0,0 @@
-=head1 NAME
-
-B<Moz> - routines for automating CodeWarrior builds, and some extra-curricular
-activities related to building Mozilla
-
-=head1 SYNOPSIS
-
-    use Moz;
-
-    OpenErrorLog(":::BuildLog");
-    StopForErrors();
-
-		$Moz::QUIET = 1;
-		InstallFromManifest(":projects:MANIFEST", $dist_dir);
-
-    BuildProjectClean(":projects:SomeProject.mcp", "SomeTarget");
-    MakeAlias(":projects:SomeProject.shlb", $dist_dir);
-
-    DontStopForErrors();
-
-    BuildProject(":projects:SomeOtherProject.mcp", "SomeTarget");
-
-=head1 DESCRIPTION
-
-B<Moz> comprises the routines needed to slap CodeWarrior around, force it
-to build a sequence of projects, report the results, and a few other things.
-This module should only contain functions that are generic to any build,
-not just the Mozilla build.
-
-=cut
-
-
-package			Moz::Moz;
-require			Exporter;
-
-use Cwd;
-
-use File::Copy;
-use File::Path;
-use File::Basename;
-
-use Mac::Types;
-use Mac::Events;
-use Mac::Processes;
-
-use ExtUtils::Manifest 'maniread';
-
-use Moz::CodeWarriorLib;
-
-@ISA				= qw(Exporter);
-
-@EXPORT			= qw( LaunchCodeWarrior
-                  GetCodeWarriorRelativePath
-                  current_directory
-                  full_path_to
-                  DoBuildProject
-                  ImportXMLProject
-                  ExportProjectToXML
-                  OpenErrorLog
-                  MakeAlias
-                  GetFileModDate
-                  StopForErrors
-                  DontStopForErrors
-                  InstallFromManifest
-                  InstallResources
-                  RedirectOutputToFile
-                  Delay
-                  ActivateApplication
-                  IsProcessRunning);
-
-@EXPORT_OK	= qw(CloseErrorLog QUIET);
-
-
-sub current_directory()
-	{
-		my $current_directory = cwd();
-		chop($current_directory) if ( $current_directory =~ m/:$/ );
-		return $current_directory;
-	}
-
-sub full_path_to($)
-	{
-		my ($path) = @_;
-		if ( $path =~ m/^[^:]+$/ )
-			{
-				$path = ":" . $path;
-			}
-
-		if ( $path =~ m/^:/ )
-			{
-				$path = current_directory() . $path;
-			}
-
-		return $path;
-	}
-
-$logging								= 0;
-$recent_errors_file			= "";
-$stop_on_1st_error			= 1;
-$QUIET									= 0;
-
-
-
-=head2 Logging all the errors and warnings - C<OpenErrorLog($log_file)>, C<CloseErrorLog()>
-
-The warnings and errors generated in the course of building projects can be logged to a file.
-Tinderbox uses this facility to show why a remote build failed.
-
-Logging is off by default.
-  Start logging at any point in your build process with C<OpenErrorLog($log_file)>.
-  Stop with C<CloseErrorLog()>.
-  You never need to close the log explicitly, unless you want to just log a couple of projects in the middle of a big list.
-  C<CloseErrorLog()> is not exported by default. 
-
-=cut
-
-sub CloseErrorLog()
-	{
-		if ( $logging )
-			{
-				close(ERROR_LOG);
-				$logging = 0;
-				StopForErrors() if $stop_on_1st_error;
-			}
-	}
-
-
-
-sub OpenErrorLog($)
-	{
-		my ($log_file) = @_;
-
-		CloseErrorLog();
-		if ( $log_file )
-			{
-				$log_file = full_path_to($log_file);
- 
-				open(ERROR_LOG, ">$log_file") || die "Error: Can't open $log_file\n";
-				MacPerl::SetFileInfo("CWIE", "TEXT", $log_file);
-
-				$log_file =~ m/.+:(.+)/;
-				$recent_errors_file = full_path_to("$1.part");
-				$logging = 1;
-			}
-	}
-
-
-=head2 Stopping before it's too late - C<StopForErrors()>, C<DontStopForErrors()>
-
-When building a long list of projects, you decide whether to continue building subsequent projects when one fails.
-  By default, your build script will C<die> after the first project that generates an error while building.
-  Change this behavior with C<DontStopForErrors()>.
-  Re-enable it with C<StopForErrors()>.
-
-=cut
-
-sub StopForErrors()
-	{
-		$stop_on_1st_error = 1;
-		
-			# Can't stop for errors unless we notice them.
-			# Can't notice them unless we are logging.
-			# If the user didn't explicitly request logging, log to a temporary file.
-
-		if ( ! $recent_errors_file )
-			{
-				OpenErrorLog("${TMPDIR}BuildResults");
-			}
-	}
-
-sub DontStopForErrors()
-	{
-		$stop_on_1st_error = 0;		
-	}
-
-sub log_message($)
-	{
-		if ( $logging )
-			{
-				my ($message) = @_;
-				print ERROR_LOG $message;
-			}
-	}
-
-sub log_message_with_time($)
-	{
-		if ( $logging )
-			{
-				my ($message) = @_;
-				my $time_stamp = localtime();
-				log_message("$message ($time_stamp)\n");
-			}
-	}
-
-sub log_recent_errors($)
-	{
-		my ($project_name) = @_;
-		my $found_errors = 0;
-	
-		if ( $logging )
-			{
-				open(RECENT_ERRORS, "<$recent_errors_file");
-
-				while( <RECENT_ERRORS> )
-					{
-						if ( /^Error/ || /^CouldnÕt find project file/ || /^Link Error/ )
-							{
-#								if (!$found_errors)
-#									print $_;
-								$found_errors = 1;
-							}
-						print ERROR_LOG $_;
-					}
-
-				close(RECENT_ERRORS);
-				unlink("$recent_errors_file");
-			}
-		
-		if ( $stop_on_1st_error && $found_errors )
-			{
-				print ERROR_LOG "### Build failed.\n";
-				die "### Errors encountered building \"$project_name\".\n";
-			}
-	}
-	
-sub DoBuildProject($$$)
-	{
-		my ($project_path, $target_name, $clean_build) = @_;
-		$project_path = full_path_to($project_path);
-
-#		$project_path =~ m/.+:(.+)/;
-#		my $project_name = $1;
-
-		log_message_with_time("### Building \"$project_path\"");
-
-			# Check that the given project exists
-		if (! -e $project_path)
-			{
-				print ERROR_LOG "### Build failed.\n";
-				die "### Can't find project file \"$project_path\".\n";
-			}
-		
-		print "Building \"$project_path\[$target_name\]\"\n";
-		
-		$had_errors = Moz::CodeWarriorLib::build_project(
-			$project_path, $target_name, $recent_errors_file, $clean_build
-		);
-		WaitNextEvent();
-
-#		$had_errors =
-#MacPerl::DoAppleScript(<<END_OF_APPLESCRIPT);
-#	tell (load script file "$CodeWarriorLib") to BuildProject("$project_path", "$project_name", "$target_name", "$recent_errors_file", $clean_build)
-#END_OF_APPLESCRIPT
-
-			# Append any errors to the globally accumulated log file
-#		if ( $had_errors ) # Removed this test, because we want warnings, too.  -- jrm
-			{
-				log_recent_errors($project_path);
-			}
-	}
-
-
-sub ImportXMLProject($$)
-{
-    my ($xml_path, $project_path) = @_;
-
-#    my ($codewarrior_ide_name) = Moz::CodeWarriorLib::getCodeWarriorIDEName();
-#    my $ascript = <<EOS;
-#      tell application "$codewarrior_ide_name"
-#        make new (project document) as ("$project_path") with data ("$xml_path")
-#      end tell
-#EOS
-#    print $ascript."\n";
-#    my($result) = MacPerl::DoAppleScript($ascript);
-#    unless ($result) { die "Error: ImportXMLProject AppleScript failed $^E $result\n";  }
-#    
-
-    my($import_error) = Moz::CodeWarriorLib::import_project($xml_path, $project_path);
-    if ($import_error ne "") {
-      die "Error: ImportXMLProject failed with error $import_error\n";
-    }
-}
-
-sub ExportProjectToXML($$)
-{
-    my ($project_path, $xml_path) = @_;
-
-    my (@suffix_list) = (".mcp");
-    my ($project_name, $project_dir, $suffix) = fileparse($project_path, @suffix_list);
-    if ($suffix eq "") { die "Project: $project_path doesn't look like a project file.\n"; }
-    
-    if (-e $xml_path) {
-        print "$xml_path exists - not exporting $project_path\n";
-    }
-    else {
-        print "Exporting $project_path to $xml_path\n";
-        my($export_error) = Moz::CodeWarriorLib::export_project($project_path, $xml_path);
-        if ($export_error ne "") {
-            die "Error: export_project failed with error '$export_error'\n";
-        }
-        
-        if (! -e $xml_path) {
-          die "Error: XML export to $xml_path failed\n";
-        }
-    }
-}
-
-
-=head2 Miscellaneous
-
-C<MakeAlias($old_file, $new_file)> functions like C<symlink()>, except with better argument defaulting and more explicit error messages.
-
-=cut
-
-sub MakeAlias($$)
-	{
-		my ($old_file, $new_file) = @_;
-
-			# if the directory to hold $new_file doesn't exist, create it
-		if ( ($new_file =~ m/(.+:)/) && !-d $1 )
-			{
-				mkpath($1);
-			}
-
-			# if a leaf name wasn't specified for $new_file, use the leaf from $old_file
-		if ( ($new_file =~ m/:$/) && ($old_file =~ m/.+:(.+)/) )
-			{
-				$new_file .= $1;
-			}
-
-		my $message = "Can't create a Finder alias (at \"$new_file\")\n for \"$old_file\"; because ";
-
-		die "Error: $message \"$old_file\" doesn't exist.\n" unless -e $old_file;
-		die "Error: $message I won't replace an existing (non-alias) file with an alias.\n" if ( -e $new_file && ! -l $new_file );
-
-			# now: $old_file exists; $new_file doesn't (or else, is an alias already)
-
-		if ( -l $new_file )
-			{
-					# ...then see if it already points to $old_file
-				my $current_target	= full_path_to(readlink($new_file));
-				my $new_target			= full_path_to($old_file);
-
-				return if ( $current_target eq $new_target );
-					# if the desired alias already exists and points to the right thing, then we're done
-				
-				unlink $new_file;
-			}
-		
-		symlink($old_file, $new_file) || die "Error: $message symlink returned an unexpected error.\n";
-	}
-	
-	
-=pod
-
-C<InstallFromManifest()>
-
-=cut
-
-sub InstallFromManifest($;$$)
-	{
-		my ($manifest_file, $dest_dir, $flat) = @_;
-		
-		$flat = 0 unless defined($flat); # if $flat, all rel. paths in MANIFEST get aliased to the root of $dest_dir
-
-		$dest_dir ||= ":";
-
-		$manifest_file =~ m/(.+):/;
-		my $source_dir =  $1;
-
-		chop($dest_dir) if $dest_dir =~ m/:$/;
-
-		#Mac::Events->import();
-		WaitNextEvent();
-		if ($flat)
-		{
-			print "Doing manifest on \"$manifest_file\" FLAT\n" unless $QUIET;
-		}
-		else
-		{
-			print "Doing manifest on \"$manifest_file\"\n" unless $QUIET;
-		}
-		
-		my $read = maniread(full_path_to($manifest_file));
-		foreach $file (keys %$read)
-			{
-				next unless $file;
-
-				$subdir = ":";
-				if (!$flat && ($file =~ /:.+:/ ))
-					{
-						$subdir = $&;
-					}
-
-				$file = ":$file" unless $file =~ m/^:/;
-				MakeAlias("$source_dir$file", "$dest_dir$subdir");
-			}
-	}
-
-
-=pod
-
-C<InstallResources()>
-
-=cut
-
-# parameters are path to MANIFEST file, destination dir, true (to make copies) or false (to make aliases)
-sub InstallResources($;$;$)
-	{
-		my ($manifest_file, $dest_dir, $copy_files) = @_;
-
-		$dest_dir ||= ":";
-		mkpath($dest_dir) if !-d $dest_dir;
-
-		$manifest_file =~ m/(.+):/;
-		my $source_dir =  $1;
-
-		chop($dest_dir) if $dest_dir =~ m/:$/;
-
-		WaitNextEvent();
-		print "Installing resources from \"$manifest_file\"\n" unless $QUIET;
-		
-		my $read = maniread(full_path_to($manifest_file));
-		foreach $file (keys %$read)
-			{
-				next unless $file;
-				
-				if ($copy_files)
-					{
-						copy("$source_dir:$file", "$dest_dir:$file");
-					}
-				else
-					{
-						MakeAlias("$source_dir:$file", "$dest_dir:$file");
-					}
-			}
-	}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// Delay
-#//--------------------------------------------------------------------------------------------------
-sub Delay($)		
-{
-  my ($delay_seconds) = @_;
-
-  $now = time;
-  
-  $exit_time = $now + $delay_seconds;
-
-  while ($exit_time > $now) {
-     $now = time;
-  }
-	
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// GetFileModDate
-#//--------------------------------------------------------------------------------------------------
-sub GetFileModDate($)
-{
-    my($filePath)=@_;
-    my($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,
-        $atime,$mtime,$ctime,$blksize,$blocks) = stat($filePath);
-    return $mtime;
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// LaunchCodeWarrior
-#//--------------------------------------------------------------------------------------------------
-sub LaunchCodeWarrior($)
-{
-  my($idepath_file) = @_;   # full path to IDE location file
-  my($cur_dir) = cwd();
-  
-  # this both launches and writes the IDE path file
-  Moz::CodeWarriorLib::activate($idepath_file);
-  
-  chdir($cur_dir);
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// GetCodeWarriorRelativePath
-#//--------------------------------------------------------------------------------------------------
-sub GetCodeWarriorRelativePath($)
-{
-  my($rel_path) = @_;
-  return Moz::CodeWarriorLib::getCodeWarriorPath($rel_path);
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// RedirectOutputToFile
-#//--------------------------------------------------------------------------------------------------
-sub RedirectOutputToFile($)
-{
-    my($log_file) = @_;
-    
-    # ensure that folders in the path exist
-    my($logdir) = "";
-    my($logfile) = $log_file;
-    
-    if ($log_file =~ /(.+?:)([^:]+)$/)       # ? for non-greedy match
-    {
-        $logdir = $1;
-        $logfile = $2;
-        
-        mkpath($logdir);
-    }
-
-    print "Output is now being redirected to the file '$log_file'\n";
-    
-    open(STDOUT, "> $log_file") || die "Can't redirect stdout";
-    open(STDERR, ">&STDOUT") || die "Can't dup stdout";
-    select(STDERR); $| = 1;     # make unbuffered
-    select(STDOUT); $| = 1;     # make unbuffered
-    
-    MacPerl::SetFileInfo("CWIE", "TEXT", $log_file);
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// ActivateApplication
-#//--------------------------------------------------------------------------------------------------
-
-sub ActivateApplication($)
-{
-	my ($appSignature) = @_;
-	my ($psi, $found);
-	my ($appPSN);
-	
-	$found = 0;
-		
-	foreach $psi (values(%Process))
-	{
-		if ($psi->processSignature() eq $appSignature)
-		{
-			$appPSN = $psi->processNumber();
-			$found = 1;
-            last;
-		}
-	}
-
-	if ($found == 0 || SameProcess($appPSN, GetFrontProcess()))
-	{
-		return;
-	}
-
-	SetFrontProcess($appPSN);
-
-	while (GetFrontProcess() != $appPSN)
-	{
-		WaitNextEvent();
-	}
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// IsProcessRunning
-#//--------------------------------------------------------------------------------------------------
-
-sub IsProcessRunning($)
-{
-    my($processName, $psn, $psi) = @_;
-    while ( ($psn, $psi) = each(%Process) ) {
-     if ($psi->processName eq $processName) { return 1; }
-    }
-    return 0;
-}
-
-
-1;
-
-=head1 AUTHORS
-
-Scott Collins <scc@netscape.com>, Simon Fraser <sfraser@netscape.com>, Chris Yeh <cyeh@netscape.com>
-
-=head1 SEE ALSO
-
-BuildMozillaDebug.pl (et al), BuildList.pm, CodeWarriorLib (an AppleScript library)
-
-=head1 COPYRIGHT
-
-The contents of this file are subject to the Netscape Public
-License Version 1.1 (the "License"); you may not use this file
-except in compliance with the License. You may obtain a copy of
-the License at http://www.mozilla.org/NPL/
-
-Software distributed under the License is distributed on an "AS
-IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-implied. See the License for the specific language governing
-rights and limitations under the License.
-
-The Original Code is Mozilla Communicator client code, released
-March 31, 1998.
-
-The Initial Developer of the Original Code is Netscape
-Communications Corporation. Portions created by Netscape are
-Copyright (C) 1998-1999 Netscape Communications Corporation. All
-Rights Reserved.
-
-Contributor(s): 
-
-=cut

mozilla/build/mac/build_scripts/Moz/Prefs.pm

@@ -1,272 +0,0 @@
-
-package Moz::Prefs;
-
-require 5.004;
-require Exporter;
-
-# Package that attempts to read a file from the Preferences folder,
-# and get build settings out of it
-
-use strict;
-
-use Exporter;
-use File::Path;
-
-use Mac::Files;
-
-use vars qw(@ISA @EXPORT);
-
-@ISA		  = qw(Exporter);
-@EXPORT 	= qw(ReadMozUserPrefs);
-
-
-#-------------------------------------------------------------------------------
-#
-# GetPrefsFolder
-#
-#-------------------------------------------------------------------------------
-
-sub GetPrefsFolder()
-{
-  my($prefs_folder) = FindFolder(kOnSystemDisk, kPreferencesFolderType, 1);
-  return $prefs_folder.":Mozilla build prefs";
-}
-
-
-#-------------------------------------------------------------------------------
-#
-# SetArrayValue
-#
-#-------------------------------------------------------------------------------
-sub SetArrayValue($$$)
-{
-  my($array_ref, $index1, $index2) = @_;
-
-  my($index);
-  foreach $index (@$array_ref)
-  {
-    if ($index->[0] eq $index1)
-    {
-      $index->[1] = $index2;
-      return 1;
-    }
-  }
-  
-  return 0;
-}
-
-
-#-------------------------------------------------------------------------------
-#
-# WriteDefaultPrefsFile
-#
-#-------------------------------------------------------------------------------
-
-sub WriteDefaultPrefsFile($)
-{
-  my($file_path) = @_;
-
-  my($file_contents);
-  $file_contents = <<'EOS';
-% You can use this file to customize the Mozilla build system.
-% The following kinds of lines are allowable:
-%   Comment lines, which start with a '%' in the first column
-%   Lines which modify the default build settings. For the list of flags,
-%   see MozBuildFlags.pm. Examples are:
-%
-%    build       pull            0                    % don't pull
-%    options     mng             1                    % turn mng on
-%   
-%   Line containing the special 'buildfrom' flag, which specifies
-%   where to start the build. Example:
-%   
-%    buildfrom   nglayout                % where to start the build
-%
-%   Lines which specify the location of the files used to store paths
-%   to the CodeWarrior IDE, and the MacCVS Pro session file. Note quoting
-%   of paths containing whitespace. Examples:
-%
-%    filepath   idepath         ::codewarrior.txt
-%    filepath   sessionpath     ":Some folder:MacCVS session path.txt"
-%
-%   Lines which modify the build settings like %main::DEBUG.
-%   Any lines which do not match either of the above are assumed
-%   to set variables on $main::. Examples:
-%   
-%    MOZILLA_OFFICIAL    1
-%
-EOS
-
-  $file_contents =~ s/%/#/g;
-   
-  local(*PREFS_FILE);
-
-  open(PREFS_FILE, "> $file_path") || die "Could not write default prefs file\n";
-  print PREFS_FILE ($file_contents);
-  close(PREFS_FILE);
-
-  MacPerl::SetFileInfo("McPL", "TEXT", $file_path);
-}
-
-
-#-------------------------------------------------------------------------------
-#
-# HandlePrefSet
-#
-#-------------------------------------------------------------------------------
-sub HandlePrefSet($$$$)
-{
-  my($flags, $name, $value, $desc) = @_;
-
-  if (SetArrayValue($flags, $name, $value)) {
-    print "Prefs set $desc flag '$name' to '$value'\n";
-  } else {
-    die "$desc setting '$name' is not a valid option\n";
-  }
-
-}
-
-
-#-------------------------------------------------------------------------------
-#
-# HandleBuildFromPref
-#
-#-------------------------------------------------------------------------------
-sub HandleBuildFromPref($$)
-{
-  my($build_array, $name) = @_;
-
-  my($setting) = 0;
-  my($index);
-  foreach $index (@$build_array)
-  {
-    if ($index->[0] eq $name) {
-      $setting = 1;
-    }
-    
-    $index->[1] = $setting;    
-  }
-
-  if ($setting == 1) {
-    print "Building from $name onwards, as specified by prefs\n";
-  } else {
-    printf "Failed to find buildfrom setting '$name'\n";
-  }
-}
-
-
-#-------------------------------------------------------------------------------
-#
-# ReadPrefsFile
-#
-#-------------------------------------------------------------------------------
-
-sub ReadPrefsFile($$$$$)
-{
-  my($file_path, $build_flags, $options_flags, $filepath_flags, $create_if_missing) = @_;
-  
-  local(*PREFS_FILE);
-  
-  if (open(PREFS_FILE, "< $file_path"))
-  {
-    print "Reading build prefs from '$file_path'\n";
-  
-    while (<PREFS_FILE>)
-    {
-      my($line) = $_;
-      chomp($line);
-      
-      if ($line =~ /^\#/ || $line =~ /^\s*$/) {    # ignore comments and empty lines
-        next;
-      }
-            
-      if (($line =~ /^\s*([^#\s]+)\s+([^#\s]+)\s+\"(.+)\"(\s+#.+)?/) ||
-          ($line =~ /^\s*([^#\s]+)\s+([^#\s]+)\s+\'(.+)\'(\s+#.+)?/) ||
-          ($line =~ /^\s*([^#\s]+)\s+([^#\s]+)\s+([^#\s]+)(\s+#.+)?/))
-      {
-        my($array_name) = $1;      
-        my($option_name) = $2;
-        my($option_value) = $3;      
-      
-        # print "Read '$array_name' '$option_name' '$option_value'\n";
-        
-        if ($array_name eq "build")
-        {
-          HandlePrefSet($build_flags, $option_name, $option_value, "Build");
-        }
-        elsif ($array_name eq "options")
-        {
-          HandlePrefSet($options_flags, $option_name, $option_value, "Options");
-        }
-        elsif ($array_name eq "filepath" && $option_name && $option_value)
-        {
-          HandlePrefSet($filepath_flags, $option_name, $option_value, "Filepath");
-        }
-        else
-        {
-          print "Unknown pref option at $line\n";
-        }
-      }
-      elsif ($line =~ /^\s*buildfrom\s+([^#\s]+)(\s+#.+)?/)
-      {
-        my($build_start) = $1;
-        HandleBuildFromPref($build_flags, $build_start);
-      }
-      elsif ($line =~ /^\s*([^#\s]+)\s+([^#\s]+)(\s+#.+)?/)
-      {
-        my($build_var) = $1;
-        my($var_setting) = $2;
-        
-        print "Setting \$main::$build_var to $var_setting\n";
-        eval "\$main::$build_var = \"$var_setting\"";
-      }
-      else
-      {
-        print "Unrecognized input line at $line\n";
-      }
-      
-    }
-    
-    close(PREFS_FILE);  
-  }
-  elsif ($create_if_missing)
-  {
-    print "No prefs file found at $file_path; using defaults\n";
-    
-    my($folder_path) = $file_path;
-    $folder_path =~ s/[^:]+$//;
-    mkpath($folder_path);
-    WriteDefaultPrefsFile($file_path);
-  }
-}
-
-
-#-------------------------------------------------------------------------------
-#
-# ReadMozUserPrefs
-#
-#-------------------------------------------------------------------------------
-
-sub ReadMozUserPrefs($$$$)
-{
-  my($prefs_file_name, $build_flags, $options_flags, $filepath_flags) = @_;
-  
-  if ($prefs_file_name eq "") { return; }
-  
-  # if local prefs exist, just use those. Othewise, look in the prefs folder
-  if (-e $prefs_file_name)
-  {
-    # read local prefs
-    ReadPrefsFile($prefs_file_name, $build_flags, $options_flags, $filepath_flags, 0);
-  }
-  else
-  {
-    # first read prefs folder prefs
-    my($prefs_path) = GetPrefsFolder();
-    $prefs_path .= ":$prefs_file_name";
-
-    ReadPrefsFile($prefs_path, $build_flags, $options_flags, $filepath_flags, 1);
-  }
-}
-
-1;

mozilla/build/mac/build_scripts/Moz/ProjectXML.pm

@@ -1,932 +0,0 @@
-#!/usr/bin/perl
-
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#   Simon Fraser <sfraser@netscape.com>
-#
-
-package Moz::ProjectXML;
-
-require 5.004;
-require Exporter;
-
-use strict;
-use Exporter;
-
-use Cwd;
-use XML::DOM;
-
-use vars qw(@ISA @EXPORT);
-
-@ISA      = qw(Exporter);
-@EXPORT   = qw(
-                ParseXMLDocument
-                DisposeXMLDocument
-                WriteXMLDocument
-                CleanupPro5XML
-                GetTargetsList
-                CloneTarget
-                SetAsSharedLibraryTarget
-                SetAsStaticLibraryTarget
-                AddTarget
-                RemoveTarget
-                GetTargetSetting
-                SetTargetSetting
-                getChildElementTextContents
-              );
-
-
-#--------------------------------------------------------------------------------------------------
-# A module for reading, manipulating, and writing XML-format CodeWarrior project files.
-# 
-# Sample usage:
-# 
-# use ProjectXML;
-# 
-# my $doc = ProjectXML::ParseXMLDocument("Test.mcp.xml");
-# ProjectXML::CloneTarget($doc, "Test.shlb", "Test.lib");
-# ProjectXML::SetAsStaticLibraryTarget($doc, "Test.lib", "TestOutput.lib");
-# ProjectXML::WriteXMLDocument($doc, "Test_out.xml");
-# ProjectXML::DisposeXMLDocument($doc);
-# 
-#--------------------------------------------------------------------------------------------------
-
-
-#//--------------------------------------------------------------------------------------------------
-#// ParseXMLDocument
-#// Note that the caller must call DisposeXMLDocument on the returned doc
-#//--------------------------------------------------------------------------------------------------
-sub ParseXMLDocument($)
-{
-  my($doc_path) = @_;
-
-  my $parser = new XML::DOM::Parser(ErrorContext => 2);
-  my $doc = $parser->parsefile($doc_path);
-
-  return $doc;
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// DisposeXMLDocument
-#// Needed to avoid memory leaks - cleanup circular references for garbage collection
-#//--------------------------------------------------------------------------------------------------
-sub DisposeXMLDocument($)
-{
-  my($doc) = @_;
-  
-  $doc->dispose();
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// WriteXMLDocument
-#//--------------------------------------------------------------------------------------------------
-
-sub _pro5_tag_compression($$)
-{
-   return 1;    # Pro 5 is broken and can't import XML with <foo/> style tags
-}
-
-sub _pro6plus_tag_compression($$)
-{
-   return 0;    # Pro 6 can deal with empty XML tags like <foo/>
-}
-
-sub WriteXMLDocument($$$)
-{
-  my($doc, $file_path, $ide_version) = @_;
-
-  if ($ide_version eq "4.0")
-  {
-    XML::DOM::setTagCompression(\&_pro5_tag_compression);
-  }
-  else
-  {
-    XML::DOM::setTagCompression(\&_pro6plus_tag_compression);
-  }
-
-  $doc->printToFile($file_path);
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// CleanupPro5XML
-#// XML Projects exported by Pro 5 contain garbage data under the MWMerge_MacOS_skipResources
-#// setting. This routine cleans this up, saving the result to a new file
-#//--------------------------------------------------------------------------------------------------
-sub CleanupPro5XML($$)
-{
-  my($xml_path, $out_path) = @_;
-  
-  local(*XML_FILE);
-  open(XML_FILE, "< $xml_path") || die "Error: failed to open file $xml_path\n";
-  
-  local(*CLEANED_FILE);
-  open(CLEANED_FILE, "> $out_path") || die "Error: failed to open file $out_path for writing\n";
-  
-  my $in_skip_resources_settings = 0;
-  
-  while(<XML_FILE>)
-  {
-      my($line) = $_;
-
-      if ($line =~ /^<\?codewarrior/)    # is processing inst line
-      {
-        my $test_line = $line;
-        chomp($test_line);
-  
-        my $out_line = $test_line;
-        if ($test_line =~ /^<\?codewarrior\s+exportversion=\"(.+)\"\s+ideversion=\"(.+)\"\s*\?>$/)
-        {
-          my $export_version = $1;
-          my $ide_version    = $2;
-
-          $ide_version = "4.0_mozilla";   # pseudo IDE version so we know we touched it
-          $out_line = "<?codewarrior exportversion=\"".$export_version."\" ideversion=\"".$ide_version."\"?>";
-        }
-
-        print CLEANED_FILE "$out_line\n";
-        next;
-      }
-      
-      if ($line =~ /MWMerge_MacOS_skipResources/)
-      {
-        $in_skip_resources_settings = 1;
-        print CLEANED_FILE "$line";
-      }
-      elsif($in_skip_resources_settings && $line =~ /<!-- Settings for/)
-      {
-        # leaving bad settings lines. Write closing tag
-        print CLEANED_FILE "                    <!-- Corrupted setting entries removed by script -->\n";
-        print CLEANED_FILE "                </SETTING>\n\n";
-        
-        print CLEANED_FILE "$line";
-
-        $in_skip_resources_settings = 0;
-      }
-      elsif (!$in_skip_resources_settings)
-      {      
-        print CLEANED_FILE "$line";
-      }
-  }
-  
-  close(XML_FILE);
-  close(CLEANED_FILE);
-
-}
-
-#--------------------------------------------------------------------------------------------------
-# SniffProjectXMLIDEVersion
-#
-#--------------------------------------------------------------------------------------------------
-sub SniffProjectXMLIDEVersion($)
-{
-  my($xml_path) = @_;
-  
-  my $found_version = "";
-  
-  local(*XML_FILE);
-  open(XML_FILE, "< $xml_path") || die "Error: failed to open file $xml_path\n";
-  
-  while(<XML_FILE>)
-  {
-      my($line) = $_;
-      chomp($line);
-      
-      if ($line =~ /^<\?codewarrior/)    # is processing inst line
-      {
-        unless ($line =~ /^<\?codewarrior\s+exportversion=\"(.+)\"\s+ideversion=\"(.+)\"\s*\?>$/)
-        {
-          die "Error: Failed to find ideversion in $xml_path in line $line\n";
-        }
-        
-        my $export_version = $1;
-        my $ide_version    = $2;
-
-        $found_version = $ide_version;         
-        last;
-      }
-  }
-  
-  close(XML_FILE);
-
-  return $found_version;
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// GetTargetsList
-#// Returns an array of target names
-#//--------------------------------------------------------------------------------------------------
-sub GetTargetsList($)
-{
-  my($doc) = @_;
-
-  my $nodes = $doc->getElementsByTagName("TARGET");
-  my $n = $nodes->getLength;
-  
-  my @target_names;
-  
-  for (my $i = 0; $i < $n; $i++)
-  {
-    my ($node) = $nodes->item($i);   
-   
-    my($target_name) = getChildElementTextContents($node, "NAME");
-    push(@target_names, $target_name);
-  }
-
-  return @target_names;
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// CloneTarget
-#// Clone the named target, renaming it to 'new_name'
-#//--------------------------------------------------------------------------------------------------
-sub CloneTarget($$$)
-{
-  my($doc, $target_name, $new_name) = @_;
-
-  my $target_node   = getTargetNode($doc, $target_name);
-
-  # clone here
-  my $target_clone  = $target_node->cloneNode(1);   # deep clone
-  
-  # -- munge target settings --
-
-  # set the target name field
-  setChildElementTextContents($doc, $target_clone, "NAME", $new_name);
-  
-  # set the targetname pref
-  setTargetNodeSetting($doc, $target_clone, "Targetname", $new_name);
-
-  # -- insert new target subtree --
-  
-  my $target_list   = $target_node->getParentNode();
-  $target_list->appendChild($target_clone);
-  
-  # -- now add to targetorder --
-  my (@target_order_nodes) = getChildOfDocument($doc, "TARGETORDER");
-  
-  my $target_order = @target_order_nodes[0];
-  
-  my $new_order     = $doc->createElement("ORDEREDTARGET");
-  my $order_name    = $doc->createElement("NAME");
-  
-  $new_order->appendChild($order_name);
-
-  setChildElementTextContents($doc, $new_order, "NAME", $new_name);
-  $target_order->appendChild($new_order);
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// SetAsSharedLibraryTarget
-#// 
-#//--------------------------------------------------------------------------------------------------
-sub SetAsSharedLibraryTarget($$$)
-{
-  my($doc, $target_name, $output_name) = @_;
-
-  my $target_node = getTargetNode($doc, $target_name);
-
-  setTargetNodeSetting($doc, $target_node, "MWProject_PPC_type", "SharedLibrary");
-  setTargetNodeSetting($doc, $target_node, "MWProject_PPC_filetype", "1936223330"); #'shlb'
-  setTargetNodeSetting($doc, $target_node, "MWProject_PPC_outfile", $output_name);
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// AddFileToTarget
-#// 
-#// Add a file to the specified target(s).
-#// 
-#//--------------------------------------------------------------------------------------------------
-sub AddFileToTarget($$$)
-{
-  my($doc, $target_list, $file_name) = @_;
-
-  # the file must be added in 3 places:
-  # 1. in <TARGET><FILELIST><FILE> (with linkage flags if necessary)
-  # 2. in <TARGET><LINKORDER><FILEREF>
-  # 3. in <GROUPLIST><GROUP><FILEREF>
-  die "Write me\n";
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// RemoveFileFromTarget
-#// 
-#// Remove a file from the specified target, removing it from the entire project
-#// if no other targets reference it.
-#// 
-#//--------------------------------------------------------------------------------------------------
-sub RemoveFileFromTarget($$$)
-{
-  my($doc, $target_node, $file_name) = @_;
-  
-  # the file must be removed in 3 places:
-  # 1. in <TARGET><FILELIST><FILE>
-  # 2. in <TARGET><LINKORDER><FILEREF>
-  # 3. in <GROUPLIST><GROUP><FILEREF>
-  
-  # first, remove from <FILELIST>
-  my $filelist_node = getFirstChildElement($target_node, "FILELIST");
-  unless ($filelist_node) { die "Error: failed to find FILELIST node\n"; }
-  
-  my $file_node = getChildNodeByGrandchildContents($doc, $filelist_node, "FILE", "PATH", $file_name);
-  unless ($file_node) { return; }
-
-  $filelist_node->removeChild($file_node);
-  
-  # next, remove from <LINKORDER>
-  my $linkorder_node = getFirstChildElement($target_node, "LINKORDER");
-  unless ($linkorder_node) { die "Error: failed to find LINKORDER node\n"; }
-  
-  my $fileref_node = getChildNodeByGrandchildContents($doc, $linkorder_node, "FILEREF", "PATH", $file_name);
-  unless ($fileref_node) { die "Error: link order node for file $file_name not found\n"; }
-
-  $linkorder_node->removeChild($fileref_node);
-  
-  # last, remove from <GROUPLIST>
-  # <GROUPLIST> is cross-target, so we have to be careful here.
-  my $grouplist_node = getChildOfDocument($doc, "GROUPLIST");
-  unless ($grouplist_node) { die "Error: failed to find GROUPLIST node\n"; }
-
-  # if the file isn't in any other targets, remove it from the groups
-  if (!GetFileInUse($doc, $file_name))
-  {
-    print "File $file_name is in no other targest. Removing from project\n";
-
-    my @group_nodes;
-    getChildElementsOfType($doc, $grouplist_node, "GROUP", \@group_nodes);
-    my $group_node;
-    foreach $group_node (@group_nodes)
-    {
-      my @fileref_nodes;
-      getChildElementsOfType($doc, $group_node, "FILEREF", \@fileref_nodes);
-  
-      my $fileref_node;
-      foreach $fileref_node (@fileref_nodes)
-      {
-        my $path_name = getChildElementTextContents($fileref_node, "PATH");
-        if ($path_name eq $file_name)
-        {
-          print "Removing $file_name from project group list\n";
-          $group_node->removeChild($fileref_node);
-          last;
-        }
-      }
-      
-      # can a file appear in more than one group?
-    }
-  }
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// SetAsStaticLibraryTarget
-#// 
-#//--------------------------------------------------------------------------------------------------
-sub SetAsStaticLibraryTarget($$$)
-{
-  my($doc, $target_name, $output_name) = @_;
-
-  my $target_node = getTargetNode($doc, $target_name);
-
-  setTargetNodeSetting($doc, $target_node, "MWProject_PPC_type", "Library");
-  setTargetNodeSetting($doc, $target_node, "MWProject_PPC_filetype", "1061109567"); #'????'
-  setTargetNodeSetting($doc, $target_node, "MWProject_PPC_outfile", $output_name);
-
-  # static targets don't need any library linkage, so we can remove linkage
-  # with all .shlb and .Lib files.
-  
-  my(@obsolete_files) = ("NSStdLibStubs", "InterfacesStubs", "InterfaceLib", "InternetConfigLib");
-
-  print " Removing libraries etc. from target\n";
-
-  # get all files in target
-  my @target_files = GetTargetFilesList($doc, $target_name);
-  my $target_file;
-  foreach $target_file (@target_files)
-  {
-    if ($target_file =~ /(\.shlb|\.lib|\.Lib|\.o|\.exp)$/)
-    {
-      RemoveFileFromTarget($doc, $target_node, $target_file);
-    }
-  }
-  
-  print " Removing stub libraries from target\n";
-  
-  # then remove files with known names
-  my $obs_file;
-  foreach $obs_file (@obsolete_files)
-  {
-    RemoveFileFromTarget($doc, $target_node, $obs_file);
-  }
-
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// AddTarget
-#// 
-#//--------------------------------------------------------------------------------------------------
-sub AddTarget($$)
-{
-  my($doc, $target_name) = @_;
-
-  die "Write me\n";
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// RemoveTarget
-#// 
-#//--------------------------------------------------------------------------------------------------
-sub RemoveTarget($$)
-{
-  my($doc, $target_name) = @_;
-
-  die "Write me\n";
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// GetTargetSetting
-#// Get the value for the specified setting in the specified target
-#//--------------------------------------------------------------------------------------------------
-sub GetTargetSetting($$$)
-{
-  my($doc, $target_name, $setting_name) = @_;
-
-  my $target_node   = getTargetNode($doc, $target_name);
-  return getTargetNodeSetting($target_node, "VALUE");
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// SetTargetSetting
-#// Set the value for the specified setting in the specified target
-#//--------------------------------------------------------------------------------------------------
-sub SetTargetSetting($$$$)
-{
-  my($doc, $target_name, $setting_name, $new_value) = @_;
-
-  my $target_node   = getTargetNode($doc, $target_name);
-  setTargetNodeSetting($doc, $target_node, "VALUE", $new_value);
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// GetTargetFilesList
-#// Return an array of the files in the target (in filelist order)
-#//--------------------------------------------------------------------------------------------------
-sub GetTargetFilesList($$)
-{
-  my($doc, $target_name) = @_;
-
-  my $target_node = getTargetNode($doc, $target_name);
-
-  my @files_list;
-    
-  my $filelist_node = getFirstChildElement($target_node, "FILELIST");
-  unless ($filelist_node) { die "Error: failed to find FILELIST node\n"; }
-
-  my @file_nodes;
-  getChildElementsOfType($doc, $filelist_node, "FILE", \@file_nodes);
-  
-  my $node;
-  foreach $node (@file_nodes)
-  {
-    my $file_name = getChildElementTextContents($node, "PATH");
-    push(@files_list, $file_name);
-  }
-  
-  return @files_list;
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// FileIsInTarget
-#// 
-#//--------------------------------------------------------------------------------------------------
-sub FileIsInTarget($$$)
-{
-  my($doc, $file_name, $target_name) = @_;
-
-  my $target_node = getTargetNode($doc, $target_name);
-  unless ($target_node) { die "Error: no target found called $target_name\n"; }
-
-  my $file_node = GetTargetFileNode($doc, $target_node, $file_name);
-  if ($file_node) {
-    return 1;
-  }
-  
-  return 0;
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// GetFileTargetsList
-#// Return an array of the targets that a file is in (expensive)
-#//--------------------------------------------------------------------------------------------------
-sub GetFileTargetsList($$)
-{
-  my ($doc, $file_name) = @_;
-
-  my @target_list;
-
-  my @targets = GetTargetsList($doc);
-  my $target;
-  
-  foreach $target (@targets)
-  {
-    if (FileIsInTarget($doc, $file_name, $target))
-    {
-      push(@target_list, $target);
-    }
-  }
-  
-  return @target_list;
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// GetTargetFileNode
-#// 
-#//--------------------------------------------------------------------------------------------------
-sub GetTargetFileNode($$$)
-{
-  my($doc, $target_node, $file_name) = @_;
-
-  my $filelist_node = getFirstChildElement($target_node, "FILELIST");
-  unless ($filelist_node) { die "Error: failed to find FILELIST node\n"; }
-  
-  my $file_node = getChildNodeByGrandchildContents($doc, $filelist_node, "FILE", "PATH", $file_name);
-
-  return $file_node;
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// GetFileInUse
-#// Return true if the file is used by any target
-#//--------------------------------------------------------------------------------------------------
-sub GetFileInUse($$)
-{
-  my($doc, $file_name) = @_;
-
-  my $targetlist_node = getChildOfDocument($doc, "TARGETLIST");
-
-  my $target_node = $targetlist_node->getFirstChild();
- 
-  while ($target_node)
-  {
-    if ($target_node->getNodeTypeName eq "ELEMENT_NODE" &&
-        $target_node->getTagName() eq "TARGET")
-    {
-      # if this is a target node
-      my $file_node = GetTargetFileNode($doc, $target_node, $file_name);
-      if ($file_node) {
-        return 1;   # found it
-      }      
-    }
-
-    $target_node = $target_node->getNextSibling();
-  }
-  
-  # not found
-  return 0;
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// getChildOfDocument
-#//--------------------------------------------------------------------------------------------------
-sub getChildOfDocument($$)
-{
-  my($doc, $child_type) = @_;
-
-  return getFirstChildElement($doc->getDocumentElement(), $child_type);
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// getFirstChildElement
-#//--------------------------------------------------------------------------------------------------
-sub getFirstChildElement($$)
-{
-  my($node, $element_name) = @_;
-
-  my $found_node;
-  
-  unless ($node) { die "getFirstChildElement called with empty node\n"; }
-  
-  #look for the first "element_name" child
-
-  my $child_node = $node->getFirstChild();
- 
-  while ($child_node)
-  {
-    if ($child_node->getNodeTypeName eq "ELEMENT_NODE" &&
-        $child_node->getTagName() eq $element_name)
-    {
-      $found_node = $child_node;
-      last;
-    }
-
-    $child_node = $child_node->getNextSibling();
-  }
-   
-  return $found_node;
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// getChildElementsOfType
-#// 
-#// Return an array of refs to child nodes of the given type
-#//--------------------------------------------------------------------------------------------------
-sub getChildElementsOfType($$$$)
-{
-  my($doc, $node, $child_type, $array_ref) = @_;
-
-  my $child_node = $node->getFirstChild();
- 
-  while ($child_node)
-  {
-    if ($child_node->getNodeTypeName eq "ELEMENT_NODE" &&
-        $child_node->getTagName() eq $child_type)
-    {
-      push(@$array_ref, $child_node);
-    }
-
-    $child_node = $child_node->getNextSibling();
-  }
-
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// getChildElementTextContents
-#//--------------------------------------------------------------------------------------------------
-#
-# Given <FOOPY><NERD>Hi!</NERD></FOOPY>, where $node is <FOOPY>,
-# returns "Hi!". If > 1 <NERD> node, returns the contents of the first.
-#
-sub getChildElementTextContents($$)
-{
-  my($node, $tag_name) = @_;
-
-  my $first_element = getFirstChildElement($node, $tag_name);  
-  my $text_node     = $first_element->getFirstChild();
-  
-  my $text_contents = "";
-  
-  # concat adjacent text nodes
-  while ($text_node)
-  {
-    if ($text_node->getNodeTypeName() ne "TEXT_NODE")
-    {
-      last;
-    }
-
-    $text_contents = $text_contents.$text_node->getData();
-    $text_node = $text_node->getNextSibling();
-  }
-
-  return $text_contents;
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// setChildElementTextContents
-#//--------------------------------------------------------------------------------------------------
-sub setChildElementTextContents($$$$)
-{
-  my($doc, $node, $tag_name, $contents_text) = @_;
-  
-  my $first_element = getFirstChildElement($node, $tag_name);  
-  my $new_text_node = $doc->createTextNode($contents_text);
-  
-  # replace all child elements with a text element
-  removeAllChildren($first_element);
-  
-  $first_element->appendChild($new_text_node);
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// getChildNodeByContents
-#// 
-#// Consider <foo><bar><baz>Foopy</baz></bar><bar><baz>Loopy</baz></bar></foo>
-#// This function, when called with getChildNodeByContents($foonode, "bar", "baz", "Loopy")
-#// returns the second <bar> node.
-#//--------------------------------------------------------------------------------------------------
-sub getChildNodeByGrandchildContents($$$$$)
-{
-  my($doc, $node, $child_type, $gc_type, $gc_contents) = @_;    # gc = grandchild
-
-  my $found_node;
-  my $child_node = $node->getFirstChild();
-  while ($child_node)
-  {
-    if ($child_node->getNodeTypeName eq "ELEMENT_NODE" &&
-        $child_node->getTagName() eq $child_type)
-    {
-      # check for a child of this node of type 
-      my $child_contents = getChildElementTextContents($child_node, $gc_type);
-
-      if ($child_contents eq $gc_contents)
-      {
-        $found_node = $child_node;
-        last;
-      }
-    }
-
-    $child_node = $child_node->getNextSibling();
-  }
-
-  return $found_node;
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// getTargetNode
-#//--------------------------------------------------------------------------------------------------
-sub getTargetNode($$)
-{
-  my($doc, $target_name) = @_;
-
-  my $targetlist_node = getChildOfDocument($doc, "TARGETLIST");
-  return getChildNodeByGrandchildContents($doc, $targetlist_node, "TARGET", "NAME", $target_name);
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// getTargetNamedSettingNode
-#//--------------------------------------------------------------------------------------------------
-sub getTargetNamedSettingNode($$)
-{
-  my($target_node, $setting_name) = @_;
-
-  my $setting_node;
-
-  my $settinglist_node = getFirstChildElement($target_node, "SETTINGLIST");
-  my $child_node = $settinglist_node->getFirstChild();
- 
-  while ($child_node)
-  {
-    if ($child_node->getNodeTypeName ne "ELEMENT_NODE")
-    {
-      $child_node = $child_node->getNextSibling();
-      next;
-    }
-    
-    if ($child_node->getTagName() eq "SETTING")
-    {
-      my $set_name = getChildElementTextContents($child_node, "NAME");
-
-      if ($set_name eq $setting_name)
-      {
-        $setting_node = $child_node;
-        last;
-      }
-    }
-
-    $child_node = $child_node->getNextSibling();
-  }
-
-  return $setting_node;
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// getTargetNodeSetting
-#//--------------------------------------------------------------------------------------------------
-sub getTargetNodeSetting($$)
-{
-  my($target_node, $setting_name) = @_;
-  
-  my $setting_node  = getTargetNamedSettingNode($target_node, $setting_name);
-  return getChildElementTextContents($setting_node, "VALUE");
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// setTargetNodeSetting
-#//--------------------------------------------------------------------------------------------------
-sub setTargetNodeSetting($$$$)
-{
-  my($doc, $target_node, $setting_name, $new_value) = @_;
-
-  my $setting_node  = getTargetNamedSettingNode($target_node, $setting_name);
-
-  setChildElementTextContents($doc, $setting_node, "VALUE", $new_value);
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// elementInArray
-#//--------------------------------------------------------------------------------------------------
-sub elementInArray($$)
-{
-  my($element, $array) = @_;
-  my $test;
-  foreach $test (@$array)
-  {
-    if ($test eq $element) {
-      return 1;
-    }
-  }
-  return 0;
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// removeAllChildren
-#//--------------------------------------------------------------------------------------------------
-sub removeAllChildren($)
-{
-  my($node) = @_;
-  
-  my $child_node = $node->getFirstChild();
-  
-  while ($child_node)
-  {
-    $node->removeChild($child_node);
-    $child_node = $node->getFirstChild();
-  }
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// dumpNodeData
-#//--------------------------------------------------------------------------------------------------
-sub dumpNodeData($)
-{
-  my($node) = @_;
-  
-  unless ($node) { die "Null node passed to dumpNodeData\n"; }
-  
-  print "Dumping node $node\n";
-  
-  my($node_type) = $node->getNodeTypeName();
-  
-  if ($node_type eq "ELEMENT_NODE")
-  {
-    my($node_name) = $node->getTagName();
-    print "Element $node_name\n";
-  }
-  elsif ($node_type eq "TEXT_NODE")
-  {
-    my($node_data) = $node->getData;
-    # my(@node_vals) = unpack("C*", $node_data);
-    print "Text '$node_data'\n";    # may contain LF chars
-  }
-  else
-  {
-    print "Node $node_type\n";
-  }
-
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// dumpNodeTree
-#//--------------------------------------------------------------------------------------------------
-sub dumpNodeTree($)
-{
-  my($node) = @_;
-  
-  my($child_node) = $node->getFirstChild();
-  
-  unless ($child_node) { return; }
-
-  # recurse
-  dumpNodeData($child_node);
-  
-  # then go through child nodes
-  while ($child_node)
-  {
-    dumpNodeTree($child_node);
-  
-    $child_node = $child_node->getNextSibling();
-  }
-}
-
-
-
-
-1;
-

mozilla/build/mac/build_scripts/MozillaBuildFlags.txt

@@ -1,90 +0,0 @@
-#-------------------------------------------------------------------------------
-# These 3 lists are the 'master lists' to control what gets built.
-# 
-# Ordering in these arrays is important; it has to reflect the order in
-# which the build occurs.
-#
-# Setting containing spaces must be quoted with double quotes.
-#-------------------------------------------------------------------------------
-
-build_flags
-all             1
-pull            0
-dist            0
-config          0
-xpidl           0
-idl             0
-stubs           0
-runtime         0
-common          0
-imglib          0
-libimg2         0
-necko           0
-security        0
-browserutils    0
-intl            0
-nglayout        0
-accessiblity    0
-editor          0
-embedding       0
-viewer          0
-xpapp           0
-extensions      0
-plugins         0
-mailnews        0
-apprunner       0
-resources       0
-
-options_flags
-pull_by_date    0
-chrome_jars     1
-chrome_files    0
-use_jars        1
-transformiix    1
-mathml          0      MOZ_MATHML
-svg             0      MOZ_SVG
-# svg requires libart, which is an lgpl library. You need to pull it 
-# explicitly.
-libart_lgpl     0
-mng             1
-ldap            1      MOZ_LDAP_XPCOM
-ldap_experimental 0    MOZ_LDAP_XPCOM_EXPERIMENTAL
-xmlextras       1
-wsp             0      MOZ_WSP
-inspector       1
-mailextras      1
-xptlink         0
-psm             0      MOZ_PSM
-embedding_test  1
-embedding_chrome 0
-embedding_xulprefs 0
-embedding_xulsecurity 0
-carbon          0      TARGET_CARBON
-useimg2         1      USE_IMG2
-lowmem          0      MOZ_MAC_LOWMEM
-accessible      1      ACCESSIBILITY
-bidi            1      IBMBIDI
-p3p             0
-jsd             1
-venkman         1
-moz_logging     1      MOZ_LOGGING
-chatzilla       1
-content_packs   1
-xml_rpc         1
-cview           1
-help            1
-timeline        0      MOZ_TIMELINE
-static_build    0      MOZ_STATIC_COMPONENT_LIBS
-string_debug    0      DEBUG_STRING
-string_stats    0      DEBUG_STRING_STATS
-xpctools        0      XPC_TOOLS_SUPPORT
-smime           1
-mdn             1
-print_preview   1      NS_PRINT_PREVIEW
-moz_xul         1      MOZ_XUL
-
-filepath_flags
-idepath             ":CodeWarrior IDE Path.txt"
-sessionpath         ":Mozilla session path.txt"
-buildlogfilepath    ":Build Logs:Mozilla build log.txt"   # this is a path
-scriptlogfilepath   ":Build Logs:Mozilla script log.txt"

mozilla/build/mac/build_scripts/MozillaCheckoutList.txt

@@ -1,22 +0,0 @@
-# List of modules to check out. Format is
-#   module, (tag), (date)
-# where tag and date are optional (non-trailing commas are required)
-#
-# Examples:
-#   mozilla/nsprpub, NSPRPUB_CLIENT_TAG
-#   mozilla/gc, , 10/25/2000 12:00:00
-#
-
-mozilla/nsprpub,        	NETSCAPE_7_0_RTM
-mozilla/security/nss,   	NETSCAPE_7_0_RTM
-mozilla/security/manager,	NETSCAPE_7_0_RTM
-mozilla/accessible,			NETSCAPE_7_0_RTM
-mozilla/directory/c-sdk,	NETSCAPE_7_0_RTM
-mozilla/lib/mac/Instrumentation, 	NETSCAPE_7_0_RTM
-mozilla/gfx2, 				NETSCAPE_7_0_RTM
-mozilla/modules/libpr0n,	NETSCAPE_7_0_RTM
-SeaMonkeyAll, 				NETSCAPE_7_0_RTM
-
-## You need this if you want to be able to use SVG
-## Note that this library is under the LGPL, not the MPL
-#mozilla/other-licenses/libart_lgpl

mozilla/build/mac/build_scripts/PullMozilla.pl

@@ -1,79 +0,0 @@
-#!perl
-
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#   Simon Fraser <sfraser@netscape.com>
-#
-
-require 5.004;
-
-use strict;
-
-use Cwd;
-use Moz::BuildUtils;
-use Moz::BuildCore;
-
-#-------------------------------------------------------------
-# Where have the build options gone?
-# 
-# The various build flags have been centralized into one place. 
-# The master list of options is in MozBuildFlags.txt. However, 
-# you should never need to edit that file, or this one.
-# 
-# To customize what gets built, or where to start the build, 
-# edit the $prefs_file_name file in
-# System Folder:Preferences:Mozilla build prefs:
-# Documentation is provided in that file.
-#-------------------------------------------------------------
-
-my($prefs_file_name) = "Mozilla pull prefs";
-
-#-------------------------------------------------------------
-# hashes to hold build options
-#-------------------------------------------------------------
-my(%build);
-my(%options);
-my(%filepaths);
-my(%optiondefines);
-
-# Hash of input files for this build. Eventually, there will be
-# input files for manifests, and projects too.
-my(%inputfiles) = (
-  "buildflags",     "MozillaBuildFlags.txt",
-  "checkoutdata",   "MozillaCheckoutList.txt",
-  "buildprogress",  "",
-  "buildmodule",    "MozillaBuildList.pm",
-  "checkouttime",   "Mozilla last checkout"
-);
-#-------------------------------------------------------------
-# end build hashes
-#-------------------------------------------------------------
-
-# set the build root directory, which is the the dir above mozilla
-SetupBuildRootDir(":mozilla:build:mac:build_scripts");
-
-# Set up all the flags on $main::, like DEBUG, CARBON etc.
-# Override the defaults using the preferences files.
-SetupDefaultBuildOptions(0, ":mozilla:dist:viewer:", "");
-
-my($do_checkout)    = 1;
-my($do_build)       = 0;
-
-RunBuild($do_checkout, $do_build, \%inputfiles, $prefs_file_name);

mozilla/client.mak

@@ -1,511 +0,0 @@
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH=.
-
-!if !defined(MOZ_TOP)
-#enable builds from changed top level directories
-MOZ_TOP=mozilla
-!endif
-
-MOZ_SRC_FLIPPED = $(MOZ_SRC:\=/)
-MOZ_DIST_FLIPPED = $(MOZ_SRC_FLIPPED)/mozilla/dist
-!ifdef MOZ_DEBUG
-MOZ_OBJDIR = WIN32_D.OBJ
-!else
-MOZ_OBJDIR = WIN32_O.OBJ
-!endif
-
-#
-# Command macro defines
-#
-
-#//------------------------------------------------------------------------
-#// Figure out how to do the pull.
-#//------------------------------------------------------------------------
-# uncomment these, modify branch tag, and check in to branch for milestones
-MOZ_BRANCH=NETSCAPE_7_0_RTM
-NSPR_CO_TAG=NETSCAPE_7_0_RTM
-PSM_CO_TAG=NETSCAPE_7_0_RTM
-NSS_CO_TAG=NETSCAPE_7_0_RTM
-LDAPCSDK_CO_TAG=NETSCAPE_7_0_RTM
-ACCESSIBLE_CO_TAG=NETSCAPE_7_0_RTM
-IMGLIB2_CO_TAG=NETSCAPE_7_0_RTM
-GFX2_CO_TAG=NETSCAPE_7_0_RTM
-
-
-!ifdef MOZ_BRANCH
-CVS_BRANCH=-r $(MOZ_BRANCH)
-!endif
-
-!ifdef MOZ_DATE
-CVS_BRANCH=$(CVS_BRANCH) -D "$(MOZ_DATE)"
-!endif
-
-# default pull is "quiet" but it can be overridden with MOZ_CVS_VERBOSE
-!ifndef MOZ_CVS_VERBOSE
-CVS_FLAGS=-q
-!endif
-
-# honor any user-defined CVS flags
-!ifdef MOZ_CVS_FLAGS
-CVS_FLAGS=$(CVS_FLAGS) $(MOZ_CVS_FLAGS)
-!endif
-
-# let's be explicit about CVSROOT... some windows cvs clients
-# are too stupid to correctly work without the -d option 
-#
-#  if they are too stupid, they should fail.  I am
-#  commenting this out because this does not work
-#  under 4nt.  (%'s are evaluted differently)
-#
-#  If it breaks you, mail dougt@netscape.com
-#  and leaf@mozilla.org
-#
-!if 0
-!if defined(CVSROOT)
-CVS_FLAGS=$(CVS_FLAGS) -d "$(CVSROOT)"
-!endif
-!endif
-
-!ifndef MOZ_CO_FLAGS
-MOZ_CO_FLAGS = -P
-!endif
-
-CVSCO = cvs $(CVS_FLAGS) co $(MOZ_CO_FLAGS) $(CVS_BRANCH)
-
-#//------------------------------------------------------------------------
-#// Figure out how to pull NSPR.
-#// If no NSPR_CO_TAG is specified, use the default static tag
-#//------------------------------------------------------------------------
-
-!ifndef NSPR_CO_FLAGS
-NSPR_CO_FLAGS=$(MOZ_CO_FLAGS)
-!endif
-
-NSPR_CO_FLAGS=$(NSPR_CO_FLAGS) $(CVS_BRANCH)
-
-
-CVSCO_NSPR = cvs $(CVS_FLAGS) co $(NSPR_CO_FLAGS)
-
-#//------------------------------------------------------------------------
-#// Figure out how to pull NSS and PSM libs.
-#// If no NSS_CO_TAG or PSM_CO_TAG is specified, use the default static tag
-#//------------------------------------------------------------------------
-
-!ifndef NSS_CO_FLAGS
-NSS_CO_FLAGS=$(MOZ_CO_FLAGS)
-!endif
-
-NSS_CO_FLAGS=$(NSS_CO_FLAGS) $(CVS_BRANCH)
-
-CVSCO_NSS = cvs $(CVS_FLAGS) co $(NSS_CO_FLAGS)
-
-!ifndef PSM_CO_FLAGS
-PSM_CO_FLAGS=$(MOZ_CO_FLAGS)
-!endif
-
-PSM_CO_FLAGS=$(PSM_CO_FLAGS) $(CVS_BRANCH)
-
-CVSCO_PSM = cvs $(CVS_FLAGS) co $(PSM_CO_FLAGS)
-
-#//------------------------------------------------------------------------
-#// Figure out how to pull LDAP C SDK client libs.
-#// If no LDAPCSDK_CO_TAG is specified, use the default tag
-#//------------------------------------------------------------------------
-
-
-!ifndef LDAPCSDK_CO_FLAGS
-LDAPCSDK_CO_FLAGS=$(MOZ_CO_FLAGS)
-!endif
-
-LDAPCSDK_CO_FLAGS=$(LDAPCSDK_CO_FLAGS) $(CVS_BRANCH)
-
-CVSCO_LDAPCSDK = cvs $(CVS_FLAGS) co $(LDAPCSDK_CO_FLAGS)
-
-#//------------------------------------------------------------------------
-#// Figure out how to pull accessibility libs.
-#// If no ACCESSIBLE_CO_TAG is specified, use the default tag
-#//------------------------------------------------------------------------
-
-!ifndef ACCESSIBLE_CO_FLAGS
-ACCESSIBLE_CO_FLAGS=$(MOZ_CO_FLAGS)
-!endif
-
-ACCESSIBLE_CO_FLAGS=$(ACCESSIBLE_CO_FLAGS) $(CVS_BRANCH)
-
-CVSCO_ACCESSIBLE = cvs $(CVS_FLAGS) co $(ACCESSIBLE_CO_FLAGS)
-
-#//------------------------------------------------------------------------
-#// Figure out how to pull new image library.
-#// If no IMGLIB2_CO_TAG is specified, use the default tag
-#//------------------------------------------------------------------------
-
-!ifndef IMGLIB2_CO_FLAGS
-IMGLIB2_CO_FLAGS=$(MOZ_CO_FLAGS)
-!endif
-
-IMGLIB2_CO_FLAGS=$(IMGLIB2_CO_FLAGS) $(CVS_BRANCH)
-
-CVSCO_IMGLIB2 = cvs $(CVS_FLAGS) co $(IMGLIB2_CO_FLAGS)
-
-#//------------------------------------------------------------------------
-#// Figure out how to pull new image library.
-#// If no GFX2_CO_TAG is specified, use the default tag
-#//------------------------------------------------------------------------
-
-!ifndef GFX2_CO_FLAGS
-GFX2_CO_FLAGS=$(MOZ_CO_FLAGS)
-!endif
-
-GFX2_CO_FLAGS=$(GFX2_CO_FLAGS) $(CVS_BRANCH)
-
-CVSCO_GFX2 = cvs $(CVS_FLAGS) co $(GFX2_CO_FLAGS)
-
-#//------------------------------------------------------------------------
-#// Figure out how to pull the internal libart
-#// (only pulled and built if MOZ_INTERNAL_LIBART_LGPL is set)
-#// If no MOZ_INTERNAL_LIBART_CO_TAG is specified, use the default tag
-#//------------------------------------------------------------------------
-
-!if defined(MOZ_SVG) && !defined(MOZ_INTERNAL_LIBART_LGPL)
-ERR_MESSAGE = ^
-You are trying to build Mozilla with SVG support (MOZ_SVG=1), but you ^
-haven not specified that mozilla/other-licenses/libart_lgpl should be ^
-pulled and built. At the moment Mozilla SVG builds need this patched ^
-version of libart. You either need to disable SVG support (unset MOZ_SVG) ^
-or enable pulling and building by setting MOZ_INTERNAL_LIBART_LGPL=1.^
-^
-If you choose to pull and build libart, note that it is only licensed^
-under the terms of the LGPL, not the MPL. (Which is why you have to opt^
-in explicitly.)
-!endif
-
-!if defined(MOZ_INTERNAL_LIBART_LGPL)
-
-!ifndef MOZ_INTERNAL_LIBART_CO_FLAGS
-MOZ_INTERNAL_LIBART_CO_FLAGS=$(MOZ_CO_FLAGS)
-!endif
-
-!if "$(MOZ_INTERNAL_LIBART_CO_TAG)" != ""
-MOZ_INTERNAL_LIBART_CO_FLAGS=$(MOZ_INTERNAL_LIBART_CO_FLAGS) -r $(MOZ_INTERNAL_LIBART_CO_TAG)
-!else
-MOZ_INTERNAL_LIBART_CO_FLAGS=$(MOZ_INTERNAL_LIBART_CO_FLAGS) $(CVS_BRANCH)
-!endif
-
-CVSCO_MOZ_INTERNAL_LIBART = cvs $(CVS_FLAGS) co $(MOZ_INTERNAL_LIBART_CO_FLAGS)
-
-!endif
-
-## The master target
-############################################################
-
-pull_and_build_all: pull_all build_all_dep
-
-
-## Rules for pulling the source from the cvs repository
-############################################################
-
-pull_clobber_and_build_all: pull_all clobber_all build_all
-
-!if !defined(MOZ_INTERNAL_LIBART_LGPL)
-pull_all: pull_nspr pull_psm pull_ldapcsdk pull_accessible pull_gfx2 pull_imglib2 pull_seamonkey
-!else
-pull_all: pull_nspr pull_psm pull_ldapcsdk pull_accessible pull_gfx2 pull_imglib2 pull_moz_internal_libart pull_seamonkey
-!endif
-
-pull_nspr: pull_clientmak
-      cd $(MOZ_SRC)\.
-      $(CVSCO_NSPR) mozilla/nsprpub
-
-pull_nss:
-	cd $(MOZ_SRC)\.
-	$(CVSCO_NSS) mozilla/security/coreconf
-	$(CVSCO_NSS) mozilla/security/nss
-
-pull_psm: pull_nss
-	cd $(MOZ_SRC)\.
-	$(CVSCO_PSM) mozilla/security/manager
-	$(CVSCO_PSM) mozilla/security/makefile.win
-
-pull_ldapcsdk:
-	cd $(MOZ_SRC)\.
-	$(CVSCO_LDAPCSDK) mozilla/directory/c-sdk
-
-pull_accessible:
-	cd $(MOZ_SRC)\.
-	$(CVSCO_ACCESSIBLE) mozilla/accessible
-
-pull_gfx2:
-  cd $(MOZ_SRC)\.
-  $(CVSCO_GFX2) mozilla/gfx2
-
-pull_imglib2:
-  cd $(MOZ_SRC)\.
-  $(CVSCO_IMGLIB2) mozilla/modules/libpr0n
-
-!if defined(MOZ_INTERNAL_LIBART_LGPL)
-pull_moz_internal_libart:
-  cd $(MOZ_SRC)\.
-  $(CVSCO_MOZ_INTERNAL_LIBART) mozilla/other-licenses/libart_lgpl
-!endif
-
-pull_xpconnect: pull_nspr
-	cd $(MOZ_SRC)\.
-	$(CVSCO) mozilla/include
-	$(CVSCO) mozilla/config
-	$(CVSCO) -l mozilla/js
-	$(CVSCO) -l mozilla/js/src
-	$(CVSCO) mozilla/js/src/fdlibm
-	$(CVSCO) mozilla/js/src/xpconnect
-	$(CVSCO) mozilla/modules/libreg
-	$(CVSCO) mozilla/xpcom
-	$(CVSCO) mozilla/string
-
-# pull either layout only or seamonkey the browser
-pull_layout:
-	cd $(MOZ_SRC)\.
-	$(CVSCO) RaptorWin
-
-pull_seamonkey: pull_clientmak
-	cd $(MOZ_SRC)\.
-	$(CVSCO) SeaMonkeyAll
-
-pull_clientmak:
-    cd $(MOZ_SRC)\.
-    $(CVSCO) mozilla/client.mak
-
-############################################################
-
-# nmake has to be hardcoded, or we have to depend on mozilla/config
-# being pulled already to figure out what $(NMAKE) should be.
-
-clobber_all: clobber_nspr clobber_ldapcsdk clobber_psm clobber_seamonkey
-
-build_all: build_nspr build_ldapcsdk build_seamonkey
-
-build_all_dep: depend libs
-
-distclean: 
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\directory\c-sdk
-	gmake -f gmakefile.win distclean MOZ_SRC_FLIPPED=$(MOZ_SRC_FLIPPED)
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\nsprpub
-	gmake -f gmakefile.win distclean MOZ_SRC_FLIPPED=$(MOZ_SRC_FLIPPED)
-	@cd $(MOZ_SRC)\$(MOZ_TOP)
-	nmake /f client.mak clobber_psm
-	nmake /f client.mak clobber_seamonkey
-
-clobber_ldapcsdk:
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\directory\c-sdk
-	gmake -f gmakefile.win clobber_all MOZ_SRC_FLIPPED=$(MOZ_SRC_FLIPPED) \
-		SHELL=sh
-
-clobber_nspr: 
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\nsprpub
-	gmake -f gmakefile.win clobber_all MOZ_SRC_FLIPPED=$(MOZ_SRC_FLIPPED)
-
-clobber_psm:
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\security
-	nmake -f makefile.win clobber_all
-
-clobber_xpconnect:
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\.
-	-rd /s /q dist
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\nsprpub
-	gmake -f gmakefile.win clobber_all  MOZ_SRC_FLIPPED=$(MOZ_SRC_FLIPPED)
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\include
-	nmake -f makefile.win clobber_all
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\modules\libreg
-	nmake -f makefile.win clobber_all
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\string
-	nmake -f makefile.win clobber_all
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\xpcom
-	nmake -f makefile.win clobber_all
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\js
-	nmake -f makefile.win clobber_all
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\js\src\xpconnect
-	nmake -f makefile.win clobber_all
-
-clobber_seamonkey:
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\.
-	-rd /s /q dist
-	nmake -f makefile.win clobber_all 
-
-depend: export
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\.
-	nmake -f makefile.win depend 
-
-depend_xpconnect:
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\include
-	nmake -f makefile.win depend
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\modules\libreg
-	nmake -f makefile.win depend
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\string
-	nmake -f makefile.win depend
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\xpcom
-	nmake -f makefile.win depend
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\js\src
-	nmake -f makefile.win depend
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\js\src\xpconnect
-	nmake -f makefile.win depend
-
-build_nspr: 
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\nsprpub
-	gmake -f gmakefile.win MOZ_SRC_FLIPPED=$(MOZ_SRC_FLIPPED)
-
-build_ldapcsdk:
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\directory\c-sdk
-	gmake -f gmakefile.win MOZ_SRC_FLIPPED=$(MOZ_SRC_FLIPPED) SHELL=sh
-
-build_psm:
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\security
-	nmake -f makefile.win 
-
-build_xpconnect: build_nspr
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\include
-	nmake -f makefile.win all
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\modules\libreg
-	nmake -f makefile.win all
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\xpcom
-	nmake -f makefile.win export
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\string
-	nmake -f makefile.win all
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\xpcom
-	nmake -f makefile.win libs
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\js\src
-	nmake -f makefile.win all
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\js\src\xpconnect
-	nmake -f makefile.win all
-
-build_seamonkey:
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\.
-	nmake -f makefile.win all
-
-build_client:
-	@cd $(MOZ_SRC)\mozilla\.
-	nmake -f makefile.win all
-
-build_layout:
-	@cd $(MOZ_SRC)\mozilla\.
-	nmake -f makefile.win all
-
-build_dist:
-	@cd $(MOZ_SRC)\mozilla\.
-	nmake -f makefile.win all
-
-libs:
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\.
-	nmake -f makefile.win libs
-
-export: build_nspr build_ldapcsdk
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\.
-	nmake -f makefile.win export
-
-clobber_dist:
-	@cd $(MOZ_SRC)\mozilla\.
-	nmake -f makefile.win clobber_all
-
-clobber_client:
-	@cd $(MOZ_SRC)\mozilla\.
-	nmake -f makefile.win clobber_all
-
-clobber_layout:
-	@cd $(MOZ_SRC)\mozilla\.
-	nmake -f makefile.win clobber_all
-
-browse_info::
-	cd $(MOZ_SRC)\$(MOZ_TOP)
-	-dir /s /b *.sbr > sbrlist.tmp
-	-bscmake /Es /o mozilla.bsc @sbrlist.tmp
-	-rm sbrlist.tmp
-
-regchrome::
-	@cd $(MOZ_SRC)\mozilla\.
-	nmake /f makefile.win regchrome
-
-deliver::
-	@cd $(MOZ_SRC)\mozilla\.
-	nmake /f makefile.win splitsymbols
-
-#//------------------------------------------------------------------------
-#// Utility stuff...
-#//------------------------------------------------------------------------
-
-#//------------------------------------------------------------------------
-# Verify that MOZ_SRC is set correctly
-#//------------------------------------------------------------------------
-
-# Check to see if it is set at all
-!if "$(MOZ_SRC)"==""
-MOZ_SRC = $(MAKEDIR)\..
-!endif
-
-#
-# create a temp file at the root and make sure it is visible from MOZ_SRC
-#
-!if [copy $(MAKEDIR)\client.mak $(MAKEDIR)\xyzzy.tmp > NUL] == 0
-!endif
-
-!if !EXIST( $(MOZ_SRC)\mozilla\xyzzy.tmp )
-ERR_MESSAGE=$(ERR_MESSAGE)^
-MOZ_SRC isn't set correctly: [$(MOZ_SRC)\mozilla]!=[$(MAKEDIR)]
-!endif
-
-!if [del $(MAKEDIR)\xyzzy.tmp]
-!endif
-
-#//------------------------------------------------------------------------
-# Verify that MOZ_BITS is set
-#//------------------------------------------------------------------------
-!if !defined(MOZ_BITS)
-ERR_MESSAGE=$(ERR_MESSAGE)^
-Environment variable MOZ_BITS isn't set.
-!endif
-
-!if !defined(MOZ_TOOLS)
-ERR_MESSAGE=$(ERR_MESSAGE)^
-Environment variable MOZ_TOOLS isn't set.
-!endif
-
-
-#//------------------------------------------------------------------------
-#// Display error 
-#//------------------------------------------------------------------------
-
-!if "$(ERR_MESSAGE)" != ""
-ERR_MESSAGE = ^
-client.mak:  ^
-$(ERR_MESSAGE) ^
-^
-client.mak: usage^
-^
-nmake -f client.mak [MOZ_BRANCH=<cvs_branch_name>] ^
-		    [MOZ_DATE=<cvs_date>]^
-		    [pull_and_build_all]^
-		    [pull_all]^
-		    [build_all]^
-^
-Environment variables:^
-^
-MOZ_BITS    set to 32^
-MOZ_TOOLS   set to the directory containing the needed tools ^
-
-!ERROR $(ERR_MESSAGE)
-
-!endif

mozilla/client.mk

@@ -1,650 +0,0 @@
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): Stephen Lamm
-
-# Build the Mozilla client.
-#
-# This needs CVSROOT set to work, e.g.,
-#   setenv CVSROOT :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
-# or
-#   setenv CVSROOT :pserver:username%somedomain.org@cvs.mozilla.org:/cvsroot
-# 
-# To checkout and build a tree,
-#    1. cvs co mozilla/client.mk
-#    2. cd mozilla
-#    3. gmake -f client.mk
-#
-# Other targets (gmake -f client.mk [targets...]),
-#    checkout
-#    build
-#    clean (realclean is now the same as clean)
-#    distclean
-#
-# See http://www.mozilla.org/build/unix.html for more information.
-#
-# Options:
-#   MOZ_OBJDIR           - Destination object directory
-#   MOZ_CO_DATE          - Date tag to use for checkout (default: none)
-#   MOZ_CO_MODULE        - Module to checkout (default: SeaMonkeyAll)
-#   MOZ_CVS_FLAGS        - Flags to pass cvs (default: -q -z3)
-#   MOZ_CO_FLAGS         - Flags to pass after 'cvs co' (default: -P)
-#   MOZ_MAKE_FLAGS       - Flags to pass to $(MAKE)
-#   MOZ_CO_BRANCH        - Branch tag (Deprecated. Use MOZ_CO_TAG below.)
-#
-
-#######################################################################
-# Checkout Tags
-#
-# For branches, uncomment the MOZ_CO_TAG line with the proper tag,
-# and commit this file on that tag.
-MOZ_CO_TAG = NETSCAPE_7_0_RTM
-NSPR_CO_TAG = NETSCAPE_7_0_RTM
-PSM_CO_TAG = NETSCAPE_7_0_RTM
-NSS_CO_TAG = NETSCAPE_7_0_RTM
-LDAPCSDK_CO_TAG = NETSCAPE_7_0_RTM
-ACCESSIBLE_CO_TAG = NETSCAPE_7_0_RTM
-GFX2_CO_TAG = NETSCAPE_7_0_RTM
-IMGLIB2_CO_TAG = NETSCAPE_7_0_RTM
-BUILD_MODULES = all
-
-#######################################################################
-# Defines
-#
-CVS = cvs
-
-CWD := $(shell pwd)
-
-ifeq "$(CWD)" "/"
-CWD   := /.
-endif
-
-ifneq (, $(wildcard client.mk))
-# Ran from mozilla directory
-ROOTDIR   := $(shell dirname $(CWD))
-TOPSRCDIR := $(CWD)
-else
-# Ran from mozilla/.. directory (?)
-ROOTDIR   := $(CWD)
-TOPSRCDIR := $(CWD)/mozilla
-endif
-
-# on os2, TOPSRCDIR may have two forward slashes in a row, which doesn't
-#  work;  replace first instance with one forward slash
-TOPSRCDIR := $(shell echo "$(TOPSRCDIR)" | sed -e 's%//%/%')
-
-ifndef TOPSRCDIR_MOZ
-TOPSRCDIR_MOZ=$(TOPSRCDIR)
-endif
-
-# if ROOTDIR equals only drive letter (i.e. "C:"), set to "/"
-DIRNAME := $(shell echo "$(ROOTDIR)" | sed -e 's/^.://')
-ifeq ($(DIRNAME),)
-ROOTDIR := /.
-endif
-
-AUTOCONF := autoconf
-MKDIR := mkdir
-SH := /bin/sh
-ifndef MAKE
-MAKE := gmake
-endif
-
-CONFIG_GUESS_SCRIPT := $(wildcard $(TOPSRCDIR)/build/autoconf/config.guess)
-ifdef CONFIG_GUESS_SCRIPT
-  CONFIG_GUESS = $(shell $(CONFIG_GUESS_SCRIPT))
-else
-  _IS_FIRST_CHECKOUT := 1
-endif
-
-####################################
-# CVS
-
-# Add the CVS root to CVS_FLAGS if needed
-CVS_ROOT_IN_TREE := $(shell cat $(TOPSRCDIR)/CVS/Root 2>/dev/null)
-ifneq ($(CVS_ROOT_IN_TREE),)
-ifneq ($(CVS_ROOT_IN_TREE),$(CVSROOT))
-  CVS_FLAGS := -d $(CVS_ROOT_IN_TREE)
-endif
-endif
-
-CVSCO = $(strip $(CVS) $(CVS_FLAGS) co $(CVS_CO_FLAGS))
-CVSCO_LOGFILE := $(ROOTDIR)/cvsco.log
-CVSCO_LOGFILE := $(shell echo $(CVSCO_LOGFILE) | sed s%//%/%)
-
-ifdef MOZ_CO_TAG
-  CVS_CO_FLAGS := -r $(MOZ_CO_TAG)
-endif
-
-####################################
-# Load mozconfig Options
-
-# See build pages, http://www.mozilla.org/build/unix.html, 
-# for how to set up mozconfig.
-MOZCONFIG_LOADER := mozilla/build/autoconf/mozconfig2client-mk
-MOZCONFIG_FINDER := mozilla/build/autoconf/mozconfig-find 
-MOZCONFIG_MODULES := mozilla/build/unix/modules.mk
-run_for_side_effects := \
-  $(shell cd $(ROOTDIR); \
-     if test "$(_IS_FIRST_CHECKOUT)"; then \
-        $(CVSCO) $(MOZCONFIG_FINDER) $(MOZCONFIG_LOADER) $(MOZCONFIG_MODULES); \
-     else true; \
-     fi; \
-     $(MOZCONFIG_LOADER) $(TOPSRCDIR) mozilla/.mozconfig.mk > mozilla/.mozconfig.out)
-include $(TOPSRCDIR)/.mozconfig.mk
-include $(TOPSRCDIR)/build/unix/modules.mk
-
-####################################
-# Options that may come from mozconfig
-
-# Change CVS flags if anonymous root is requested
-ifdef MOZ_CO_USE_MIRROR
-  CVS_FLAGS := -d :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
-endif
-
-# MOZ_CVS_FLAGS - Basic CVS flags
-ifeq "$(origin MOZ_CVS_FLAGS)" "undefined"
-  CVS_FLAGS := $(CVS_FLAGS) -q -z 3 
-else
-  CVS_FLAGS := $(MOZ_CVS_FLAGS)
-endif
-
-# This option is deprecated. The best way to have client.mk pull a tag
-# is to set MOZ_CO_TAG (see above) and commit that change on the tag.
-ifdef MOZ_CO_BRANCH
-  $(warning Use MOZ_CO_TAG instead of MOZ_CO_BRANCH)
-  CVS_CO_FLAGS := -r $(MOZ_CO_BRANCH)
-endif
-
-# MOZ_CO_FLAGS - Anything that we should use on all checkouts
-ifeq "$(origin MOZ_CO_FLAGS)" "undefined"
-  CVS_CO_FLAGS := $(CVS_CO_FLAGS) -P
-else
-  CVS_CO_FLAGS := $(CVS_CO_FLAGS) $(MOZ_CO_FLAGS)
-endif
-
-ifdef MOZ_CO_DATE
-  CVS_CO_DATE_FLAGS := -D "$(MOZ_CO_DATE)"
-endif
-
-ifdef MOZ_OBJDIR
-  OBJDIR := $(MOZ_OBJDIR)
-  MOZ_MAKE := $(MAKE) $(MOZ_MAKE_FLAGS) -C $(OBJDIR)
-else
-  OBJDIR := $(TOPSRCDIR)
-  MOZ_MAKE := $(MAKE) $(MOZ_MAKE_FLAGS)
-endif
-
-####################################
-# CVS defines for PSM
-#
-PSM_CO_MODULE= mozilla/security/manager
-PSM_CO_FLAGS := -P -A
-ifdef MOZ_CO_FLAGS
-  PSM_CO_FLAGS := $(MOZ_CO_FLAGS)
-endif
-ifdef PSM_CO_TAG
-  PSM_CO_FLAGS := $(PSM_CO_FLAGS) -r $(PSM_CO_TAG)
-endif
-CVSCO_PSM = $(CVS) $(CVS_FLAGS) co $(PSM_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(PSM_CO_MODULE)
-
-####################################
-# CVS defines for NSS
-#
-NSS_CO_MODULE = mozilla/security/nss \
-		mozilla/security/coreconf \
-		$(NULL)
-
-NSS_CO_FLAGS := -P
-ifdef MOZ_CO_FLAGS
-  NSS_CO_FLAGS := $(MOZ_CO_FLAGS)
-endif
-ifdef NSS_CO_TAG
-   NSS_CO_FLAGS := $(NSS_CO_FLAGS) -r $(NSS_CO_TAG)
-endif
-# Cannot pull static tags by date
-ifeq ($(NSS_CO_TAG),NSS_CLIENT_TAG)
-CVSCO_NSS = $(CVS) $(CVS_FLAGS) co $(NSS_CO_FLAGS) $(NSS_CO_MODULE)
-else
-CVSCO_NSS = $(CVS) $(CVS_FLAGS) co $(NSS_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(NSS_CO_MODULE)
-endif
-
-####################################
-# CVS defines for NSPR
-#
-NSPR_CO_MODULE = mozilla/nsprpub
-NSPR_CO_FLAGS := -P
-ifdef MOZ_CO_FLAGS
-  NSPR_CO_FLAGS := $(MOZ_CO_FLAGS)
-endif
-ifdef NSPR_CO_TAG
-  NSPR_CO_FLAGS := $(NSPR_CO_FLAGS) -r $(NSPR_CO_TAG)
-endif
-# Cannot pull static tags by date
-ifeq ($(NSPR_CO_TAG),NSPRPUB_CLIENT_TAG)
-CVSCO_NSPR = $(CVS) $(CVS_FLAGS) co $(NSPR_CO_FLAGS) $(NSPR_CO_MODULE)
-else
-CVSCO_NSPR = $(CVS) $(CVS_FLAGS) co $(NSPR_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(NSPR_CO_MODULE)
-endif
-
-####################################
-# CVS defines for the C LDAP SDK
-#
-LDAPCSDK_CO_MODULE = mozilla/directory/c-sdk
-LDAPCSDK_CO_FLAGS := -P
-ifdef MOZ_CO_FLAGS
-  LDAPCSDK_CO_FLAGS := $(MOZ_CO_FLAGS)
-endif
-ifdef LDAPCSDK_CO_TAG
-  LDAPCSDK_CO_FLAGS := $(LDAPCSDK_CO_FLAGS) -r $(LDAPCSDK_CO_TAG)
-endif
-CVSCO_LDAPCSDK = $(CVS) $(CVS_FLAGS) co $(LDAPCSDK_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(LDAPCSDK_CO_MODULE)
-
-####################################
-# CVS defines for the C LDAP SDK
-#
-ACCESSIBLE_CO_MODULE = mozilla/accessible
-ACCESSIBLE_CO_FLAGS := -P
-ifdef MOZ_CO_FLAGS
-  ACCESSIBLE_CO_FLAGS := $(MOZ_CO_FLAGS)
-endif
-ifdef ACCESSIBLE_CO_TAG
-  ACCESSIBLE_CO_FLAGS := $(ACCESSIBLE_CO_FLAGS) -r $(ACCESSIBLE_CO_TAG)
-endif
-CVSCO_ACCESSIBLE = $(CVS) $(CVS_FLAGS) co $(ACCESSIBLE_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(ACCESSIBLE_CO_MODULE)
-
-####################################
-# CVS defines for gfx2
-#
-GFX2_CO_MODULE = mozilla/gfx2
-GFX2_CO_FLAGS := -P
-ifdef MOZ_CO_FLAGS
-  GFX2_CO_FLAGS := $(MOZ_CO_FLAGS)
-endif
-ifdef GFX2_CO_TAG
-  GFX2_CO_FLAGS := $(GFX2_CO_FLAGS) -r $(GFX2_CO_TAG)
-endif
-CVSCO_GFX2 = $(CVS) $(CVS_FLAGS) co $(GFX2_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(GFX2_CO_MODULE)
-
-####################################
-# CVS defines for new image library
-#
-IMGLIB2_CO_MODULE = mozilla/modules/libpr0n
-IMGLIB2_CO_FLAGS := -P
-ifdef MOZ_CO_FLAGS
-  IMGLIB2_CO_FLAGS := $(MOZ_CO_FLAGS)
-endif
-ifdef IMGLIB2_CO_TAG
-  IMGLIB2_CO_FLAGS := $(IMGLIB2_CO_FLAGS) -r $(IMGLIB2_CO_TAG)
-endif
-CVSCO_IMGLIB2 = $(CVS) $(CVS_FLAGS) co $(IMGLIB2_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(IMGLIB2_CO_MODULE)
-
-####################################
-# CVS defines for standalone modules
-#
-ifneq ($(BUILD_MODULES),all)
-  MOZ_CO_MODULE := $(filter-out $(NSPRPUB_DIR) security directory/c-sdk, $(BUILD_MODULE_CVS))
-  MOZ_CO_MODULE += allmakefiles.sh client.mk aclocal.m4 configure configure.in
-  MOZ_CO_MODULE += Makefile.in
-  MOZ_CO_MODULE := $(addprefix mozilla/, $(MOZ_CO_MODULE))
-
-  NOSUBDIRS_MODULE := $(addprefix mozilla/, $(BUILD_MODULE_CVS_NS))
-ifneq ($(NOSUBDIRS_MODULE),)
-  CVSCO_NOSUBDIRS := $(CVSCO) -l $(CVS_CO_DATE_FLAGS) $(NOSUBDIRS_MODULE)
-endif
-
-ifeq (,$(filter $(NSPRPUB_DIR), $(BUILD_MODULE_CVS)))
-  CVSCO_NSPR :=
-endif
-ifeq (,$(filter security security/manager, $(BUILD_MODULE_CVS)))
-  CVSCO_PSM :=
-  CVSCO_NSS :=
-endif
-ifeq (,$(filter directory/c-sdk, $(BUILD_MODULE_CVS)))
-  CVSCO_LDAPCSDK :=
-endif
-ifeq (,$(filter accessible, $(BUILD_MODULE_CVS)))
-  CVSCO_ACCESSIBLE :=
-endif
-ifeq (,$(filter gfx2, $(BUILD_MODULE_CVS)))
-  CVSCO_GFX2 :=
-endif
-ifeq (,$(filter modules/libpr0n, $(BUILD_MODULE_CVS)))
-  CVSCO_IMGLIB2 :=
-endif
-endif
-
-####################################
-# CVS defines for SeaMonkey
-#
-ifeq ($(MOZ_CO_MODULE),)
-  MOZ_CO_MODULE := SeaMonkeyAll
-endif
-CVSCO_SEAMONKEY := $(CVSCO) $(CVS_CO_DATE_FLAGS) $(MOZ_CO_MODULE)
-
-####################################
-# CVS defined for libart (pulled and built if MOZ_INTERNAL_LIBART_LGPL is set)
-#
-CVSCO_LIBART := $(CVSCO) $(CVS_CO_DATE_FLAGS) mozilla/other-licenses/libart_lgpl
-
-ifdef MOZ_INTERNAL_LIBART_LGPL
-FASTUPDATE_LIBART := fast_update $(CVSCO_LIBART)
-CHECKOUT_LIBART := cvs_co $(CVSCO_LIBART)
-else
-CHECKOUT_LIBART := true
-FASTUPDATE_LIBART := true
-endif
-
-####################################
-# CVS defines for Calendar (pulled and built if MOZ_CALENDAR is set)
-#
-CVSCO_CALENDAR := $(CVSCO) $(CVS_CO_DATE_FLAGS) mozilla/calendar
-
-ifdef MOZ_CALENDAR
-FASTUPDATE_CALENDAR := fast_update $(CVSCO_CALENDAR)
-CHECKOUT_CALENDAR := cvs_co $(CVSCO_CALENDAR)
-else
-CHECKOUT_CALENDAR := true
-FASTUPDATE_CALENDAR := true
-endif
-
-
-# because some cygwin tools can't handle native dos-drive paths & vice-versa
-# force configure to use a relative path for --srcdir
-# need a better check for win32
-# and we need to get OBJDIR earlier
-ifdef MOZ_TOOLS
-_tmpobjdir := $(shell cygpath -u $(OBJDIR))
-_abs2rel := $(shell cygpath -w $(TOPSRCDIR)/build/unix/abs2rel.pl | sed -e 's|\\|/|g')
-_OBJ2SRCPATH := $(shell $(_abs2rel) $(TOPSRCDIR) $(_tmpobjdir))
-endif 
-
-#######################################################################
-# Rules
-# 
-
-# Print out any options loaded from mozconfig.
-all build checkout clean depend distclean export libs install realclean::
-	@if test -f .mozconfig.out; then \
-	  cat .mozconfig.out; \
-	  rm -f .mozconfig.out; \
-	else true; \
-	fi
-
-ifdef _IS_FIRST_CHECKOUT
-all:: checkout build
-else
-all:: checkout alldep
-endif
-
-# Windows equivalents
-pull_all: checkout
-build_all: build
-build_all_dep: alldep
-build_all_depend: alldep
-clobber clobber_all: clean
-pull_and_build_all: checkout alldep
-
-# Do everything from scratch
-everything: checkout clean build
-
-####################################
-# CVS checkout
-#
-checkout::
-#	@: Backup the last checkout log.
-	@if test -f $(CVSCO_LOGFILE) ; then \
-	  mv $(CVSCO_LOGFILE) $(CVSCO_LOGFILE).old; \
-	else true; \
-	fi
-ifdef RUN_AUTOCONF_LOCALLY
-	@echo "Removing local configures" ; \
-	cd $(ROOTDIR) && \
-	$(RM) -f mozilla/configure mozilla/nsprpub/configure \
-		mozilla/directory/c-sdk/configure
-endif
-	@echo "checkout start: "`date` | tee $(CVSCO_LOGFILE)
-	@echo '$(CVSCO) mozilla/client.mk mozilla/build/unix/modules.mk'; \
-        cd $(ROOTDIR) && \
-	$(CVSCO) mozilla/client.mk mozilla/build/unix/modules.mk
-	@cd $(ROOTDIR) && $(MAKE) -f mozilla/client.mk real_checkout
-
-real_checkout:
-#	@: Start the checkout. Split the output to the tty and a log file. \
-#	 : If it fails, touch an error file because "tee" hides the error.
-	@failed=.cvs-failed.tmp; rm -f $$failed*; \
-	cvs_co() { echo "$$@" ; \
-	  ("$$@" || touch $$failed) 2>&1 | tee -a $(CVSCO_LOGFILE) && \
-	  if test -f $$failed; then false; else true; fi; }; \
-	cvs_co $(CVSCO_NSPR) && \
-	cvs_co $(CVSCO_NSS) && \
-	cvs_co $(CVSCO_PSM) && \
-        cvs_co $(CVSCO_LDAPCSDK) && \
-        cvs_co $(CVSCO_ACCESSIBLE) && \
-        cvs_co $(CVSCO_GFX2) && \
-        cvs_co $(CVSCO_IMGLIB2) && \
-	$(CHECKOUT_CALENDAR) && \
-	$(CHECKOUT_LIBART) && \
-	cvs_co $(CVSCO_SEAMONKEY) && \
-	cvs_co $(CVSCO_NOSUBDIRS)
-	@echo "checkout finish: "`date` | tee -a $(CVSCO_LOGFILE)
-#	@: Check the log for conflicts. ;
-	@conflicts=`egrep "^C " $(CVSCO_LOGFILE)` ;\
-	if test "$$conflicts" ; then \
-	  echo "$(MAKE): *** Conflicts during checkout." ;\
-	  echo "$$conflicts" ;\
-	  echo "$(MAKE): Refer to $(CVSCO_LOGFILE) for full log." ;\
-	  false; \
-	else true; \
-	fi
-ifdef RUN_AUTOCONF_LOCALLY
-	@echo Generating configures using $(AUTOCONF) ; \
-	cd $(TOPSRCDIR) && $(AUTOCONF) && \
-	cd $(TOPSRCDIR)/nsprpub && $(AUTOCONF) && \
-	cd $(TOPSRCDIR)/directory/c-sdk && $(AUTOCONF)
-endif
-
-fast-update:
-#	@: Backup the last checkout log.
-	@if test -f $(CVSCO_LOGFILE) ; then \
-	  mv $(CVSCO_LOGFILE) $(CVSCO_LOGFILE).old; \
-	else true; \
-	fi
-ifdef RUN_AUTOCONF_LOCALLY
-	@echo "Removing local configures" ; \
-	cd $(ROOTDIR) && \
-	$(RM) -f mozilla/configure mozilla/nsprpub/configure \
-		mozilla/directory/c-sdk/configure
-endif
-	@echo "checkout start: "`date` | tee $(CVSCO_LOGFILE)
-	@echo '$(CVSCO) mozilla/client.mk mozilla/build/unix/modules.mk'; \
-        cd $(ROOTDIR) && \
-	$(CVSCO) mozilla/client.mk mozilla/build/unix/modules.mk
-	@cd $(TOPSRCDIR) && \
-	$(MAKE) -f client.mk real_fast-update
-
-real_fast-update:
-#	@: Start the update. Split the output to the tty and a log file. \
-#	 : If it fails, touch an error file because "tee" hides the error.
-	@failed=.fast_update-failed.tmp; rm -f $$failed*; \
-	fast_update() { (config/cvsco-fast-update.pl $$@ || touch $$failed) 2>&1 | tee -a $(CVSCO_LOGFILE) && \
-	  if test -f $$failed; then false; else true; fi; }; \
-	cvs_co() { echo "$$@" ; \
-	  ("$$@" || touch $$failed) 2>&1 | tee -a $(CVSCO_LOGFILE) && \
-	  if test -f $$failed; then false; else true; fi; }; \
-	fast_update $(CVSCO_NSPR) && \
-	cd $(ROOTDIR) && \
-	failed=mozilla/.fast_update-failed.tmp && \
-	cvs_co $(CVSCO_NSS) && \
-	failed=.fast_update-failed.tmp && \
-	cd mozilla && \
-	fast_update $(CVSCO_PSM) && \
-	fast_update $(CVSCO_LDAPCSDK) && \
-	fast_update $(CVSCO_ACCESSIBLE) && \
-	fast_update $(CVSCO_GFX2) && \
-	fast_update $(CVSCO_IMGLIB2) && \
-	$(FASTUPDATE_CALENDAR) && \
-	$(FASTUPDATE_LIBART) && \
-	fast_update $(CVSCO_SEAMONKEY) && \
-	fast_update $(CVSCO_NOSUBDIRS)
-	@echo "fast_update finish: "`date` | tee -a $(CVSCO_LOGFILE)
-#	@: Check the log for conflicts. ;
-	@conflicts=`egrep "^C " $(CVSCO_LOGFILE)` ;\
-	if test "$$conflicts" ; then \
-	  echo "$(MAKE): *** Conflicts during fast-update." ;\
-	  echo "$$conflicts" ;\
-	  echo "$(MAKE): Refer to $(CVSCO_LOGFILE) for full log." ;\
-	  false; \
-	else true; \
-	fi
-ifdef RUN_AUTOCONF_LOCALLY
-	@echo Generating configures using $(AUTOCONF) ; \
-	cd $(TOPSRCDIR) && $(AUTOCONF) && \
-	cd $(TOPSRCDIR)/nsprpub && $(AUTOCONF) && \
-	cd $(TOPSRCDIR)/directory/c-sdk && $(AUTOCONF)
-endif
-
-####################################
-# Web configure
-
-WEBCONFIG_FILE  := $(HOME)/.mozconfig
-
-MOZCONFIG2CONFIGURATOR := build/autoconf/mozconfig2configurator
-webconfig:
-	@cd $(TOPSRCDIR); \
-	url=`$(MOZCONFIG2CONFIGURATOR) $(TOPSRCDIR)`; \
-	echo Running mozilla with the following url: ;\
-	echo ;\
-	echo $$url ;\
-	mozilla -remote "openURL($$url)" || \
-	netscape -remote "openURL($$url)" || \
-	mozilla $$url || \
-	netscape $$url ;\
-	echo ;\
-	echo   1. Fill out the form on the browser. ;\
-	echo   2. Save the results to $(WEBCONFIG_FILE)
-
-#####################################################
-# First Checkout
-
-ifdef _IS_FIRST_CHECKOUT
-# First time, do build target in a new process to pick up new files.
-build::
-	$(MAKE) -f $(TOPSRCDIR)/client.mk build
-else
-
-#####################################################
-# After First Checkout
-
-
-####################################
-# Configure
-
-CONFIG_STATUS := $(wildcard $(OBJDIR)/config.status)
-CONFIG_CACHE  := $(wildcard $(OBJDIR)/config.cache)
-
-ifdef RUN_AUTOCONF_LOCALLY
-EXTRA_CONFIG_DEPS := \
-	$(TOPSRCDIR)/aclocal.m4 \
-	$(wildcard $(TOPSRCDIR)/build/autoconf/*.m4) \
-	$(NULL)
-
-$(TOPSRCDIR)/configure: $(TOPSRCDIR)/configure.in $(EXTRA_CONFIG_DEPS)
-	@echo Generating $@ using autoconf
-	cd $(TOPSRCDIR); $(AUTOCONF)
-endif
-
-CONFIG_STATUS_DEPS_L10N := $(wildcard $(TOPSRCDIR)/l10n/makefiles.all)
-
-CONFIG_STATUS_DEPS := \
-	$(TOPSRCDIR)/configure \
-	$(TOPSRCDIR)/allmakefiles.sh \
-	$(TOPSRCDIR)/.mozconfig.mk \
-	$(wildcard $(TOPSRCDIR)/nsprpub/configure) \
-	$(wildcard $(TOPSRCDIR)/directory/c-sdk/configure) \
-	$(wildcard $(TOPSRCDIR)/mailnews/makefiles) \
-	$(CONFIG_STATUS_DEPS_L10N) \
-	$(wildcard $(TOPSRCDIR)/themes/makefiles) \
-	$(NULL)
-
-# configure uses the program name to determine @srcdir@. Calling it without
-#   $(TOPSRCDIR) will set @srcdir@ to "."; otherwise, it is set to the full
-#   path of $(TOPSRCDIR).
-ifeq ($(TOPSRCDIR),$(OBJDIR))
-  CONFIGURE := ./configure
-else
-  CONFIGURE := $(TOPSRCDIR)/configure
-endif
-
-ifdef _OBJ2SRCPATH
-CONFIGURE_ARGS := --srcdir=$(_OBJ2SRCPATH) $(CONFIGURE_ARGS)
-endif
-
-$(OBJDIR)/Makefile $(OBJDIR)/config.status: $(CONFIG_STATUS_DEPS)
-	@if test ! -d $(OBJDIR); then $(MKDIR) $(OBJDIR); else true; fi
-	@echo cd $(OBJDIR);
-	@echo $(CONFIGURE) $(CONFIGURE_ARGS)
-	@cd $(OBJDIR) && $(CONFIGURE_ENV_ARGS) $(CONFIGURE) $(CONFIGURE_ARGS) \
-	  || ( echo "*** Fix above errors and then restart with\
-               \"$(MAKE) -f client.mk build\"" && exit 1 )
-	@touch $(OBJDIR)/Makefile
-
-ifdef CONFIG_STATUS
-$(OBJDIR)/config/autoconf.mk: $(TOPSRCDIR)/config/autoconf.mk.in
-	cd $(OBJDIR); \
-	  CONFIG_FILES=config/autoconf.mk ./config.status
-endif
-
-
-####################################
-# Depend
-
-depend:: $(OBJDIR)/Makefile $(OBJDIR)/config.status
-	$(MOZ_MAKE) export && $(MOZ_MAKE) depend
-
-####################################
-# Build it
-
-build::  $(OBJDIR)/Makefile $(OBJDIR)/config.status
-	$(MOZ_MAKE)
-
-####################################
-# Other targets
-
-# Pass these target onto the real build system
-install export libs clean realclean distclean alldep:: $(OBJDIR)/Makefile $(OBJDIR)/config.status
-	$(MOZ_MAKE) $@
-
-cleansrcdir:
-	@cd $(TOPSRCDIR); \
-        if [ -f webshell/embed/gtk/Makefile ]; then \
-          $(MAKE) -C webshell/embed/gtk distclean; \
-        fi; \
-	if [ -f Makefile ]; then \
-	  $(MAKE) distclean ; \
-	else \
-	  echo "Removing object files from srcdir..."; \
-	  rm -fr `find . -type d \( -name .deps -print -o -name CVS \
-	          -o -exec test ! -d {}/CVS \; \) -prune \
-	          -o \( -name '*.[ao]' -o -name '*.so' \) -type f -print`; \
-	   build/autoconf/clean-config.sh; \
-	fi;
-
-# (! IS_FIRST_CHECKOUT)
-endif
-
-.PHONY: checkout real_checkout depend build export libs alldep install clean realclean distclean cleansrcdir pull_all build_all clobber clobber_all pull_and_build_all everything

mozilla/widget/Makefile.in

@@ -0,0 +1,28 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+DEPTH		= ..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS		= public src
+
+include $(topsrcdir)/config/rules.mk
+

mozilla/widget/build.bat

@@ -0,0 +1,21 @@
+rem -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+rem 
+rem  The contents of this file are subject to the Netscape Public License
+rem  Version 1.0 (the "NPL"); you may not use this file except in
+rem  compliance with the NPL.  You may obtain a copy of the NPL at
+rem  http://www.mozilla.org/NPL/
+rem 
+rem  Software distributed under the NPL is distributed on an "AS IS" basis,
+rem  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+rem  for the specific language governing rights and limitations under the
+rem  NPL.
+rem 
+rem  The Initial Developer of this code under the NPL is Netscape
+rem  Communications Corporation.  Portions created by Netscape are
+rem  Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+rem  Reserved.
+rem 
+
+del s:\ns\raptor\ui\src\windows\win32_d.obj\%1.obj
+del s:\ns\raptor\ui\tests\windows\win32_d.obj\winmain.obj
+nmake -f makefile.win

mozilla/widget/macbuild/Widget.prefix

@@ -0,0 +1,11 @@
+//
+// Widget.Prefix
+//
+// Global prefix file for the Widget project.
+//
+
+#include "MacPrefix.h"
+
+#include <Quickdraw.h>
+#include <Events.h>
+#include <MacWindows.h>

mozilla/widget/macbuild/WidgetDebug.prefix

@@ -0,0 +1,11 @@
+//
+// WidgetDebug.Prefix
+//
+// Global prefix file for the debug Widget project.
+//
+
+#include "MacPrefix_debug.h"
+
+#include <Quickdraw.h>
+#include <Events.h>
+#include <MacWindows.h>

mozilla/widget/macbuild/WidgetSharedDebugPrefix.h

@@ -0,0 +1,22 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#define MAC_SHARED 1
+#define _IMPL_NS_WIDGET 1
+
+#include "WidgetDebug.prefix"

mozilla/widget/macbuild/WidgetSharedPrefix.h

@@ -0,0 +1,22 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#define MAC_SHARED 1
+#define _IMPL_NS_WIDGET 1
+
+#include "Widget.prefix"

mozilla/widget/macbuild/WidgetStaticDebugPrefix.h

@@ -0,0 +1,21 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#define MAC_STATIC 1
+
+#include "WidgetDebug.prefix"

mozilla/widget/macbuild/WidgetStaticPrefix.h

@@ -0,0 +1,21 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#define MAC_STATIC 1
+
+#include "Widget.prefix"

mozilla/widget/macbuild/widget.toc

@@ -0,0 +1,35 @@
+# target: widgetDebug.shlb
+mozilla/widget/src/mac/nsAppShell.cpp
+mozilla/widget/src/mac/nsButton.cpp
+mozilla/widget/src/mac/nsCheckButton.cpp
+mozilla/widget/src/mac/nsFileWidget.cpp
+mozilla/widget/src/mac/nsLookAndFeel.cpp
+mozilla/widget/src/mac/nsMacControl.cpp
+mozilla/widget/src/mac/nsMacEventHandler.cpp
+mozilla/widget/src/mac/nsMacMessagePump.cpp
+mozilla/widget/src/mac/nsMacMessageSink.cpp
+mozilla/widget/src/mac/nsMacWindow.cpp
+mozilla/widget/src/mac/nsMenu.cpp
+mozilla/widget/src/mac/nsMenuBar.cpp
+mozilla/widget/src/mac/nsMenuItem.cpp
+mozilla/widget/src/mac/nsRadioButton.cpp
+mozilla/widget/src/mac/nsScrollbar.cpp
+mozilla/widget/src/mac/nsTextAreaWidget.cpp
+mozilla/widget/src/mac/nsTextWidget.cpp
+mozilla/widget/src/mac/nsToolkit.cpp
+mozilla/widget/src/mac/nsWidgetFactory.cpp
+mozilla/widget/src/mac/nsWidgetSupport.cpp
+mozilla/widget/src/mac/nsWindow.cpp
+mozilla/widget/src/xpwidgets/nsBaseWidget.cpp
+mozilla/widget/src/xpwidgets/nsHTColumn.cpp
+mozilla/widget/src/xpwidgets/nsHTControlStripItem.cpp
+mozilla/widget/src/xpwidgets/nsHTDataModel.cpp
+mozilla/widget/src/xpwidgets/nsHTItem.cpp
+mozilla/widget/src/xpwidgets/nsHTTreeDataModel.cpp
+mozilla/widget/src/xpwidgets/nsHTTreeItem.cpp
+mozilla/widget/src/xpwidgets/nsImageButton.cpp
+mozilla/widget/src/xpwidgets/nsMenuButton.cpp
+mozilla/widget/src/xpwidgets/nsToolbar.cpp
+mozilla/widget/src/xpwidgets/nsToolbarItemHolder.cpp
+mozilla/widget/src/xpwidgets/nsToolbarManager.cpp
+mozilla/widget/src/xpwidgets/nsTreeView.cpp

mozilla/widget/makefile.win

@@ -0,0 +1,23 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH=..
+
+
+DIRS=public timer src
+
+include <$(DEPTH)\config\rules.mak>

mozilla/widget/public/MANIFEST

@@ -0,0 +1,33 @@
+#
+# This is a list of local files which get copied to the mozilla:dist:widget directory
+#
+
+nsIDragSessionMac.h
+nsIWidget.h
+nsIKBStateControl.h
+nsIButton.h
+nsICheckButton.h
+nsIListWidget.h
+nsIComboBox.h
+nsITextWidget.h
+nsITextAreaWidget.h
+nsIComboBox.h
+nsIListBox.h
+nsIScrollbar.h
+nsGUIEvent.h
+nsIRadioButton.h
+nsIMouseListener.h
+nsIEventListener.h
+nsIFileWidget.h
+nsIMenuListener.h
+nsWidgetsCID.h
+nsILabel.h
+nsILookAndFeel.h
+nsWidgetSupport.h
+nsIMenu.h
+nsIMenuBar.h
+nsIMenuItem.h
+nsIPopUpMenu.h
+nsIKeyBindMgr.h
+nsStringUtil.h
+nsIContextMenu.h

mozilla/widget/public/MANIFEST_IDL

@@ -0,0 +1,16 @@
+#
+# This is a list of local files which get copied to the mozilla:dist:idl directory
+#
+
+nsIAppShell.idl
+nsIFilePicker.idl
+nsIFileSpecWithUI.idl
+nsISound.idl
+nsIToolkit.idl
+nsITransferable.idl
+nsIDragSession.idl
+nsIDragService.idl
+nsIFormatConverter.idl
+nsIClipboard.idl
+nsIClipboardOwner.idl
+nsIRollupListener.idl

mozilla/widget/public/Makefile.in

@@ -0,0 +1,92 @@
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH		= ../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= raptor
+XPIDL_MODULE	= widget
+
+EXPORTS		= \
+		nsIFontSizeIterator.h \
+		nsIFontNameIterator.h \
+		nsIFontRetrieverService.h \
+		nsIMenuBar.h \
+		nsIMenu.h \
+		nsIMenuItem.h \
+		nsIPopUpMenu.h \
+		nsIFileWidget.h \
+		nsStringUtil.h \
+		nsIKBStateControl.h \
+		nsIButton.h \
+		nsICheckButton.h \
+		nsIListWidget.h \
+		nsIComboBox.h \
+		nsITextWidget.h \
+		nsITextAreaWidget.h \
+		nsIComboBox.h \
+		nsIListBox.h \
+		nsIScrollbar.h \
+		nsGUIEvent.h \
+		nsIRadioButton.h \
+		nsIMouseListener.h \
+		nsIEventListener.h \
+		nsIMenuListener.h \
+		nsWidgetsCID.h \
+		nsILookAndFeel.h \
+		nsILabel.h \
+		nsIMenuBar.h \
+		nsIMenu.h \
+		nsIMenuItem.h \
+		nsIPopUpMenu.h \
+		nsIFontNameIterator.h \
+		nsIFontSizeIterator.h \
+		nsIFontRetrieverService.h \
+		nsIContextMenu.h \
+		$(NULL)
+
+XPIDLSRCS	= \
+		nsIAppShell.idl \
+		nsIFilePicker.idl \
+		nsIFileSpecWithUI.idl \
+		nsIToolkit.idl \
+		nsISound.idl \
+		nsITransferable.idl \
+		nsIDragSession.idl \
+		nsIDragService.idl \
+		nsIFormatConverter.idl \
+		nsIClipboard.idl \
+		nsIClipboardOwner.idl \
+		nsIRollupListener.idl \
+		nsIWidget.idl \
+		nsIWindow.idl \
+		$(NULL)
+
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
+
+include $(topsrcdir)/config/rules.mk
+
+DEFINES		+= -D_IMPL_NS_UI
+

mozilla/widget/public/makefile.win

@@ -0,0 +1,78 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+
+DEPTH=..\..
+
+
+DEFINES=-D_IMPL_NS_UI 
+MODULE=raptor 
+XPIDL_MODULE=widget
+
+XPIDLSRCS =               \
+  .\nsIAppShell.idl \
+  .\nsIFilePicker.idl          \
+  .\nsIFileSpecWithUI.idl          \
+  .\nsISound.idl          \
+  .\nsIToolkit.idl        \
+  .\nsITransferable.idl          \
+  .\nsIDragSession.idl          \
+  .\nsIDragService.idl          \
+  .\nsIFormatConverter.idl          \
+  .\nsIClipboard.idl            \
+  .\nsIClipboardOwner.idl       \
+  .\nsIRollupListener.idl \
+  $(NULL)
+
+EXPORTS=\
+  nsIFontSizeIterator.h \
+  nsIFontNameIterator.h \
+  nsIFontRetrieverService.h \
+  nsIFileWidget.h            \
+  nsIWidget.h \
+  nsIKBStateControl.h \
+  nsIButton.h \
+  nsICheckButton.h \
+  nsIListWidget.h \
+  nsIComboBox.h \
+  nsITextWidget.h \
+  nsITextAreaWidget.h \
+  nsIComboBox.h \
+  nsIListBox.h \
+  nsIScrollbar.h \
+  nsGUIEvent.h \
+  nsIRadioButton.h \
+  nsIMouseListener.h \
+  nsIEventListener.h \
+  nsIMenuListener.h \
+  nsWidgetsCID.h \
+  nsStringUtil.h \
+  nsILookAndFeel.h \
+  nsILabel.h \
+  nsIMenuBar.h \
+  nsIMenu.h \
+  nsIMenuItem.h \
+  nsIContextMenu.h \
+  nsIPopUpMenu.h \
+  $(NULL)
+
+
+include <$(DEPTH)\config\rules.mak>
+

mozilla/widget/public/nsGUIEvent.h

@@ -0,0 +1,509 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsGUIEvent_h__
+#define nsGUIEvent_h__
+
+#include "nsPoint.h"
+#include "nsRect.h"
+
+class nsIRenderingContext;
+class nsIRegion;
+class nsIWidget;
+class nsIMenuItem;
+
+/**
+ * Return status for event processors.
+ */
+
+enum nsEventStatus {  
+    /// The event is ignored, do default processing
+  nsEventStatus_eIgnore,            
+    /// The event is consumed, don't do default processing
+  nsEventStatus_eConsumeNoDefault, 
+    /// The event is consumed, but do default processing
+  nsEventStatus_eConsumeDoDefault  
+};
+
+/**
+ * General event
+ */
+
+struct nsEvent {
+  /// See event struct types
+  PRUint8     eventStructType;
+  /// See GUI MESSAGES,
+  PRUint32    message;              
+  /// in widget relative coordinates, modified to be relative to current view in layout.
+  nsPoint     point;               
+  // in widget relative coordinates, not modified by layout code.
+  nsPoint     refPoint;               
+  /// elapsed time, in milliseconds, from the time the system was started to the time the message was created
+  PRUint32    time;      
+  // flags to hold event flow stage and capture/bubble cancellation status
+  PRUint32    flags;
+};
+
+/**
+ * General graphic user interface event
+ */
+
+struct nsGUIEvent : public nsEvent {
+                /// Originator of the event
+  nsIWidget*  widget;           
+                /// Internal platform specific message.
+  void*     nativeMsg;        
+};
+
+/**
+ * Window resize event
+ */
+
+struct nsSizeEvent : public nsGUIEvent {
+                /// x,y width, height in pixels (client area)
+    nsRect          *windowSize;    
+                /// width of entire window (in pixels)
+    PRInt32         mWinWidth;    
+                /// height of entire window (in pixels)
+    PRInt32         mWinHeight;    
+};
+
+/**
+ * Window repaint event
+ */
+
+struct nsPaintEvent : public nsGUIEvent {
+                /// Context to paint in.
+    nsIRenderingContext *renderingContext;
+                /// area to paint  (should be used instead of rect)
+    nsIRegion           *region;
+                /// x,y, width, height in pixels of area to paint
+    nsRect              *rect;      
+};
+
+/**
+ * Scrollbar event
+ */
+
+struct nsScrollbarEvent : public nsGUIEvent {
+                /// ranges between scrollbar 0 and (maxRange - thumbSize). See nsIScrollbar
+    PRUint32        position; 
+};
+
+
+struct nsInputEvent : public nsGUIEvent {
+                /// PR_TRUE indicates the shift key is down
+    PRBool          isShift;        
+                /// PR_TRUE indicates the control key is down
+    PRBool          isControl;      
+                /// PR_TRUE indicates the alt key is down
+    PRBool          isAlt;          
+                /// PR_TRUE indicates the meta key is down
+                /// (or, on Mac, the Command key)
+    PRBool          isMeta;
+};
+
+/**
+ * Mouse event
+ */
+
+struct nsMouseEvent : public nsInputEvent {
+                /// The number of mouse clicks
+    PRUint32        clickCount;          
+                /// Special return code for MOUSE_ACTIVATE to signal
+                /// if the target accepts activation (1), or denies it (0)
+    PRBool          acceptActivation;           
+};
+
+/**
+ * Keyboard event
+ */
+
+struct nsKeyEvent : public nsInputEvent {
+                /// see NS_VK codes
+    PRUint32        keyCode;   
+                /// OS translated Unicode char
+    PRUint32        charCode;
+                // indicates whether the event signifies a printable character
+    PRBool          isChar;
+};
+
+/**
+ * IME Related Events
+ */
+struct nsTextRange {
+	PRUint32	mStartOffset;
+	PRUint32	mEndOffset;
+	PRUint32	mRangeType;
+};
+
+typedef struct nsTextRange nsTextRange;
+typedef nsTextRange* nsTextRangeArray;
+
+struct nsTextEventReply {
+	nsPoint		mCursorPosition;
+	PRBool		mCursorIsCollapsed;
+};
+
+typedef struct nsTextEventReply nsTextEventReply;
+
+struct nsTextEvent : public nsInputEvent {
+	PRUnichar*			theText;
+	nsTextEventReply	theReply;
+	PRUint32			rangeCount;
+	nsTextRangeArray	rangeArray;
+  PRBool          isChar;
+};
+
+struct nsCompositionEvent : public nsInputEvent {
+	PRUint32			compositionMessage;
+	nsTextEventReply	theReply;
+};
+
+/**
+ * Tooltip event
+ */
+struct nsTooltipEvent : public nsGUIEvent {
+                /// Index of tooltip area which generated the event. @see SetTooltips in nsIWidget
+    PRUint32        tipIndex;           
+};
+
+/**
+ * MenuItem event
+ * 
+ * When this event occurs the widget field in nsGUIEvent holds the "target"
+ * for the event
+ */
+
+struct nsMenuEvent : public nsGUIEvent {
+  nsIMenuItem * mMenuItem;
+  PRUint32      mCommand;           
+};
+
+
+/**
+ * Event status for D&D Event
+ */
+enum nsDragDropEventStatus {  
+    /// The event is a enter
+  nsDragDropEventStatus_eDragEntered,            
+    /// The event is exit
+  nsDragDropEventStatus_eDragExited, 
+    /// The event is drop
+  nsDragDropEventStatus_eDrop  
+};
+
+/**
+ * Event Struct Types
+ */
+#define NS_EVENT            1
+#define NS_GUI_EVENT        2
+#define NS_SIZE_EVENT       3
+#define NS_PAINT_EVENT      4
+#define NS_SCROLLBAR_EVENT  5
+#define NS_INPUT_EVENT      6
+#define NS_KEY_EVENT        7
+#define NS_MOUSE_EVENT      8
+
+#define NS_MENU_EVENT       10
+#define NS_DRAGDROP_EVENT   11
+#define NS_TEXT_EVENT		12
+#define NS_COMPOSITION_START	13
+#define NS_COMPOSITION_END		14
+ 
+ /**
+ * GUI MESSAGES
+ */
+ //@{
+
+#define NS_WINDOW_START                 100
+
+// Widget is being created
+#define NS_CREATE                       (NS_WINDOW_START)
+// Widget is being destroyed
+#define NS_DESTROY                      (NS_WINDOW_START + 1)
+// Widget was resized
+#define NS_SIZE                         (NS_WINDOW_START + 2)
+// Widget gained focus
+#define NS_GOTFOCUS                     (NS_WINDOW_START + 3)
+// Widget lost focus
+#define NS_LOSTFOCUS                    (NS_WINDOW_START + 4)
+// Widget got activated
+#define NS_ACTIVATE                     (NS_WINDOW_START + 5)
+// Widget got deactivated
+#define NS_DEACTIVATE                   (NS_WINDOW_START + 6)
+// Widget needs to be repainted
+#define NS_PAINT                        (NS_WINDOW_START + 30)
+// Key is pressed within a window
+#define NS_KEY_PRESS                    (NS_WINDOW_START + 31)
+// Key is released within a window
+#define NS_KEY_UP                       (NS_WINDOW_START + 32)
+// Key is pressed within a window
+#define NS_KEY_DOWN                     (NS_WINDOW_START + 33)
+// Window has been moved to a new location.
+// The events point contains the x, y location in screen coordinates
+#define NS_MOVE                         (NS_WINDOW_START + 34) 
+
+// Tab control's selected tab has changed
+#define NS_TABCHANGE                    (NS_WINDOW_START + 35)
+
+
+
+// Menu item selected
+#define NS_MENU_SELECTED                (NS_WINDOW_START + 38)
+
+// Form control changed: currently == combo box selection changed
+// but could be expanded to mean textbox, checkbox changed, etc.
+// This is a GUI specific event that does not necessarily correspond
+// directly to a mouse click or a key press.
+#define NS_CONTROL_CHANGE                (NS_WINDOW_START + 39)
+
+// Indicates the display has changed depth
+#define NS_DISPLAYCHANGED                (NS_WINDOW_START + 40)
+
+
+#define NS_MOUSE_MESSAGE_START          300
+#define NS_MOUSE_MOVE                   (NS_MOUSE_MESSAGE_START)
+#define NS_MOUSE_LEFT_BUTTON_UP         (NS_MOUSE_MESSAGE_START + 1)
+#define NS_MOUSE_LEFT_BUTTON_DOWN       (NS_MOUSE_MESSAGE_START + 2)
+#define NS_MOUSE_MIDDLE_BUTTON_UP       (NS_MOUSE_MESSAGE_START + 10)
+#define NS_MOUSE_MIDDLE_BUTTON_DOWN     (NS_MOUSE_MESSAGE_START + 11)
+#define NS_MOUSE_RIGHT_BUTTON_UP        (NS_MOUSE_MESSAGE_START + 20)
+#define NS_MOUSE_RIGHT_BUTTON_DOWN      (NS_MOUSE_MESSAGE_START + 21)
+#define NS_MOUSE_ENTER                  (NS_MOUSE_MESSAGE_START + 22)
+#define NS_MOUSE_EXIT                   (NS_MOUSE_MESSAGE_START + 23)
+#define NS_MOUSE_LEFT_DOUBLECLICK       (NS_MOUSE_MESSAGE_START + 24)
+#define NS_MOUSE_MIDDLE_DOUBLECLICK     (NS_MOUSE_MESSAGE_START + 25)
+#define NS_MOUSE_RIGHT_DOUBLECLICK      (NS_MOUSE_MESSAGE_START + 26)
+#define NS_MOUSE_LEFT_CLICK             (NS_MOUSE_MESSAGE_START + 27)
+#define NS_MOUSE_MIDDLE_CLICK           (NS_MOUSE_MESSAGE_START + 28)
+#define NS_MOUSE_RIGHT_CLICK            (NS_MOUSE_MESSAGE_START + 29)
+#define NS_MOUSE_ACTIVATE               (NS_MOUSE_MESSAGE_START + 30)
+
+#define NS_SCROLLBAR_MESSAGE_START      1000
+#define NS_SCROLLBAR_POS                (NS_SCROLLBAR_MESSAGE_START)
+#define NS_SCROLLBAR_PAGE_NEXT          (NS_SCROLLBAR_MESSAGE_START + 1)
+#define NS_SCROLLBAR_PAGE_PREV          (NS_SCROLLBAR_MESSAGE_START + 2)
+#define NS_SCROLLBAR_LINE_NEXT          (NS_SCROLLBAR_MESSAGE_START + 3)
+#define NS_SCROLLBAR_LINE_PREV          (NS_SCROLLBAR_MESSAGE_START + 4)
+
+#define NS_STREAM_EVENT_START           1100
+#define NS_PAGE_LOAD                    (NS_STREAM_EVENT_START)
+#define NS_PAGE_UNLOAD                  (NS_STREAM_EVENT_START + 1)
+#define NS_IMAGE_LOAD                   (NS_STREAM_EVENT_START + 2)
+#define NS_IMAGE_ABORT                  (NS_STREAM_EVENT_START + 3)
+#define NS_IMAGE_ERROR                  (NS_STREAM_EVENT_START + 4)
+
+#define NS_FORM_EVENT_START             1200
+#define NS_FORM_SUBMIT                  (NS_FORM_EVENT_START)
+#define NS_FORM_RESET                   (NS_FORM_EVENT_START + 1)
+#define NS_FORM_CHANGE                  (NS_FORM_EVENT_START + 2)
+#define NS_FORM_SELECTED                (NS_FORM_EVENT_START + 3)
+#define NS_FORM_INPUT                   (NS_FORM_EVENT_START + 4)
+
+//Need separate focus/blur notifications for non-native widgets
+#define NS_FOCUS_EVENT_START            1300
+#define NS_FOCUS_CONTENT                (NS_FOCUS_EVENT_START)
+#define NS_BLUR_CONTENT                 (NS_FOCUS_EVENT_START + 1)
+
+
+#define NS_DRAGDROP_EVENT_START         1400
+#define NS_DRAGDROP_ENTER               (NS_DRAGDROP_EVENT_START)
+#define NS_DRAGDROP_OVER                (NS_DRAGDROP_EVENT_START + 1)
+#define NS_DRAGDROP_EXIT                (NS_DRAGDROP_EVENT_START + 2)
+#define NS_DRAGDROP_DROP                (NS_DRAGDROP_EVENT_START + 3)
+#define NS_DRAGDROP_GESTURE             (NS_DRAGDROP_EVENT_START + 4)
+
+// Events for popups
+#define NS_MENU_EVENT_START            1500
+#define NS_MENU_CREATE                (NS_MENU_EVENT_START)
+#define NS_MENU_DESTROY               (NS_MENU_EVENT_START+1)
+#define NS_MENU_ACTION                (NS_MENU_EVENT_START+2)
+#define NS_XUL_BROADCAST              (NS_MENU_EVENT_START+3)
+#define NS_XUL_COMMAND_UPDATE         (NS_MENU_EVENT_START+4)
+//@}
+
+
+#define NS_IS_MOUSE_EVENT(evnt) \
+       (((evnt)->message == NS_MOUSE_LEFT_BUTTON_DOWN) || \
+        ((evnt)->message == NS_MOUSE_LEFT_BUTTON_UP) || \
+        ((evnt)->message == NS_MOUSE_LEFT_CLICK) || \
+        ((evnt)->message == NS_MOUSE_LEFT_DOUBLECLICK) || \
+        ((evnt)->message == NS_MOUSE_MIDDLE_BUTTON_DOWN) || \
+        ((evnt)->message == NS_MOUSE_MIDDLE_BUTTON_UP) || \
+        ((evnt)->message == NS_MOUSE_MIDDLE_CLICK) || \
+        ((evnt)->message == NS_MOUSE_MIDDLE_DOUBLECLICK) || \
+        ((evnt)->message == NS_MOUSE_RIGHT_BUTTON_DOWN) || \
+        ((evnt)->message == NS_MOUSE_RIGHT_BUTTON_UP) || \
+        ((evnt)->message == NS_MOUSE_RIGHT_CLICK) || \
+        ((evnt)->message == NS_MOUSE_RIGHT_DOUBLECLICK) || \
+        ((evnt)->message == NS_MOUSE_ENTER) || \
+        ((evnt)->message == NS_MOUSE_EXIT) || \
+        ((evnt)->message == NS_MOUSE_MOVE))
+
+#define NS_IS_KEY_EVENT(evnt) \
+       (((evnt)->message == NS_KEY_DOWN) ||  \
+        ((evnt)->message == NS_KEY_PRESS) || \
+        ((evnt)->message == NS_KEY_UP))
+
+/*
+ * Virtual key bindings for keyboard events
+ * NOTE: These are repeated in nsIDOMEvent.h and must be kept in sync
+ */
+
+#define NS_VK_CANCEL         0x03
+#define NS_VK_BACK           0x08
+#define NS_VK_TAB            0x09
+#define NS_VK_CLEAR          0x0C
+#define NS_VK_RETURN         0x0D
+#define NS_VK_ENTER          0x0E
+#define NS_VK_SHIFT          0x10
+#define NS_VK_CONTROL        0x11
+#define NS_VK_ALT            0x12
+#define NS_VK_PAUSE          0x13
+#define NS_VK_CAPS_LOCK      0x14
+#define NS_VK_ESCAPE         0x1B
+#define NS_VK_SPACE          0x20
+#define NS_VK_PAGE_UP        0x21
+#define NS_VK_PAGE_DOWN      0x22
+#define NS_VK_END            0x23
+#define NS_VK_HOME           0x24
+#define NS_VK_LEFT           0x25
+#define NS_VK_UP             0x26
+#define NS_VK_RIGHT          0x27
+#define NS_VK_DOWN           0x28
+#define NS_VK_PRINTSCREEN    0x2C
+#define NS_VK_INSERT         0x2D
+#define NS_VK_DELETE         0x2E
+
+// NS_VK_0 - NS_VK_9 match their ascii values
+#define NS_VK_0              0x30
+#define NS_VK_1              0x31
+#define NS_VK_2              0x32
+#define NS_VK_3              0x33
+#define NS_VK_4              0x34
+#define NS_VK_5              0x35
+#define NS_VK_6              0x36
+#define NS_VK_7              0x37
+#define NS_VK_8              0x38
+#define NS_VK_9              0x39
+
+#define NS_VK_SEMICOLON      0x3B
+#define NS_VK_EQUALS         0x3D
+
+// NS_VK_A - NS_VK_Z match their ascii values
+#define NS_VK_A              0x41
+#define NS_VK_B              0x42
+#define NS_VK_C              0x43
+#define NS_VK_D              0x44
+#define NS_VK_E              0x45
+#define NS_VK_F              0x46
+#define NS_VK_G              0x47
+#define NS_VK_H              0x48
+#define NS_VK_I              0x49
+#define NS_VK_J              0x4A
+#define NS_VK_K              0x4B
+#define NS_VK_L              0x4C
+#define NS_VK_M              0x4D
+#define NS_VK_N              0x4E
+#define NS_VK_O              0x4F
+#define NS_VK_P              0x50
+#define NS_VK_Q              0x51
+#define NS_VK_R              0x52
+#define NS_VK_S              0x53
+#define NS_VK_T              0x54
+#define NS_VK_U              0x55
+#define NS_VK_V              0x56
+#define NS_VK_W              0x57
+#define NS_VK_X              0x58
+#define NS_VK_Y              0x59
+#define NS_VK_Z              0x5A
+
+#define NS_VK_NUMPAD0        0x60
+#define NS_VK_NUMPAD1        0x61
+#define NS_VK_NUMPAD2        0x62
+#define NS_VK_NUMPAD3        0x63
+#define NS_VK_NUMPAD4        0x64
+#define NS_VK_NUMPAD5        0x65
+#define NS_VK_NUMPAD6        0x66
+#define NS_VK_NUMPAD7        0x67
+#define NS_VK_NUMPAD8        0x68
+#define NS_VK_NUMPAD9        0x69
+#define NS_VK_MULTIPLY       0x6A
+#define NS_VK_ADD            0x6B
+#define NS_VK_SEPARATOR      0x6C
+#define NS_VK_SUBTRACT       0x6D
+#define NS_VK_DECIMAL        0x6E
+#define NS_VK_DIVIDE         0x6F
+#define NS_VK_F1             0x70
+#define NS_VK_F2             0x71
+#define NS_VK_F3             0x72
+#define NS_VK_F4             0x73
+#define NS_VK_F5             0x74
+#define NS_VK_F6             0x75
+#define NS_VK_F7             0x76
+#define NS_VK_F8             0x77
+#define NS_VK_F9             0x78
+#define NS_VK_F10            0x79
+#define NS_VK_F11            0x7A
+#define NS_VK_F12            0x7B
+#define NS_VK_F13            0x7C
+#define NS_VK_F14            0x7D
+#define NS_VK_F15            0x7E
+#define NS_VK_F16            0x7F
+#define NS_VK_F17            0x80
+#define NS_VK_F18            0x81
+#define NS_VK_F19            0x82
+#define NS_VK_F20            0x83
+#define NS_VK_F21            0x84
+#define NS_VK_F22            0x85
+#define NS_VK_F23            0x86
+#define NS_VK_F24            0x87
+
+#define NS_VK_NUM_LOCK       0x90
+#define NS_VK_SCROLL_LOCK    0x91
+
+#define NS_VK_COMMA          0xBC
+#define NS_VK_PERIOD         0xBE
+#define NS_VK_SLASH          0xBF
+#define NS_VK_BACK_QUOTE     0xC0
+#define NS_VK_OPEN_BRACKET   0xDB
+#define NS_VK_BACK_SLASH     0xDC
+#define NS_VK_CLOSE_BRACKET  0xDD
+#define NS_VK_QUOTE          0xDE
+
+#define NS_EVENT_FLAG_NONE          0x0000
+#define NS_EVENT_FLAG_INIT          0x0001
+#define NS_EVENT_FLAG_BUBBLE        0x0002
+#define NS_EVENT_FLAG_CAPTURE       0x0004
+#define NS_EVENT_FLAG_STOP_DISPATCH 0x0008
+#define NS_EVENT_FLAG_NO_DEFAULT    0x0010
+
+// IME Constants  -- keep in synch with nsIDOMTextRange.h
+#define NS_TEXTRANGE_CARETPOSITION				0x01
+#define NS_TEXTRANGE_RAWINPUT					0X02
+#define NS_TEXTRANGE_SELECTEDRAWTEXT			0x03
+#define NS_TEXTRANGE_CONVERTEDTEXT				0x04
+#define NS_TEXTRANGE_SELECTEDCONVERTEDTEXT		0x05
+
+#endif // nsGUIEvent_h__
+

mozilla/widget/public/nsIAppShell.idl

@@ -0,0 +1,122 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is the Mozilla browser.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Contributor(s): 
+ *   Stuart Parmenter <pavlov@netscape.com>
+ */
+
+
+#include "nsISupports.idl"
+
+native int(int);
+[ptr] native nsDispatchListener(nsDispatchListener);
+[ptr] native nsIEventQueue(nsIEventQueue);
+[ptr] native UndefinednsIWidget(nsIWidget);
+[ref] native PRBoolRef(PRBool);
+[ref] native voidStarRef(void *);
+
+%{ C++
+#include "nsIEventQueue.h"
+
+/**
+ * Flags for the getNativeData function.
+ * See GetNativeData()
+ */
+#define NS_NATIVE_SHELL   0
+
+/**
+ * During the nsIAppShell Run method notify this listener 
+ * after each message dispatch.
+ * @see SetDispatchListener member function of nsIAppShell 
+ */
+class nsDispatchListener {
+public:
+  virtual void AfterDispatch() = 0;
+};
+
+class nsIWidget;
+%}
+
+
+[uuid(a0757c31-eeac-11d1-9ec1-00aa002fb821)]
+interface nsIAppShell : nsISupports
+{
+ /**
+  * Creates an application shell
+  */ 
+
+  void Create(inout int argc, inout string argv);
+
+ /**
+  * Enter an event loop.
+  * Don't leave until application exits.
+  */
+  
+  void Run();
+
+ /**
+  * Prepare to process events. 
+  */
+  
+  void Spinup();
+
+ /**
+  * Prepare to stop processing events.  
+  */
+  
+  void Spindown();
+
+ /**
+  * An event queue has been created or destroyed. Hook or unhook it from
+  * your system, as necessary.
+  * @param aQueue the queue in question
+  * @param aListen PR_TRUE for a new queue wanting hooking up. PR_FALSE
+  *                for a queue wanting to be unhooked.
+  */
+  void ListenToEventQueue(in nsIEventQueue aQueue, in PRBool aListen);
+
+ /**
+  * After event dispatch execute app specific code
+  */
+  
+  void GetNativeEvent(in PRBoolRef aRealEvent, in voidStarRef aEvent);
+
+ /**
+  * After event dispatch execute app specific code
+  */
+  
+  void DispatchNativeEvent(in PRBool aRealEvent, in voidStar aEvent);
+
+ /**
+  * After event dispatch execute app specific code
+  */
+  
+  void SetDispatchListener(in nsDispatchListener aDispatchListener);
+
+  /**
+   * Exit the handle event loop
+   */
+
+  void Exit();
+
+};
+
+#endif // nsIAppShell_h__
+
+

mozilla/widget/public/nsIButton.h

@@ -0,0 +1,63 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsIButton_h__
+#define nsIButton_h__
+
+#include "nsIWidget.h"
+#include "nsString.h"
+
+// {18032AD0-B265-11d1-AA2A-000000000000}
+#define NS_IBUTTON_IID      \
+{ 0x18032ad0, 0xb265, 0x11d1, \
+    { 0xaa, 0x2a, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } }
+
+/**
+ * Push button widget.
+ * Automatically shows itself as depressed when clicked on.
+ */
+class nsIButton : public nsISupports {
+
+public:
+   NS_DEFINE_STATIC_IID_ACCESSOR(NS_IBUTTON_IID) 
+ 
+   /**
+    * Set the label
+    *
+    * @param  Set the label to aText
+    * @result NS_Ok if no errors
+    */
+  
+    NS_IMETHOD SetLabel(const nsString &aText) = 0;
+    
+   /**
+    * Get the button label
+    *
+    * @param aBuffer contains label upon return
+    * @result NS_Ok if no errors
+    */
+ 
+    NS_IMETHOD GetLabel(nsString &aBuffer) = 0;
+
+};
+
+#endif

mozilla/widget/public/nsICheckButton.h

@@ -0,0 +1,81 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsICheckButton_h__
+#define nsICheckButton_h__
+
+// {961085F5-BD28-11d1-97EF-00609703C14E}
+#define NS_ICHECKBUTTON_IID \
+{ 0x961085f5, 0xbd28, 0x11d1, { 0x97, 0xef, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
+
+#include "nsISupports.h"
+#include "nsIWidget.h"
+
+
+/**
+ * Checkbox widget. 
+ * Can show itself in a checked or unchecked state. 
+ * The checkbox widget does not automatically show itself checked or unchecked when clicked on.
+ */
+class nsICheckButton : public nsISupports {
+
+public:
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_ICHECKBUTTON_IID)
+    
+   /**
+    * Set the button label
+    *
+    * @param aText  button label
+    * @result set to NS_OK if method successful
+    */
+  
+    NS_IMETHOD SetLabel(const nsString &aText) = 0;
+    
+   /**
+    * Get the button label
+    *
+    * @param aBuffer contains label upon return
+    * @result set to NS_OK if method successful
+    */
+ 
+    NS_IMETHOD GetLabel(nsString &aBuffer) = 0;
+
+    /**
+     * Set the check state.
+     * @param aState PR_TRUE show as checked. PR_FALSE show unchecked.
+     * @result set to NS_OK if method successful
+     */
+
+    NS_IMETHOD SetState(const PRBool aState) = 0;
+    
+    /**
+     * Get the check state.
+     * @param aState PR_TRUE if checked. PR_FALSE if unchecked.
+     * @result set to NS_OK if method successful
+     */
+
+    NS_IMETHOD GetState(PRBool& aState) = 0;
+
+};
+
+#endif  // nsICheckButton_h__
+

mozilla/widget/public/nsIClipboard.idl

@@ -0,0 +1,88 @@
+/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is Mozilla Communicator.
+ * 
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corp.  Portions created by Netscape are Copyright (C) 1999 Netscape 
+ * Communications Corp.  All Rights Reserved.
+ * 
+ * Contributor(s): 
+ *   Mike Pinkerton
+ */
+
+
+#include "nsISupports.idl"
+#include "nsISupportsArray.idl"
+#include "nsITransferable.idl"
+#include "nsIClipboardOwner.idl"
+
+
+[scriptable, uuid(8B5314BA-DB01-11d2-96CE-0060B0FB9956)]
+interface nsIClipboard : nsISupports
+{
+   /**
+    * Given a transferable, set the data on the native clipboard
+    *
+    * @param  aTransferable The transferable
+    * @param  anOwner The owner of the transferable
+    * @result NS_Ok if no errors
+    */
+  
+    void setData ( in nsITransferable aTransferable, in nsIClipboardOwner anOwner) ;
+
+   /**
+    * Given a transferable, get the clipboard data.
+    *
+    * @param  aTransferable The transferable
+    * @result NS_Ok if no errors
+    */
+  
+    void getData ( in nsITransferable aTransferable ) ;
+
+   /**
+    * This empties the clipboard and notifies the clipboard owner.
+    * This empties the "logical" clipboard. It does not clear the native clipboard.
+    *
+    * @result NS_OK if successful.
+    */
+  
+    void emptyClipboard ( ) ;
+
+   /**
+    * Some platforms support deferred notification for putting data on the clipboard
+    * This method forces the data onto the clipboard in its various formats
+    * This may be used if the application going away.
+    *
+    * @result NS_OK if successful.
+    */
+  
+    void forceDataToClipboard ( ) ;
+
+   /**
+    * This provides a way to give correct UI feedback about, for instance, a paste 
+    * should be allowed. It does _NOT_ actually retreive the data and should be a very
+    * inexpensive call. All it does is check if there is data on the clipboard matching
+    * any of the flavors in the given list.
+    *
+    * @aFlavorList - nsISupportsString's in a nsISupportsArray (for JavaScript).
+    * @outResult - if data is present matching one of 
+    * @result NS_OK if successful.
+    */
+    boolean hasDataMatchingFlavors ( in nsISupportsArray aFlavorList )  ;
+  
+};
+
+
+%{ C++
+
+%}

mozilla/widget/public/nsIClipboardOwner.idl

@@ -0,0 +1,45 @@
+/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is Mozilla Communicator.
+ * 
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corp.  Portions created by Netscape are Copyright (C) 1999 Netscape 
+ * Communications Corp.  All Rights Reserved.
+ * 
+ * Contributor(s): 
+ *   Mike Pinkerton
+ */
+
+
+#include "nsISupports.idl"
+#include "nsITransferable.idl"
+
+
+[scriptable, uuid(5A31C7A1-E122-11d2-9A57-000064657374)]
+interface nsIClipboardOwner : nsISupports
+{
+   /**
+    * Notifies the owner of the clipboard transferable that the
+    * transferable is being removed from the clipboard
+    *
+    * @param  aTransferable The transferable
+    * @result NS_Ok if no errors
+    */
+  
+    void LosingOwnership ( in nsITransferable aTransferable ) ;
+};
+
+
+%{ C++
+
+%}

mozilla/widget/public/nsIComboBox.h

@@ -0,0 +1,141 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsIComboBox_h__
+#define nsIComboBox_h__
+
+#include "nsIListWidget.h"
+#include "nsString.h"
+
+// {961085F6-BD28-11d1-97EF-00609703C14E}
+#define NS_ICOMBOBOX_IID \
+{ 0x961085f6, 0xbd28, 0x11d1, { 0x97, 0xef, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
+
+
+/**
+ * Initialize combobox data
+ */
+
+struct nsComboBoxInitData : public nsWidgetInitData {
+  nsComboBoxInitData()
+    : mDropDownHeight(0)
+  {
+  }
+
+  PRUint32 mDropDownHeight; // in pixels
+};
+
+/**
+ * Single selection drop down list. See nsIListWidget for capabilities 
+ */
+
+class nsIComboBox : public nsISupports {
+public:
+     NS_DEFINE_STATIC_IID_ACCESSOR(NS_ICOMBOBOX_IID);
+
+    /**
+     * Set an item at the specific position
+     *
+     * @param   aItem     the item name. The item has to be null terminated
+     * @param   aPosition the position the item should be inserted at
+     *                    0 is at the top of the list
+     *                    -1 is at the end of the list
+     */
+    NS_IMETHOD AddItemAt(nsString &aItem, PRInt32 aPosition) = 0;
+
+    /**
+     * Finds the first occurrence of the specified item
+     *
+     * @param   aItem     the string to be filled
+     * @param   aStartPos the starting position (index)
+     * @return  PR_TRUE if successful, PR_FALSE otherwise
+     *
+     */
+    virtual PRInt32  FindItem(nsString &aItem, PRInt32 aStartPos) = 0;
+
+    /**
+     * Returns the number of items in the list
+     *
+     * @return  the number of items
+     *
+     */
+    virtual PRInt32  GetItemCount() = 0;
+
+    /**
+     * Remove the first occurrence of the specified item
+     *
+     * @param   aPosition the item position
+     *                    0 is at the top of the list
+     *                    -1 is at the end of the list
+     *
+     * @return  PR_TRUE if successful, PR_FALSE otherwise
+     *
+     */
+    virtual PRBool RemoveItemAt(PRInt32 aPosition) = 0;
+
+    /**
+     * Gets an item at a specific location
+     *
+     * @param   anItem    on return contains the string of the item at that position
+     * @param   aPosition the Position of the item
+     *
+     */
+     virtual PRBool GetItemAt(nsString& anItem, PRInt32 aPosition) = 0;
+
+    /**
+     * Gets the selected item for a single selection list
+     *
+     * @param   aItem  on return contains the string of the selected item
+     *
+     */
+     NS_IMETHOD GetSelectedItem(nsString &aItem) = 0;
+
+    /**
+     * Returns with the index of the selected item
+     *
+     * @return  PRInt32, index of selected item
+     *
+     */
+    virtual PRInt32 GetSelectedIndex()  = 0;
+
+    /**
+     * Select the item at the specified position
+     *
+     * @param   PRInt32, the item position
+     *                   0 is at the top of the list
+     *                   -1 is at the end of the list
+     *
+     */
+    NS_IMETHOD SelectItem(PRInt32 aPosition)  = 0;
+
+    /**
+     * Deselects all the items in the list
+     *
+     */
+    NS_IMETHOD Deselect()  = 0;
+};
+
+
+#endif // nsIComboBox_h__
+
+
+

mozilla/widget/public/nsIContextMenu.h

@@ -0,0 +1,148 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsIContextMenu_h__
+#define nsIContextMenu_h__
+
+#include "nsISupports.h"
+#include "nsString.h"
+#include "nsIDOMNode.h"
+#include "nsIDOMElement.h"
+#include "nsIWebShell.h"
+
+class nsIMenuBar;
+class nsIMenu;
+class nsIMenuItem;
+class nsIMenuListener;
+
+//Generate this!
+// {35A3DEC1-4992-11d2-8DBA-00609703C14E}
+#define NS_ICONTEXTMENU_IID      \
+{ 0x35a3dec1, 0x4992, 0x11d2, \
+  { 0x8d, 0xba, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
+
+/**
+ * Menu widget
+ */
+class nsIContextMenu : public nsISupports {
+
+  public:
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_ICONTEXTMENU_IID)
+
+  /**
+    * Creates the context menu
+    *
+    */
+    NS_IMETHOD Create(nsISupports * aParent, const nsString& anAlignment, const nsString& anAnchorAlignment) = 0;
+
+   /**
+    * Get the context menu's Parent
+    *
+    */
+    NS_IMETHOD GetParent(nsISupports *&aParent) = 0;
+
+   /**
+    * Adds a context menu Item
+    *
+    */
+    NS_IMETHOD AddItem(nsISupports* aItem) = 0;
+
+   /**
+    * Adds a separator
+    *
+    */
+    NS_IMETHOD AddSeparator() = 0;
+
+   /**
+    * Returns the number of context menu items
+    * This does count separators as items
+    */
+    NS_IMETHOD GetItemCount(PRUint32 &aCount) = 0;
+
+   /**
+    * Returns a Menu or Menu Item at a specified Index
+    *
+    */
+    NS_IMETHOD GetItemAt(const PRUint32 aPos, nsISupports *& aMenuItem) = 0;
+
+   /**
+    * Inserts a Menu Item at a specified Index
+    *
+    */
+    NS_IMETHOD InsertItemAt(const PRUint32 aPos, nsISupports * aMenuItem) = 0;
+
+   /**
+    * Removes an Menu Item from a specified Index
+    *
+    */
+    NS_IMETHOD RemoveItem(const PRUint32 aPos) = 0;
+
+   /**
+    * Removes all the Menu Items
+    *
+    */
+    NS_IMETHOD RemoveAll() = 0;
+
+   /**
+    * Gets Native MenuHandle
+    *
+    */
+    NS_IMETHOD  GetNativeData(void** aData) = 0;
+
+   /**
+    * Adds menu listener for dynamic construction
+    *
+    */
+    NS_IMETHOD AddMenuListener(nsIMenuListener * aMenuListener) = 0;
+
+   /**
+    * Removes menu listener for dynamic construction
+    *
+    */
+    NS_IMETHOD RemoveMenuListener(nsIMenuListener * aMenuListener) = 0;
+
+   /**
+    * Set location
+    *
+    */
+    NS_IMETHOD SetLocation(PRInt32 aX, PRInt32 aY) = 0;
+
+   /**
+    * Set DOMNode
+    *
+    */
+    NS_IMETHOD SetDOMNode(nsIDOMNode * aMenuNode) = 0;
+
+	/**
+    * Set DOMElement
+    *
+    */
+    NS_IMETHOD SetDOMElement(nsIDOMElement * aMenuElement) = 0;
+
+	/**
+    * Set WebShell
+    *
+    */
+    NS_IMETHOD SetWebShell(nsIWebShell * aWebShell) = 0;
+};
+
+#endif

mozilla/widget/public/nsIDragService.idl

@@ -0,0 +1,70 @@
+/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is Mozilla Communicator.
+ * 
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corp.  Portions created by Netscape are Copyright (C) 1999 Netscape 
+ * Communications Corp.  All Rights Reserved.
+ * 
+ * Contributor(s): 
+ *   Mike Pinkerton
+ */
+
+#include "nsISupports.idl"
+#include "nsISupportsArray.idl"
+#include "nsIDragSession.idl"
+#include "nsIScriptableRegion.idl"
+
+
+[scriptable, uuid(8B5314BB-DB01-11d2-96CE-0060B0FB9956)]
+interface nsIDragService : nsISupports
+{
+  const long DRAGDROP_ACTION_NONE = 0;
+  const long DRAGDROP_ACTION_COPY = 1;
+  const long DRAGDROP_ACTION_MOVE = 2;
+  const long DRAGDROP_ACTION_LINK = 4;
+  
+  /**
+    * Starts a modal drag session with an array of transaferables 
+    *
+    * @param  aTransferables - an array of transferables to be dragged
+    * @param  aRegion - a region containing rectangles for cursor feedback, 
+    *            in window coordinates.
+    * @param  aActionType - specified which of copy/move/link are allowed
+    */
+  void invokeDragSession ( in nsISupportsArray aTransferables, 
+                             in nsIScriptableRegion aRegion, in unsigned long aActionType );
+
+  /**
+    * Returns the current Drag Session  
+    */
+  nsIDragSession getCurrentSession ( ) ;
+
+  /**
+    * Tells the Drag Service to start a drag session. This is called when
+    * an external drag occurs
+    */
+  void startDragSession ( ) ;
+
+  /**
+    * Tells the Drag Service to end a drag session. This is called when
+    * an external drag occurs
+    */
+  void endDragSession ( ) ;
+  
+};
+
+
+%{ C++
+
+%}

mozilla/widget/public/nsIDragSession.idl

@@ -0,0 +1,80 @@
+/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is Mozilla Communicator.
+ * 
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corp.  Portions created by Netscape are Copyright (C) 1999 Netscape 
+ * Communications Corp.  All Rights Reserved.
+ * 
+ * Contributor(s): 
+ *   Mike Pinkerton
+ */
+
+#include "nsISupports.idl"
+#include "nsISupportsArray.idl"
+#include "nsITransferable.idl"
+
+%{ C++
+#include "nsSize.h"
+%}
+
+native nsSize (nsSize);
+
+
+[scriptable, uuid(CBA22C53-FCCE-11d2-96D4-0060B0FB9956)]
+interface nsIDragSession : nsISupports
+{
+  /**
+    * Set the current state of the drag whether it can be dropped or not.
+    * usually the target "frame" sets this so the native system can render the correct feedback
+    */
+  attribute boolean canDrop;
+  
+  /**
+    * Sets the action (copy, move, link, et.c) for the current drag 
+    */ 
+  attribute unsigned long dragAction;
+  
+  /**
+    * Sets the current width and height if the drag target area. 
+    * It will contain the current size of the Frame that the drag is currently in
+    */  
+  attribute nsSize targetSize;
+ 
+  /**
+    * Get the number items that were dropped
+    */
+  readonly attribute unsigned long numDropItems;
+
+  /**
+    * Get data from a Drag&Drop. Can be called while the drag is in process
+    * or after the drop has completed.  
+    *
+    * @param  aTransferable the transferable for the data to be put into
+    * @param  aItemIndex which of multiple drag items, zero-based
+    */
+  void getData ( in nsITransferable aTransferable, in unsigned long aItemIndex ) ;
+
+   /**
+    * Check to set if ant of the native data on the clipboard matches this data flavor
+    *
+    * @result NS_OK if if the data flavor is supported and, NS_ERROR_FAILURE is it is not
+    */
+  boolean isDataFlavorSupported ( in string aDataFlavor ) ;
+  
+};
+
+
+%{ C++
+
+%}

mozilla/widget/public/nsIDragSessionMac.h

@@ -0,0 +1,51 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsIDragSessionMac_h__
+#define nsIDragSessionMac_h__
+
+#include "nsISupports.h"
+#include <Drag.h>
+
+
+#define NS_IDRAGSESSIONMAC_IID      \
+{ 0x36c4c380, 0x09e2, 0x11d3, { 0xb0, 0x33, 0xa4, 0x20, 0xf4, 0x2c, 0xfd, 0x7c } };
+
+
+class nsIDragSessionMac : public nsISupports {
+
+  public:
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDRAGSESSIONMAC_IID)
+
+  /**
+    * Since the drag may originate in an external application, we need some way of
+    * communicating the DragManager's DragRef to the session so it can use it
+    * when filling in data requests.
+    *
+    * @param  aDragRef the MacOS DragManager's ref number for the current drag
+    */
+
+   NS_IMETHOD SetDragReference ( DragReference aDragRef ) = 0; 
+
+};
+
+#endif

mozilla/widget/public/nsIEventListener.h

@@ -0,0 +1,52 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsIEventListener_h__
+#define nsIEventListener_h__
+
+#include "nsISupports.h"
+#include "nsGUIEvent.h"
+
+/**
+ * Event listener interface.
+ * Alternative to a callback for recieving events.
+ */
+
+// {c83f6b80-d7ce-11d2-8360-c4c894c4917c}
+#define NS_IEVENTLISTENER_IID \
+{ 0xc83f6b80, 0xd7ce, 0x11d2, { 0x83, 0x60, 0xc4, 0xc8, 0x94, 0xc4, 0x91, 0x7c } }
+
+class nsIEventListener : public nsISupports {
+public:
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IEVENTLISTENER_IID)
+  
+ /**
+  * Processes all events. 
+  * If a mouse listener is registered this method will not process mouse events. 
+  * @param anEvent the event to process. See nsGUIEvent.h for event types.
+  */
+
+  virtual nsEventStatus ProcessEvent(const nsGUIEvent & anEvent) = 0;
+
+};
+
+#endif // nsIEventListener_h__

mozilla/widget/public/nsIFileDialogsMgr.h

@@ -0,0 +1,75 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsIFileDialogsMgr_h__
+#define nsIFileDialogsMgr_h__
+
+#include "nsISupports.h"
+#include "nsFileSpec.h"
+
+// {0ef98781-e34b-11d2-b345-00a0cc3c1cde}
+#define NS_IFILEDIALOGSMGR_IID \
+{ 0xef98781, 0xe34b, 0x11d2, { 0xb3, 0x45, 0x0, 0xa0, 0xcc, 0x3c, 0x1c, 0xde } }
+
+#define NS_FILEDIALOGSMGR_CID      \
+{ 0xef98784, 0xe34b, 0x11d2, { 0xb3, 0x45, 0x0, 0xa0, 0xcc, 0x3c, 0x1c, 0xde } }
+
+enum nsFileDlgResults {
+  nsFileDlgResults_Cancel,    // User hit cancel, ignore selection
+  nsFileDlgResults_OK,        // User hit Ok, process selection 
+  nsFileDlgResults_Replace    // User acknowledged file already exists so ok to replace, process selection
+};
+
+/**
+ * (native) File Dialogs utility.
+ * Provides an XP wrapper to platform native file dialogs:
+ *  GetFile   - Presents a file browser and returns an nsFileSpec for the selected file
+ *  GetFolder - Presents a folder/path selection dialog and returns an nsFileSpec
+ *  PutFile   - Presents a file save dialog to the user and returns an nsFileSpec with
+ *              the name and path to save the file
+ * 
+ */
+
+class nsIFileDialogsMgr : public nsISupports
+{
+public:
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IFILEDIALOGSMGR_IID)
+    
+  NS_IMETHOD GetFile(
+    nsFileSpec       & theFileSpec,     // Populate with initial path for file dialog
+    nsFileDlgResults & theResult,       // Result from the file selection dialog prompt
+    const nsString   * promptString,    // Window title for file selection dialog
+    void             * filterList) = 0;
+    
+  NS_IMETHOD GetFolder(
+    nsFileSpec       & theFileSpec,     // Populate with initial path for file dialog 
+    nsFileDlgResults & theResult,       // Result from the folder selection dialog prompt
+    const nsString   * promptString) = 0;  // Window title for folder selection dialog
+    
+  NS_IMETHOD PutFile(
+    nsFileSpec       & theFileSpec,     // Populate with initial path for file dialog 
+    nsFileDlgResults & theResult,       // Result from the file save dialog prompt
+    const nsString   * promptString) = 0;  // Window title for file save dialog
+
+};
+
+#endif // nsIFileDialogsMgr_h__

mozilla/widget/public/nsIFilePicker.idl

@@ -0,0 +1,96 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is the Mozilla browser.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Contributor(s): 
+ *   Stuart Parmenter <pavlov@netscape.com>
+ */
+
+#include "nsISupports.idl"
+#include "nsIFileSpec.idl"
+
+interface nsIDOMWindow;
+
+[scriptable, uuid(c47de916-1dd1-11b2-8141-82507fa02b21)]
+interface nsIFilePicker : nsISupports
+{
+  const short modeLoad        = 0;              // Load a file or directory
+  const short modeSave        = 1;              // Save a file or directory
+  const short modeGetFolder   = 2;              // Select a fodler/directory
+
+  const short returnOK        = 0;              // User hit cancel, ignore selection
+  const short returnCancel    = 1;              // User hit Ok, process selection
+  const short returnReplace   = 2;              // User acknowledged file already exists so ok to replace, process selection
+
+ /**
+  * Create the file widget.
+  *
+  * @param      parent   nsIDOMWindow parent.  This dialog should be dependant on this parent.
+  * @param      title    The title for the file widget
+  * @param      mode     load, save, or get folder
+  *
+  */
+  void create(in nsIDOMWindow parent, in wstring title, in short mode);
+
+ /**
+  * Set the list of file filters 
+  *
+  * @param      titles           array of filter titles
+  * @param      filters          array of filters to associate with titles 
+  * @param      numberOfFilters  number of filters.  
+  *
+  */
+  void setFilterList(in long numberOfFilters,
+                     [array, size_is(numberOfFilters)] in wstring titles,
+                     [array, size_is(numberOfFilters)] in wstring filters);
+
+ /**
+  * Get the index into the filter list for the type of file the user wants to save
+  *
+  * @param      selectedFilter    the index of the selected item in the filter list
+  *
+  */
+  readonly attribute long selectedFilter;
+
+  /* what is this? */
+  attribute wstring defaultString;
+
+ /**
+  * Set the directory that the file open/save dialog initially displays
+  *
+  * @param      displayDirectory  the name of the directory
+  *
+  */
+  attribute nsIFileSpec displayDirectory;
+
+
+ /**
+  * Get the nsFileSpec for the file or directory.
+  *
+  * @return Returns the file currently selected
+  */
+  readonly attribute nsIFileSpec file;
+
+ /**
+  * Show File Dialog. The dialog is displayed modally.
+  *
+  * @return returnOK if the user selects OK, returnCancel if the user selects cancel
+  *
+  */
+  short show();
+};

mozilla/widget/public/nsIFileSpecWithUI.idl

@@ -0,0 +1,112 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+// This is the only correct cross-platform way to specify a file.
+// Strings are not such a way. If you grew up on windows or unix, you
+// may think they are. Welcome to reality.
+
+#include "nsIFileSpec.idl"
+
+%{C++
+#include "nscore.h" // for NS_WIDGET
+#include "nsIComponentManager.h"
+%}
+native StandardFilterMask(nsIFileSpecWithUI::StandardFilterMask);
+
+[scriptable, uuid(8ddf7681-139a-11d3-915f-dc1f8c138b7c)]
+interface nsIFileSpecWithUI : nsIFileSpec
+{
+%{C++
+	//
+	// The "choose" functions present the file picker UI in order to set the
+	// value of the file spec.
+%}
+
+%{C++
+	// The mask for standard filters is given as follows:
+	enum StandardFilterMask
+	{
+		eAllReadable		= (1<<0)
+	,	eHTMLFiles			= (1<<1)
+	,	eXMLFiles			= (1<<2)
+	,	eImageFiles			= (1<<3)
+    ,   eMailFiles          = (1<<4)
+    ,   eTextFiles          = (1<<5)
+	,	eAllFiles			= (1<<6)
+	
+	// Mask containing all the above default filters
+	,	eAllStandardFilters = (
+							  eAllReadable
+							| eHTMLFiles
+							| eXMLFiles
+							| eImageFiles
+                            | eMailFiles
+                            | eTextFiles
+							| eAllFiles)
+    ,   eAllMailOutputFilters = (
+                                 eHTMLFiles
+                               | eMailFiles
+                               | eTextFiles)
+	
+	// The "extra filter" bit should be set if the "extra filter"
+	// is passed in to chooseInputFile.
+	,   eExtraFilter        = (1<<31)
+	};
+	enum { kNumStandardFilters = 7, kNumMailFilters = 3 };
+%}
+	[noscript] void chooseInputFile(
+		in string title
+	,	in StandardFilterMask standardFilterMask
+	,	in string extraFilterTitle
+	,	in string extraFilter
+		);
+
+	[noscript] void chooseOutputFile(in string windowTitle, 
+                                     in string suggestedLeafName,
+                                     in StandardFilterMask standardFilterMask);
+
+  string chooseFile(in string title);
+	string chooseDirectory(in string title);
+};
+	
+%{C++
+// Define Progid and CID
+// {e3326a80-2816-11d3-a7e5-98cb48c74f3c}
+#define NS_FILESPECWITHUI_CID \
+{ 0xe3326a80, 0x2816, 0x11d3, { 0xa7, 0xe5, 0x98, 0xcb, 0x48, 0xc7, 0x4f, 0x3c } }
+
+#define NS_FILESPECWITHUI_PROGID "component://netscape/filespecwithui"
+#define NS_FILESPECWITHUI_CLASSNAME "nsIFileSpecWithUI"
+
+// Factory methods
+inline nsIFileSpecWithUI* NS_CreateFileSpecWithUI()
+{
+     nsIFileSpecWithUI* spec = nsnull;
+     nsresult rv = nsComponentManager::CreateInstance(
+     	(const char*)NS_FILESPECWITHUI_PROGID,
+     	(nsISupports*)nsnull,
+     	(const nsID&)nsIFileSpecWithUI::GetIID(),
+     	(void**)&spec);
+     NS_ASSERTION(NS_SUCCEEDED(rv), "ERROR: Could not make a file spec.");
+     return spec;
+}
+%}

mozilla/widget/public/nsIFileWidget.h

@@ -0,0 +1,178 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsIFileWidget_h__
+#define nsIFileWidget_h__
+
+#include "nsString.h"
+#include "nsFileSpec.h"
+
+class nsIWidget;
+class nsIDeviceContext;
+class nsIAppShell;
+class nsIToolkit;
+
+// {F8030015-C342-11d1-97F0-00609703C14E}
+#define NS_IFILEWIDGET_IID \
+{ 0xf8030015, 0xc342, 0x11d1, { 0x97, 0xf0, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
+
+
+/**
+ * File selector mode 
+ */
+
+enum nsFileDlgMode {
+        /// Load a file or directory
+      eMode_load,
+        /// Save a file or directory
+      eMode_save,
+        /// Select a fodler/directory
+      eMode_getfolder
+      };
+
+
+enum nsFileDlgResults {
+  nsFileDlgResults_Cancel,    // User hit cancel, ignore selection
+  nsFileDlgResults_OK,        // User hit Ok, process selection 
+  nsFileDlgResults_Replace    // User acknowledged file already exists so ok to replace, process selection
+};
+
+/**
+ * File selector widget.
+ * Modally selects files for loading or saving from a list.
+ */
+
+class nsIFileWidget : public nsISupports 
+{
+
+public:
+
+  
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IFILEWIDGET_IID)
+
+ /**
+  * Create the file filter. This differs from the standard
+  * widget Create method because it passes in the mode
+  *
+  * @param      aParent  the parent to place this widget into
+  * @param      aTitle   The title for the file widget
+  * @param      aMode    load or save              
+  * @return     void
+  *
+  */
+  NS_IMETHOD Create(nsIWidget *aParent,
+                      const nsString& aTitle,
+                      nsFileDlgMode aMode,
+                      nsIDeviceContext *aContext = nsnull,
+                      nsIAppShell *aAppShell = nsnull,
+                      nsIToolkit *aToolkit = nsnull,
+                      void *aInitData = nsnull) = 0;
+
+
+ /**
+  * Set the list of file filters 
+  *
+  * @param      aNumberOfFilter  number of filters.
+  * @param      aTitle           array of filter titles
+  * @param      aFilter          array of filters to associate with titles            
+  * @return     void
+  *
+  */
+
+  NS_IMETHOD SetFilterList(PRUint32 aNumberOfFilters,const nsString aTitles[],const nsString aFilters[]) = 0;
+
+  
+ /**
+  * Get the index into the filter list for the type of file the user wants to save
+  *
+  * @param      theType          the index into the filter list
+  * @return     void
+  *
+  */
+
+  NS_IMETHOD GetSelectedType(PRInt16& theType) = 0;
+
+ /**
+  * Show File Dialog. The dialog is displayed modally.
+  *
+  * @return PR_TRUE if user selects OK, PR_FALSE if user selects CANCEL
+  *
+  */
+
+  virtual PRBool Show() = 0;
+
+ /**
+  * Get the nsFileSpec for the file or directory.
+  *
+  * @param aFile on exit it contains the file or directory selected
+  */
+  
+  NS_IMETHOD GetFile(nsFileSpec& aFile) = 0;
+
+
+ /**
+  * Set the default string that appears in file open/save dialog 
+  *
+  * @param      aString          the name of the file
+  * @return     void
+  *
+  */
+  NS_IMETHOD SetDefaultString(const nsString& aString) = 0;
+
+ /**
+  * Set the directory that the file open/save dialog initially displays
+  *
+  * @param      aDirectory          the name of the directory
+  * @return     void
+  *
+  */
+  NS_IMETHOD SetDisplayDirectory(const nsFileSpec& aDirectory) = 0;
+
+ /**
+  * Get the directory that the file open/save dialog was last displaying
+  *
+  * @param      aDirectory          the name of the directory
+  * @return     void
+  *
+  */
+  NS_IMETHOD GetDisplayDirectory(nsFileSpec& aDirectory) = 0;
+
+
+  virtual nsFileDlgResults GetFile(
+    nsIWidget        * aParent,
+    const nsString   & promptString,    // Window title for the dialog
+    nsFileSpec       & theFileSpec) = 0;     // Populate with initial path for file dialog
+    
+  virtual nsFileDlgResults GetFolder(
+    nsIWidget        * aParent,
+    const nsString   & promptString,    // Window title for the dialog
+    nsFileSpec       & theFileSpec) = 0;     // Populate with initial path for file dialog 
+    
+  virtual nsFileDlgResults PutFile(
+    nsIWidget        * aParent,
+    const nsString   & promptString,    // Window title for the dialog
+    nsFileSpec       & theFileSpec) = 0;     // Populate with initial path for file dialog 
+
+};
+
+#endif // nsIFileWidget_h__
+

mozilla/widget/public/nsIFontNameIterator.h

@@ -0,0 +1,51 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsIFontNameIterator_h__
+#define nsIFontNameIterator_h__
+
+#include "nsISupports.h"
+class nsString;
+
+// {CEEB39D1-0949-11d3-9A87-0050046CDA96}
+#define NS_IFONTNAMEITERATOR_IID \
+{ 0xceeb39d1, 0x949, 0x11d3, { 0x9a, 0x87, 0x0, 0x50, 0x4, 0x6c, 0xda, 0x96 } };
+
+class nsIFontNameIterator : public nsISupports
+		// Fonts are identified by strings, |Get| and |Advance| are distinct to facility wrapping
+		//	with C++ objects as standard iterators.
+	{
+		public:
+      NS_DEFINE_STATIC_IID_ACCESSOR(NS_IFONTNAMEITERATOR_IID)
+
+			NS_IMETHOD Reset() = 0;
+				// does not need to be called initially, returns iterator to initial state
+
+		  NS_IMETHOD Get( nsString* aFontName ) = 0;
+				// returns an error when no more names are available
+
+			NS_IMETHOD Advance() = 0;
+				// returns an error when no more names are available
+	};
+
+
+#endif

mozilla/widget/public/nsIFontRetrieverService.h

@@ -0,0 +1,50 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsIFontRetrieverService_h__
+#define nsIFontRetrieverService_h__
+
+#include "nsISupports.h"
+
+class nsIFontNameIterator;
+class nsIFontSizeIterator;
+class nsString;
+
+// {285EF9B2-094A-11d3-9A87-0050046CDA96}
+#define NS_IFONTRETRIEVERSERVICE_IID \
+{ 0x285ef9b2, 0x94a, 0x11d3, { 0x9a, 0x87, 0x0, 0x50, 0x4, 0x6c, 0xda, 0x96 } };
+
+class nsIFontRetrieverService : public nsISupports
+		// This (singleton) service exists soley as a factory to manufacture iterators
+{
+		public:
+      NS_DEFINE_STATIC_IID_ACCESSOR(NS_IFONTRETRIEVERSERVICE_IID)
+
+			NS_IMETHOD CreateFontNameIterator( nsIFontNameIterator** aIterator ) = 0;
+
+			NS_IMETHOD CreateFontSizeIterator( const nsString &aFontName, nsIFontSizeIterator** aIterator ) = 0;
+
+			NS_IMETHOD IsFontScalable( const nsString &aFontName, PRBool* aResult ) = 0;	
+};
+
+
+#endif

mozilla/widget/public/nsIFontSizeIterator.h

@@ -0,0 +1,51 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsIFontSizeIterator_h__
+#define nsIFontSizeIterator_h__
+
+#include "nsISupports.h"
+class nsString;
+
+// {285EF9B1-094A-11d3-9A87-0050046CDA96}
+#define NS_IFONTSIZEITERATOR_IID \
+{ 0x285ef9b1, 0x94a, 0x11d3, { 0x9a, 0x87, 0x0, 0x50, 0x4, 0x6c, 0xda, 0x96 } };
+
+class nsIFontSizeIterator : public nsISupports
+		// Font sizes are identified with doubles (e.g., for the possibility of fractional sizes from MM, etc.).
+		//	|Get| and |Advance| are distinct to facility wrapping with C++ objects as standard iterators.
+	{
+		public:
+      NS_DEFINE_STATIC_IID_ACCESSOR(NS_IFONTSIZEITERATOR_IID)
+
+			NS_IMETHOD Reset() = 0;
+				// does not need to be called initially, returns iterator to initial state
+
+			NS_IMETHOD Get( double* aFontSize ) = 0;
+				// returns an error when no more sizes are available
+
+			NS_IMETHOD Advance() = 0;
+				// returns an error when no more sizes are available
+	};
+
+
+#endif

mozilla/widget/public/nsIFormatConverter.idl

@@ -0,0 +1,69 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#include "nsISupports.idl"
+#include "nsISupportsArray.idl"
+
+
+[scriptable, uuid(948A0023-E3A7-11d2-96CF-0060B0FB9956)]
+interface nsIFormatConverter : nsISupports
+{  
+  /**
+    * Get the list of the "input" data flavors (mime types as nsISupportsString),
+    * in otherwords, the flavors that this converter can convert "from" (the 
+    * incoming data to the converter).
+    */
+  nsISupportsArray getInputDataFlavors ( ) ;
+
+  /**
+    * Get the list of the "output" data flavors (mime types as nsISupportsString),
+    * in otherwords, the flavors that this converter can convert "to" (the 
+    * outgoing data to the converter).
+    *
+    * @param  aDataFlavorList fills list with supported flavors
+    */
+  nsISupportsArray getOutputDataFlavors ( ) ;
+
+  /**
+    * Determines whether a converion from one flavor to another is supported
+    *
+    * @param  aFromFormatConverter flavor to convert from
+    * @param  aFromFormatConverter flavor to convert to
+    */
+  boolean canConvert ( in string aFromDataFlavor, in string aToDataFlavor ) ;
+
+  /**
+    * Converts from one flavor to another.
+    *
+    * @param  aFromFormatConverter flavor to convert from
+    * @param  aFromFormatConverter flavor to convert to (destination own the memory)
+    * @returns returns NS_OK if it was converted
+    */
+  void convert ( in string aFromDataFlavor, in nsISupports aFromData, in unsigned long aDataLen,
+                   in string aToDataFlavor, out nsISupports aToData, out unsigned long aDataToLen ) ; 
+
+};
+
+
+%{ C++
+
+%}

mozilla/widget/public/nsIKeyBindMgr.h

@@ -0,0 +1,60 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsIKeyBindMgr_h__
+#define nsIKeyBindMgr_h__
+
+#include "nsISupports.h"
+#include "nsIDOMNode.h"
+#include "nsGUIEvent.h"
+#include "nsIWebShell.h"
+#include "nsIContent.h"
+
+// {a91c0821-de58-11d2-b345-00a0cc3c1cde}
+#define NS_IKEYBINDMGR_IID \
+{ 0xa91c0821, 0xde58, 0x11d2, \
+{ 0xb3, 0x45, 0x0, 0xa0, 0xcc, 0x3c, 0x1c, 0xde } }
+
+// {8B5314BD-DB01-11d2-96CE-0060B0FB9977}
+#define NS_KEYBINDMGR_CID      \
+{ 0x8b5314bd, 0xdb01, 0x11d2, { 0x96, 0xce, 0x0, 0x60, 0xb0, 0xfb, 0x99, 0x77 } }
+
+/**
+ * Keyboard Binding utility.
+ * Given a key event and a DOM node to search executes any 'key' command
+ * that matches the event
+ */
+
+class nsIKeyBindMgr : public nsISupports
+{
+public:
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IKEYBINDMGR_IID)
+    
+  NS_IMETHOD ProcessKeyEvent(
+    nsIDOMDocument   * domDoc, 
+    const nsKeyEvent & theEvent, 
+    nsIWebShell      * webShell,  
+    nsEventStatus    & theStatus) = 0;
+
+};
+
+#endif // nsIKeyBindMgr_h__

mozilla/widget/public/nsILabel.h

@@ -0,0 +1,91 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsILabel_h__
+#define nsILabel_h__
+
+#include "nsIWidget.h"
+#include "nsString.h"
+
+/* F3131891-3DC7-11d2-8DB8-00609703C14E */
+#define NS_ILABEL_IID \
+{ 0xf3131891, 0x3dc7, 0x11d2, \
+    { 0x8d, 0xb8, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
+
+/**
+ * Label Alignments 
+ */
+
+enum nsLabelAlignment {   
+    eAlign_Right,
+    eAlign_Left,
+    eAlign_Center
+  }; 
+
+struct nsLabelInitData : public nsWidgetInitData {
+  nsLabelInitData()
+    : mAlignment(eAlign_Left)
+  {
+  }
+
+  nsLabelAlignment mAlignment;
+};
+
+/**
+ * Label widget.
+ * Automatically shows itself as depressed when clicked on.
+ */
+class nsILabel : public nsISupports {
+
+  public:
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_ILABEL_IID)
+ 
+   /**
+    * Set the label
+    *
+    * @param  Set the label to aText
+    * @result NS_Ok if no errors
+    */
+  
+    NS_IMETHOD SetLabel(const nsString &aText) = 0;
+    
+   /**
+    * Get the button label
+    *
+    * @param aBuffer contains label upon return
+    * @result NS_Ok if no errors
+    */
+ 
+    NS_IMETHOD GetLabel(nsString &aBuffer) = 0;
+
+
+   /**
+    * Set the Label Alignemnt for creation
+    *
+    * @param aAlignment the alignment
+    * @result NS_Ok if no errors
+    */
+    NS_IMETHOD SetAlignment(nsLabelAlignment aAlignment) = 0;
+
+};
+
+#endif

mozilla/widget/public/nsIListBox.h

@@ -0,0 +1,183 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsIListBox_h__
+#define nsIListBox_h__
+
+#include "nsIListWidget.h"
+#include "nsString.h"
+
+// {F8030014-C342-11d1-97F0-00609703C14E}
+#define NS_ILISTBOX_IID \
+{ 0xf8030014, 0xc342, 0x11d1, { 0x97, 0xf0, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
+
+
+/**
+ * Initialize list box data
+ */
+
+struct nsListBoxInitData : public nsWidgetInitData {
+  nsListBoxInitData()
+    : mMultiSelect(PR_FALSE)
+  {
+  }
+
+  PRBool mMultiSelect;
+};
+
+/**
+ * Single or multi selection list of items.
+ * Unlike a nsIWidget, The the list widget must automatically clear 
+ * itself to the background color when paint messages are generated.
+ * The listbox always has a vertical scrollbar. It never has a
+ * horizontal scrollbar.
+ */
+
+class nsIListBox : public nsISupports {
+
+public:
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_ILISTBOX_IID)
+
+    /**
+     * Set an item at the specific position
+     *
+     * @param   aItem     the item name. The item has to be null terminated
+     * @param   aPosition the position the item should be inserted at
+     *                    0 is at the top of the list
+     *                    -1 is at the end of the list
+     */
+    NS_IMETHOD AddItemAt(nsString &aItem, PRInt32 aPosition) = 0;
+
+    /**
+     * Finds the first occurrence of the specified item
+     *
+     * @param   aItem     the string to be filled
+     * @param   aStartPos the starting position (index)
+     * @return  PR_TRUE if successful, PR_FALSE otherwise
+     *
+     */
+    virtual PRInt32  FindItem(nsString &aItem, PRInt32 aStartPos) = 0;
+
+    /**
+     * Returns the number of items in the list
+     *
+     * @return  the number of items
+     *
+     */
+    virtual PRInt32  GetItemCount() = 0;
+
+    /**
+     * Remove the first occurrence of the specified item
+     *
+     * @param   aPosition the item position
+     *                    0 is at the top of the list
+     *                    -1 is at the end of the list
+     *
+     * @return  PR_TRUE if successful, PR_FALSE otherwise
+     *
+     */
+    virtual PRBool RemoveItemAt(PRInt32 aPosition) = 0;
+
+    /**
+     * Gets an item at a specific location
+     *
+     * @param   anItem    on return contains the string of the item at that position
+     * @param   aPosition the Position of the item
+     *
+     */
+     virtual PRBool GetItemAt(nsString& anItem, PRInt32 aPosition) = 0;
+
+    /**
+     * Gets the selected item for a single selection list
+     *
+     * @param   aItem  on return contains the string of the selected item
+     *
+     */
+     NS_IMETHOD GetSelectedItem(nsString &aItem) = 0;
+
+    /**
+     * Returns with the index of the selected item
+     *
+     * @return  PRInt32, index of selected item
+     *
+     */
+    virtual PRInt32 GetSelectedIndex()  = 0;
+
+    /**
+     * Select the item at the specified position
+     *
+     * @param   PRInt32, the item position
+     *                   0 is at the top of the list
+     *                   -1 is at the end of the list
+     *
+     */
+    NS_IMETHOD SelectItem(PRInt32 aPosition)  = 0;
+
+    /**
+     * Deselects all the items in the list
+     *
+     */
+    NS_IMETHOD Deselect()  = 0;
+
+
+    /**
+     * Set the listbox to be multi-select.
+     * @param   aMultiple PR_TRUE can have multiple selections. PR_FALSE single
+     *          selections only.
+     * @return  void
+     *
+     */
+
+    NS_IMETHOD  SetMultipleSelection(PRBool aMultipleSelections) = 0;
+
+    /**
+     * Return the number of selected items. For single selection list box this
+     * @return the number of selected items
+     * can be 1 or 0. 
+     *
+     */
+    virtual PRInt32  GetSelectedCount() = 0;
+
+    /**
+     * Retrieves the indices of the selected items.
+     * @param aIndices Array to hold the selected items. Use GetSelectedCount to
+     *        determine how large the array needs to be.
+     * @param aSize Size of the aIndices array
+     *
+     */
+    NS_IMETHOD  GetSelectedIndices(PRInt32 aIndices[], PRInt32 aSize) = 0;
+
+    /**
+     * Sets the indices of the selected items.
+     * @param aIndices Array to hold the selected items. Use GetSelectedCount to
+     *        determine how large the array needs to be.
+     * @param aSize Size of the aIndices array
+     *
+     */
+    NS_IMETHOD  SetSelectedIndices(PRInt32 aIndices[], PRInt32 aSize) = 0;
+
+};
+
+#endif // nsIListBox_h__
+
+
+

mozilla/widget/public/nsIListWidget.h

@@ -0,0 +1,130 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsIListWidget_h__
+#define nsIListWidget_h__
+
+#include "nsIWidget.h"
+#include "nsString.h"
+
+// {F8030013-C342-11d1-97F0-00609703C14E}
+#define NS_ILISTWIDGET_IID \
+{ 0xf8030013, 0xc342, 0x11d1, { 0x97, 0xf0, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
+
+/**
+ * 
+ * Base class for nsIListBox and nsIComboBox
+ *
+ */
+
+class nsIListWidget : public nsISupports {
+
+public:
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_ILISTWIDGET_IID)
+
+    /**
+     * Set an item at the specific position
+     *
+     * @param   aItem     the item name. The item has to be null terminated
+     * @param   aPosition the position the item should be inserted at
+     *                    0 is at the top of the list
+     *                    -1 is at the end of the list
+     */
+    NS_IMETHOD AddItemAt(nsString &aItem, PRInt32 aPosition) = 0;
+
+    /**
+     * Finds the first occurrence of the specified item
+     *
+     * @param   aItem     the string to be filled
+     * @param   aStartPos the starting position (index)
+     * @return  PR_TRUE if successful, PR_FALSE otherwise
+     *
+     */
+    virtual PRInt32  FindItem(nsString &aItem, PRInt32 aStartPos) = 0;
+
+    /**
+     * Returns the number of items in the list
+     *
+     * @return  the number of items
+     *
+     */
+    virtual PRInt32  GetItemCount() = 0;
+
+    /**
+     * Remove the first occurrence of the specified item
+     *
+     * @param   aPosition the item position
+     *                    0 is at the top of the list
+     *                    -1 is at the end of the list
+     *
+     * @return  PR_TRUE if successful, PR_FALSE otherwise
+     *
+     */
+    virtual PRBool RemoveItemAt(PRInt32 aPosition) = 0;
+
+    /**
+     * Gets an item at a specific location
+     *
+     * @param   anItem    on return contains the string of the item at that position
+     * @param   aPosition the Position of the item
+     *
+     */
+     virtual PRBool GetItemAt(nsString& anItem, PRInt32 aPosition) = 0;
+
+    /**
+     * Gets the selected item for a single selection list
+     *
+     * @param   aItem  on return contains the string of the selected item
+     *
+     */
+     NS_IMETHOD GetSelectedItem(nsString &aItem) = 0;
+
+    /**
+     * Returns with the index of the selected item
+     *
+     * @return  PRInt32, index of selected item
+     *
+     */
+    virtual PRInt32 GetSelectedIndex()  = 0;
+
+    /**
+     * Select the item at the specified position
+     *
+     * @param   PRInt32, the item position
+     *                   0 is at the top of the list
+     *                   -1 is at the end of the list
+     *
+     */
+    NS_IMETHOD SelectItem(PRInt32 aPosition)  = 0;
+
+    /**
+     * Deselects all the items in the list
+     *
+     */
+    NS_IMETHOD Deselect()  = 0;
+
+};
+
+#endif // nsIListWidget_h__
+
+
+

mozilla/widget/public/nsILookAndFeel.h

@@ -0,0 +1,161 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef __nsILookAndFeel
+#define __nsILookAndFeel
+#include "nsISupports.h"
+#include "nsColor.h"
+#include "nsFont.h"
+
+#ifdef NS_DEBUG
+#include "nsSize.h"
+#endif
+
+
+// {21B51DE1-21A3-11d2-B6E0-00805F8A2676}
+#define NS_ILOOKANDFEEL_IID \
+{ 0x21b51de1, 0x21a3, 0x11d2, \
+    { 0xb6, 0xe0, 0x0, 0x80, 0x5f, 0x8a, 0x26, 0x76 } }
+
+class nsILookAndFeel: public nsISupports {
+public:
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_ILOOKANDFEEL_IID)
+
+  typedef enum {
+    eColor_WindowBackground,
+    eColor_WindowForeground,
+    eColor_WidgetBackground,
+    eColor_WidgetForeground,
+    eColor_WidgetSelectBackground,
+    eColor_WidgetSelectForeground,
+    eColor_Widget3DHighlight,
+    eColor_Widget3DShadow,
+    eColor_TextBackground,
+    eColor_TextForeground,
+    eColor_TextSelectBackground,
+    eColor_TextSelectForeground,
+
+    // New CSS 2 color definitions
+    eColor_activeborder,
+    eColor_activecaption,
+    eColor_appworkspace,
+    eColor_background,
+    eColor_buttonface,
+    eColor_buttonhighlight,
+    eColor_buttonshadow,
+    eColor_buttontext,
+    eColor_captiontext,
+    eColor_graytext,
+    eColor_highlight,
+    eColor_highlighttext,
+    eColor_inactiveborder,
+    eColor_inactivecaption,
+    eColor_inactivecaptiontext,
+    eColor_infobackground,
+    eColor_infotext,
+    eColor_menu,
+    eColor_menutext,
+    eColor_scrollbar,
+    eColor_threeddarkshadow,
+    eColor_threedface,
+    eColor_threedhighlight,
+    eColor_threedlightshadow,
+    eColor_threedshadow,
+    eColor_window,
+    eColor_windowframe,
+    eColor_windowtext
+
+  } nsColorID;
+
+  typedef enum {
+    eMetric_WindowTitleHeight,
+    eMetric_WindowBorderWidth,
+    eMetric_WindowBorderHeight,
+    eMetric_Widget3DBorder,
+    eMetric_TextFieldBorder,                              // Native border size
+    eMetric_TextFieldHeight,
+    eMetric_TextVerticalInsidePadding,                    // needed only because of GTK
+    eMetric_TextShouldUseVerticalInsidePadding,           // needed only because of GTK
+    eMetric_TextHorizontalInsideMinimumPadding,  
+    eMetric_TextShouldUseHorizontalInsideMinimumPadding,  // needed only because of GTK
+    eMetric_ButtonHorizontalInsidePaddingNavQuirks,  
+    eMetric_ButtonHorizontalInsidePaddingOffsetNavQuirks, 
+    eMetric_CheckboxSize,
+    eMetric_RadioboxSize,
+    
+    eMetric_ListShouldUseHorizontalInsideMinimumPadding,  // needed only because of GTK
+    eMetric_ListHorizontalInsideMinimumPadding,         
+
+    eMetric_ListShouldUseVerticalInsidePadding,           // needed only because of GTK
+    eMetric_ListVerticalInsidePadding,                    // needed only because of GTK
+
+    eMetric_CaretBlinkTime,                               // default, may be overriden by OS
+    eMetric_CaretWidthTwips
+  } nsMetricID;
+
+  typedef enum {
+    eMetricFloat_TextFieldVerticalInsidePadding,
+    eMetricFloat_TextFieldHorizontalInsidePadding,
+    eMetricFloat_TextAreaVerticalInsidePadding,
+    eMetricFloat_TextAreaHorizontalInsidePadding,
+    eMetricFloat_ListVerticalInsidePadding,
+    eMetricFloat_ListHorizontalInsidePadding,
+    eMetricFloat_ButtonVerticalInsidePadding,
+    eMetricFloat_ButtonHorizontalInsidePadding
+  } nsMetricFloatID;
+
+  
+  NS_IMETHOD GetColor(const nsColorID aID, nscolor &aColor) = 0;
+  NS_IMETHOD GetMetric(const nsMetricID aID, PRInt32 & aMetric) = 0;
+  NS_IMETHOD GetMetric(const nsMetricFloatID aID, float & aMetric) = 0;
+
+
+#ifdef NS_DEBUG
+  typedef enum {
+    eMetricSize_TextField = 0,
+    eMetricSize_TextArea  = 1,
+    eMetricSize_ListBox   = 2,
+    eMetricSize_ComboBox  = 3,
+    eMetricSize_Radio     = 4,
+    eMetricSize_CheckBox  = 5,
+    eMetricSize_Button    = 6
+  } nsMetricNavWidgetID;
+
+  typedef enum {
+    eMetricSize_Courier   = 0,
+    eMetricSize_SansSerif = 1
+  } nsMetricNavFontID;
+
+  // This method returns the actual (or nearest estimate) 
+  // of the Navigator size for a given form control for a given font
+  // and font size. This is used in NavQuirks mode to see how closely
+  // we match its size
+  NS_IMETHOD GetNavSize(const nsMetricNavWidgetID aWidgetID,
+                        const nsMetricNavFontID   aFontID, 
+                        const PRInt32             aFontSize, 
+                        nsSize &aSize) = 0;
+#endif
+};
+
+#define nsLAF nsILookAndFeel
+
+#endif /* __nsILookAndFeel */

mozilla/widget/public/nsIMenu.h

@@ -0,0 +1,190 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsIMenu_h__
+#define nsIMenu_h__
+
+#include "nsISupports.h"
+#include "nsString.h"
+#include "nsIDOMNode.h"
+#include "nsIDOMElement.h"
+#include "nsIWebShell.h"
+
+class nsIMenuBar;
+class nsIMenu;
+class nsIMenuItem;
+class nsIMenuListener;
+
+// {35A3DEC1-4992-11d2-8DBA-00609703C14E}
+#define NS_IMENU_IID      \
+{ 0x35a3dec1, 0x4992, 0x11d2, \
+  { 0x8d, 0xba, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
+
+
+/**
+ * Menu widget
+ */
+class nsIMenu : public nsISupports {
+
+  public:
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IMENU_IID)
+
+  /**
+    * Creates the Menu
+    *
+    */
+    NS_IMETHOD Create(nsISupports * aParent, const nsString &aLabel) = 0;
+
+   /**
+    * Get the Menu's Parent
+    *
+    */
+    NS_IMETHOD GetParent(nsISupports *&aParent) = 0;
+
+   /**
+    * Get the Menu label
+    *
+    */
+    NS_IMETHOD GetLabel(nsString &aText) = 0;
+
+   /**
+    * Set the Menu label
+    *
+    */
+    NS_IMETHOD SetLabel(const nsString &aText) = 0;
+
+	/**
+    * Get the Menu Access Key
+    *
+    */
+	NS_IMETHOD GetAccessKey(nsString &aText) = 0;
+   
+	/**
+    * Set the Menu Access Key
+    *
+    */
+	NS_IMETHOD SetAccessKey(const nsString &aText) = 0;
+
+	/**
+    * Set the Menu enabled state
+    *
+    */
+	NS_IMETHOD SetEnabled(PRBool aIsEnabled) = 0;
+
+	/**
+    * Get the Menu enabled state
+    *
+    */
+	NS_IMETHOD GetEnabled(PRBool* aIsEnabled) = 0;
+	
+	/**
+    * Query if this is the help menu. Mostly for MacOS voodoo.
+    *
+    */
+	NS_IMETHOD IsHelpMenu(PRBool* aIsHelpMenu) = 0;
+	
+	/**
+    * Adds a Menu Item
+    *
+    */
+    NS_IMETHOD AddItem(nsISupports* aItem) = 0;
+
+   /**
+    * Adds a separator
+    *
+    */
+    NS_IMETHOD AddSeparator() = 0;
+
+   /**
+    * Returns the number of menu items
+    * This does count separators as items
+    */
+    NS_IMETHOD GetItemCount(PRUint32 &aCount) = 0;
+
+   /**
+    * Returns a Menu or Menu Item at a specified Index
+    *
+    */
+    NS_IMETHOD GetItemAt(const PRUint32 aPos, nsISupports *& aMenuItem) = 0;
+
+   /**
+    * Inserts a Menu Item at a specified Index
+    *
+    */
+    NS_IMETHOD InsertItemAt(const PRUint32 aPos, nsISupports * aMenuItem) = 0;
+
+   /**
+    * Removes an Menu Item from a specified Index
+    *
+    */
+    NS_IMETHOD RemoveItem(const PRUint32 aPos) = 0;
+
+   /**
+    * Removes all the Menu Items
+    *
+    */
+    NS_IMETHOD RemoveAll() = 0;
+
+   /**
+    * Gets Native MenuHandle
+    *
+    */
+    NS_IMETHOD  GetNativeData(void** aData) = 0;
+
+   /**
+    * Sets Native MenuHandle
+    *
+    */
+    NS_IMETHOD  SetNativeData(void* aData) = 0;
+    
+   /**
+    * Adds menu listener for dynamic construction
+    *
+    */
+    NS_IMETHOD AddMenuListener(nsIMenuListener * aMenuListener) = 0;
+
+   /**
+    * Removes menu listener for dynamic construction
+    *
+    */
+    NS_IMETHOD RemoveMenuListener(nsIMenuListener * aMenuListener) = 0;
+
+   /**
+    * Set DOMNode
+    *
+    */
+    NS_IMETHOD SetDOMNode(nsIDOMNode * aMenuNode) = 0;
+
+	/**
+    * Set DOMElement
+    *
+    */
+    NS_IMETHOD SetDOMElement(nsIDOMElement * aMenuElement) = 0;
+
+	/**
+    * Set WebShell
+    *
+    */
+    NS_IMETHOD SetWebShell(nsIWebShell * aWebShell) = 0;
+};
+
+#endif

mozilla/widget/public/nsIMenuBar.h

@@ -0,0 +1,120 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsIMenuBar_h__
+#define nsIMenuBar_h__
+
+#include "nsISupports.h"
+#include "nsString.h"
+#include "nsIMenu.h"
+#include "nsIWebShell.h"
+
+class nsIWidget;
+
+// {BC658C81-4BEB-11d2-8DBB-00609703C14E}
+#define NS_IMENUBAR_IID      \
+{ 0xbc658c81, 0x4beb, 0x11d2, \
+  { 0x8d, 0xbb, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
+
+/**
+ * MenuBar widget
+ */
+class nsIMenuBar : public nsISupports {
+
+  public:
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IMENUBAR_IID)
+
+   /**
+    * Creates the MenuBar
+    *
+    */
+    NS_IMETHOD Create(nsIWidget * aParent) = 0;
+
+   /**
+    * Get the MenuBar's Parent
+    *
+    */
+    NS_IMETHOD GetParent(nsIWidget *&aParent) = 0;
+
+   /**
+    * Set the MenuBar's Parent
+    *
+    */
+    NS_IMETHOD SetParent(nsIWidget *aParent) = 0;
+
+   /**
+    * Adds the Menu 
+    *
+    */
+    NS_IMETHOD AddMenu(nsIMenu * aMenu) = 0;
+    
+   /**
+    * Returns the number of menus
+    *
+    */
+    NS_IMETHOD GetMenuCount(PRUint32 &aCount) = 0;
+
+   /**
+    * Returns a Menu Item at a specified Index
+    *
+    */
+    NS_IMETHOD GetMenuAt(const PRUint32 aCount, nsIMenu *& aMenu) = 0;
+
+   /**
+    * Inserts a Menu at a specified Index
+    *
+    */
+    NS_IMETHOD InsertMenuAt(const PRUint32 aCount, nsIMenu *& aMenu) = 0;
+
+   /**
+    * Removes an Menu from a specified Index
+    *
+    */
+    NS_IMETHOD RemoveMenu(const PRUint32 aCount) = 0;
+
+   /**
+    * Removes all the Menus
+    *
+    */
+    NS_IMETHOD RemoveAll() = 0;
+
+   /**
+    * Gets Native MenuHandle
+    *
+    */
+    NS_IMETHOD  GetNativeData(void*& aData) = 0;
+
+   /**
+    * Sets Native MenuHandle. Temporary hack for mac until 
+    * nsMenuBar does it's own construction
+    */
+    NS_IMETHOD  SetNativeData(void* aData) = 0;
+    
+   /**
+    * Draw the menubar
+    *
+    */
+    NS_IMETHOD  Paint() = 0;
+   
+};
+
+#endif

mozilla/widget/public/nsIMenuItem.h

@@ -0,0 +1,189 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsIMenuItem_h__
+#define nsIMenuItem_h__
+
+#include "prtypes.h"
+#include "nsISupports.h"
+#include "nsString.h"
+
+#include "nsIWebShell.h"
+#include "nsIDOMElement.h"
+
+// {7F045771-4BEB-11d2-8DBB-00609703C14E}
+#define NS_IMENUITEM_IID      \
+{ 0x7f045771, 0x4beb, 0x11d2, \
+  { 0x8d, 0xbb, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
+
+class nsIMenu;
+class nsIPopUpMenu;
+class nsIWidget;
+class nsIMenuListener;
+
+enum {
+  knsMenuItemNoModifier      = 0,
+  knsMenuItemShiftModifier   = (1 << 0),
+  knsMenuItemAltModifier     = (1 << 1),
+  knsMenuItemControlModifier = (1 << 2),
+  knsMenuItemCommandModifier = (1 << 3)
+};
+
+/**
+ * MenuItem widget
+ */
+class nsIMenuItem : public nsISupports {
+
+  public:
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IMENUITEM_IID)
+
+   /**
+    * Creates the MenuItem
+    *
+    */
+    NS_IMETHOD Create(nsISupports    * aParent, 
+                      const nsString & aLabel, 
+                      PRBool           isSeparator) = 0;
+    
+   /**
+    * Get the MenuItem label
+    *
+    */
+    NS_IMETHOD GetLabel(nsString &aText) = 0;
+
+   /**
+    * Get the MenuItem label
+
+    *
+    */
+    NS_IMETHOD SetLabel(nsString &aText) = 0;
+
+   /**
+    * Set the Menu shortcut char
+    *
+    */
+    NS_IMETHOD SetShortcutChar(const nsString &aText) = 0;
+  
+    /**
+    * Get the Menu shortcut char
+    *
+    */
+    NS_IMETHOD GetShortcutChar(nsString &aText) = 0;
+   /**
+    * Sets whether the item is enabled or disabled
+    *
+    */
+    NS_IMETHOD SetEnabled(PRBool aIsEnabled) = 0;
+
+   /**
+    * Gets whether the item is enabled or disabled
+    *
+    */
+    NS_IMETHOD GetEnabled(PRBool *aIsEnabled) = 0;
+
+   /**
+    * Sets whether the item is checked or not
+    *
+    */
+    NS_IMETHOD SetChecked(PRBool aIsEnabled) = 0;
+
+   /**
+    * Gets whether the item is checked or not
+    *
+    */
+    NS_IMETHOD GetChecked(PRBool *aIsEnabled) = 0;
+
+   /**
+    * Sets whether the item is a checkbox type
+    *
+    */
+    NS_IMETHOD SetCheckboxType(PRBool aIsCheckbox) = 0;
+
+   /**
+    * Gets whether the item is a checkbox type
+    *
+    */
+    NS_IMETHOD GetCheckboxType(PRBool *aIsCheckbox) = 0;
+    
+   /**
+    * Gets the MenuItem Command identifier
+    *
+    */
+    NS_IMETHOD GetCommand(PRUint32 & aCommand) = 0;
+
+   /**
+    * Gets the target for MenuItem
+    *
+    */
+    NS_IMETHOD GetTarget(nsIWidget *& aTarget) = 0;
+    
+   /**
+    * Gets Native Menu Handle
+    *
+    */
+    NS_IMETHOD GetNativeData(void*& aData) = 0;
+
+   /**
+    * Adds menu listener
+    *
+    */
+    NS_IMETHOD AddMenuListener(nsIMenuListener * aMenuListener) = 0;
+
+   /**
+    * Removes menu listener
+    *
+    */
+    NS_IMETHOD RemoveMenuListener(nsIMenuListener * aMenuListener) = 0;
+
+   /**
+    * Indicates whether it is a separator
+    *
+    */
+    NS_IMETHOD IsSeparator(PRBool & aIsSep) = 0;
+
+   /**
+    * Sets the JavaScript Command to be invoked when a "gui" event occurs on a source widget
+    * @param aStrCmd the JS command to be cached for later execution
+    * @return NS_OK 
+    */
+    NS_IMETHOD SetCommand(const nsString & aStrCmd) = 0;
+
+   /**
+    * Executes the "cached" JavaScript Command 
+    * @return NS_OK if the command was executed properly, otherwise an error code
+    */
+    NS_IMETHOD DoCommand() = 0;
+
+    NS_IMETHOD SetDOMNode(nsIDOMNode * aDOMNode) = 0;
+    NS_IMETHOD GetDOMNode(nsIDOMNode ** aDOMNode) = 0;
+    NS_IMETHOD SetDOMElement(nsIDOMElement * aDOMElement) = 0;
+    NS_IMETHOD GetDOMElement(nsIDOMElement ** aDOMElement) = 0;
+    NS_IMETHOD SetWebShell(nsIWebShell * aWebShell) = 0;
+    
+    /**
+    *
+    */
+    NS_IMETHOD SetModifiers(PRUint8 aModifiers) = 0;
+    NS_IMETHOD GetModifiers(PRUint8 * aModifiers) = 0;
+};
+
+#endif

mozilla/widget/public/nsIMenuListener.h

@@ -0,0 +1,85 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsIMenuListener_h__
+#define nsIMenuListener_h__
+
+#include "nsGUIEvent.h"
+#include "nsISupports.h"
+
+// TODO: This needs to be generated!
+// {BC658C81-4BEB-11d2-8DBB-00609703C14E}
+#define NS_IMENULISTENER_IID      \
+{ 0xbc658c81, 0x4beb, 0x11d2, \
+  { 0x8d, 0xbb, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x9e } }
+  
+static NS_DEFINE_IID(kIMenuListenerIID, NS_IMENULISTENER_IID);
+
+/**
+ *
+ * Menu event listener
+ * This interface should only be implemented by the menu manager
+ * These are registered with nsWindows to recieve menu events
+ */
+
+class nsIMenuListener : public nsISupports {
+
+  public:
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IMENULISTENER_IID)
+
+	 /**
+     * Processes a menu item selected event
+     * @param aMenuEvent See nsGUIEvent.h 
+     * @return whether the event was consumed or ignored. See nsEventStatus
+     */
+    virtual nsEventStatus MenuItemSelected(const nsMenuEvent & aMenuEvent) = 0;
+
+    /**
+     * Processes a menu selected event
+     * @param aMenuEvent See nsGUIEvent.h 
+     * @return whether the event was consumed or ignored. See nsEventStatus
+     */
+    virtual nsEventStatus MenuSelected(const nsMenuEvent & aMenuEvent) = 0;
+
+    /**
+     * Processes a menu deselect event
+     * @param aMenuEvent See nsGUIEvent.h 
+     * @return whether the event was consumed or ignored. See nsEventStatus
+     */
+    virtual nsEventStatus MenuDeselected(const nsMenuEvent & aMenuEvent) = 0;
+
+    virtual nsEventStatus MenuConstruct(
+
+      const nsMenuEvent & aMenuEvent,
+
+      nsIWidget         * aParentWindow, 
+
+      void              * menubarNode,
+
+	  void              * aWebShell) = 0;
+
+      
+
+    virtual nsEventStatus MenuDestruct(const nsMenuEvent & aMenuEvent) = 0;
+};
+
+#endif // nsIMenuListener_h__

mozilla/widget/public/nsIMouseListener.h

@@ -0,0 +1,75 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+
+#ifndef nsIMouseListener_h__
+#define nsIMouseListener_h__
+
+#include "nsGUIEvent.h"
+#include "nsISupports.h"
+
+/**
+ *
+ * Mouse up/down/move event listener
+ *
+ */
+
+// {c83f6b81-d7ce-11d2-8360-c4c894c4917c}
+#define NS_IMOUSELISTENER_IID \
+{ 0xc83f6b81, 0xd7ce, 0x11d2, { 0x83, 0x60, 0xc4, 0xc8, 0x94, 0xc4, 0x91, 0x7c } }
+
+class nsIMouseListener : public nsISupports {
+public:
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IMOUSELISTENER_IID)
+
+    /**
+     * Processes a mouse pressed event
+     * @param aMouseEvent See nsGUIEvent.h 
+     * @return whether the event was consumed or ignored. See nsEventStatus
+     */
+    virtual nsEventStatus MousePressed(const nsGUIEvent & aMouseEvent) = 0;
+
+    /**
+     * Processes a mouse release event
+     * @param aMouseEvent See nsGUIEvent.h 
+     * @return whether the event was consumed or ignored. See nsEventStatus
+     */
+    virtual nsEventStatus MouseReleased(const nsGUIEvent & aMouseEvent) = 0;
+
+    /**
+     * Processes a mouse clicked event
+     * @param aMouseEvent See nsGUIEvent.h 
+     * @return whether the event was consumed or ignored. See nsEventStatus
+     *
+     */
+    virtual nsEventStatus MouseClicked(const nsGUIEvent & aMouseEvent) = 0;
+
+    /**
+     * Processes a mouse moved event
+     * @param aMouseEvent See nsGUIEvent.h 
+     * @return whether the event was consumed or ignored. See nsEventStatus
+     */
+    virtual nsEventStatus MouseMoved(const nsGUIEvent & aMouseEvent) = 0;
+
+};
+
+#endif // nsIMouseListener_h__

mozilla/widget/public/nsIPopUpMenu.h

@@ -0,0 +1,138 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsIPopUpMenu_h__
+#define nsIPopUpMenu_h__
+
+#include "nsISupports.h"
+#include "nsString.h"
+#include "nsIMenuItem.h"
+
+class nsIMenu;
+class nsIWidget;
+
+// {F6CD4F21-53AF-11d2-8DC4-00609703C14E}
+#define NS_IPOPUPMENU_IID      \
+{ 0xf6cd4f21, 0x53af, 0x11d2, \
+  { 0x8d, 0xc4, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
+
+/**
+ * PopUpMenu widget
+ */
+class nsIPopUpMenu : public nsISupports {
+
+  public:
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IPOPUPMENU_IID)
+
+   /**
+    * Creates the PopUpMenu
+    *
+    */
+    NS_IMETHOD Create(nsIWidget * aParent) = 0;
+    
+   /**
+    * Adds a PopUpMenu Item
+    *
+    */
+    NS_IMETHOD AddItem(const nsString &aText) = 0;
+    
+   /**
+    * Adds a PopUpMenu Item
+    *
+    */
+    NS_IMETHOD AddItem(nsIMenuItem * aMenuItem) = 0;
+    
+   /**
+    * Adds a Cascading PopUpMenu 
+    *
+    */
+    NS_IMETHOD AddMenu(nsIMenu * aMenu) = 0;
+    
+   /**
+    * Adds Separator
+    *
+    */
+    NS_IMETHOD AddSeparator() = 0;
+
+   /**
+    * Returns the number of menu items
+    *
+    */
+    NS_IMETHOD GetItemCount(PRUint32 &aCount) = 0;
+
+   /**
+    * Returns a PopUpMenu Item at a specified Index
+    *
+    */
+    NS_IMETHOD GetItemAt(const PRUint32 aCount, nsIMenuItem *& aMenuItem) = 0;
+
+   /**
+    * Inserts a PopUpMenu Item at a specified Index
+    *
+    */
+    NS_IMETHOD InsertItemAt(const PRUint32 aCount, nsIMenuItem *& aMenuItem) = 0;
+
+   /**
+    * Creates and inserts a PopUpMenu Item at a specified Index
+    *
+    */
+    NS_IMETHOD InsertItemAt(const PRUint32 aCount, const nsString & aMenuItemName) = 0;
+
+   /**
+    * Creates and inserts a Separator at a specified Index
+    *
+    */
+    NS_IMETHOD InsertSeparator(const PRUint32 aCount) = 0;
+
+   /**
+    * Removes an PopUpMenu Item from a specified Index
+    *
+    */
+    NS_IMETHOD RemoveItem(const PRUint32 aCount) = 0;
+
+   /**
+    * Removes all the PopUpMenu Items
+    *
+    */
+    NS_IMETHOD RemoveAll() = 0;
+
+   /**
+    * Shows menu and waits for action
+    *
+    */
+    NS_IMETHOD ShowMenu(PRInt32 aX, PRInt32 aY) = 0;
+
+   /**
+    * Gets Native MenuHandle
+    *
+    */
+    NS_IMETHOD  GetNativeData(void*& aData) = 0;
+
+   /**
+    * Gets parent widget
+    *
+    */
+    NS_IMETHOD  GetParent(nsIWidget *& aParent) = 0;
+
+};
+
+#endif

mozilla/widget/public/nsIRadioButton.h

@@ -0,0 +1,80 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsIRadioButton_h__
+#define nsIRadioButton_h__
+
+#include "nsIButton.h"
+
+#define NS_IRADIOBUTTON_IID   \
+{ 0x18032ad4, 0xb265, 0x11d2, \
+{ 0xaa, 0x2a, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } }       
+
+/**
+ * RadioButton widget. Can show itself in a checked or unchecked state. 
+ * The RadioButton widget automatically shows itself checked or unchecked when clicked on.
+ */
+
+class nsIRadioButton : public nsISupports {
+
+public:
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IRADIOBUTTON_IID)
+
+   /**
+    * Set the button label
+    *
+    * @param aText  button label
+    * @result set to NS_OK if method successful
+    */
+  
+    NS_IMETHOD SetLabel(const nsString &aText) = 0;
+    
+   /**
+    * Get the button label
+    *
+    * @param aBuffer contains label upon return
+    * @result set to NS_OK if method successful
+    */
+ 
+    NS_IMETHOD GetLabel(nsString &aBuffer) = 0;
+
+    /**
+     * Set the check state.
+     * @param aState PR_TRUE show as checked. PR_FALSE show unchecked.
+     * @result set to NS_OK if method successful
+     */
+
+    NS_IMETHOD SetState(const PRBool aState) = 0;
+    
+    /**
+     * Get the check state.
+     * @param aState PR_TRUE if checked. PR_FALSE if unchecked.
+     * @result set to NS_OK if method successful
+     */
+
+    NS_IMETHOD GetState(PRBool& aState) = 0;
+
+};
+
+#endif  // nsIRadioButton_h__
+
+

mozilla/widget/public/nsIRollupListener.idl

@@ -0,0 +1,35 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is the Mozilla browser.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Contributor(s): 
+ *   Rod Spears <rods@netscape.com>
+ *   Stuart Parmenter <pavlov@netscape.com>
+ */
+
+#include "nsISupports.idl"
+
+[uuid(23C2BA03-6C76-11d3-96ED-0060B0FB9956)]
+interface nsIRollupListener : nsISupports
+{
+  /**
+   * Notifies the object to rollup
+   * @result NS_Ok if no errors
+   */
+  void Rollup();
+};

mozilla/widget/public/nsIScrollbar.h

@@ -0,0 +1,124 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsIScrollbar_h__
+#define nsIScrollbar_h__
+
+#include "nsIWidget.h"
+
+// {18032AD2-B265-11d1-AA2A-000000000000}
+#define NS_ISCROLLBAR_IID     \
+{ 0x18032ad2, 0xb265, 0x11d1, \
+{ 0xaa, 0x2a, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } }
+
+
+/**
+ *
+ * Scrollbar, converts mouse input into values that can be used
+ * to shift the contents of a window.
+ *
+ */
+
+
+class nsIScrollbar : public nsISupports
+{
+public:
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_ISCROLLBAR_IID)
+    
+    /**
+     * Set the scrollbar range
+     * @param aEndRange set range for scrollbar from 0 to aEndRange
+     * @result NS_Ok if no errors
+     *
+     */
+    NS_IMETHOD SetMaxRange(PRUint32 aEndRange) = 0;
+    
+    /**
+     * Get the scrollbar range
+     * @return the upper end of the scrollbar range
+     * @result NS_Ok if no errors
+     */
+    NS_IMETHOD GetMaxRange(PRUint32& aMaxRange) = 0;
+
+    /**
+     * Set the thumb position. 
+     * @param aPos a value between (startRange) and (endRange - thumbSize)
+     * @result NS_Ok if no errors
+     *
+     */
+    NS_IMETHOD SetPosition(PRUint32 aPos) = 0;
+
+    /**
+     * Get the thumb position. 
+     * @return a value between (startRange) and (endRange - thumbSize)
+     * @result NS_Ok if no errors
+     *
+     */
+    NS_IMETHOD GetPosition(PRUint32& aPos) = 0;
+
+    /**
+     * Set the thumb size. 
+     * @param aSize size of the thumb. Must be a value between 
+     *        startRange and endRange
+     * @result NS_Ok if no errors
+     */
+    NS_IMETHOD SetThumbSize(PRUint32 aSize) = 0;
+    
+    /**
+     * Get the thumb size. 
+     * @return size of the thumb. The value is between 
+     *          startRange and endRange
+     * @result NS_Ok if no errors
+     */
+    NS_IMETHOD GetThumbSize(PRUint32& aSize) = 0;
+
+    /**
+     * Set the line increment.
+     * @param aSize size of the line increment. The value must
+     *        be between startRange and endRange
+     * @result NS_Ok if no errors
+      */
+    NS_IMETHOD SetLineIncrement(PRUint32 aSize) = 0;
+  
+    /**
+     * Get the line increment.
+     * @return size of the line increment. The value is
+     *          between startRange and endRange
+     * @result NS_Ok if no errors
+     */
+    NS_IMETHOD GetLineIncrement(PRUint32& aSize) = 0;
+
+    /**
+     * Set all scrollbar parameters at once
+     * @param aMaxRange set range for scrollbar from 0 to aMaxRange
+     * @param aThumbSize size of the thumb. Must be a value between 
+     *        startRange and endRange
+     * @param aPosition a value between (startRange) and (endRange - thumbSize)
+     * @param aLineIncrement size of the line increment. The value must
+     *        be between startRange and endRange
+     * @result NS_Ok if no errors
+     */
+    NS_IMETHOD SetParameters(PRUint32 aMaxRange, PRUint32 aThumbSize,
+                               PRUint32 aPosition, PRUint32 aLineIncrement) = 0;
+};
+
+#endif // nsIScrollbar_h__

mozilla/widget/public/nsISound.idl

@@ -0,0 +1,43 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#include "nsISupports.idl"
+#include "nsIFileSpec.idl"
+
+[scriptable, uuid(B148EED1-236D-11d3-B35C-00A0CC3C1CDE)]
+interface nsISound : nsISupports
+{
+  void Init();
+
+  void Play(in nsIFileSpec filespec);
+  //  void Stop();
+
+  void Beep();
+};
+
+
+%{ C++
+
+extern nsresult
+NS_NewSound(nsISound** aSound);
+
+%}

mozilla/widget/public/nsITextAreaWidget.h

@@ -0,0 +1,158 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsITextAreaWidget_h__
+#define nsITextAreaWidget_h__
+
+#include "nsIWidget.h"
+#include "nsITextWidget.h"
+#include "nsString.h"
+
+// {F8030012-C342-11d1-97F0-00609703C14E}
+#define NS_ITEXTAREAWIDGET_IID \
+{ 0xf8030012, 0xc342, 0x11d1, { 0x97, 0xf0, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
+
+/**
+ * Multi-line text editor. 
+ * See nsITextWidget for capabilities. 
+ * Displays a scrollbar when the text content exceeds the number of lines 
+ * displayed.
+ * Unlike a nsIWidget, The textarea must automatically clear 
+ * itself to the background color when paint messages are generated.
+ */
+
+class nsITextAreaWidget : public nsISupports 
+{
+
+  public:
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_ITEXTAREAWIDGET_IID)
+
+    /**
+     * Get the text of this component.
+     *
+     * @param aTextBuffer  on return contains the text of this component
+     * @param aBufferSize  the size of the buffer passed in
+     * @param aActualSize  the number of char copied
+     * @result NS_Ok if no errors
+     *
+     */
+
+    NS_IMETHOD GetText(nsString &aTextBuffer, PRUint32 aBufferSize, PRUint32& aActualSize) = 0;
+
+    /**
+     * Set the text of this component.
+     *
+     * @param   aText -- an object containing a copy of the text
+     * @return  the number of chars in the text string
+     * @result NS_Ok if no errors
+     *
+     */
+
+    NS_IMETHOD SetText(const nsString &aText, PRUint32& aActualSize) = 0;
+
+    /**
+     * Insert text into this component.
+     * When aStartPos and aEndPos are a valid range this function performs a replace.
+     * When aStartPos and aEndPos are equal this function performs an insert.
+     * When aStartPos and aEndPos are both -1 (0xFFFFFFFF) this function performs an append.
+     * If aStartPos and aEndPos are out of range they are rounded to the closest end.
+     *
+     * @param   aText     the text to set
+     * @param   aStartPos starting position for inserting text
+     * @param   aEndPos   ending position for inserting text
+     * @result NS_Ok if no errors
+     */
+
+    NS_IMETHOD InsertText(const nsString &aText, PRUint32 aStartPos, PRUint32 aEndPos, PRUint32& aActualSize) = 0;
+
+    /**
+     * Remove any content from this text widget
+     * @result NS_Ok if no errors
+     */
+
+    NS_IMETHOD RemoveText(void) = 0;
+
+    /**
+     * Sets the maximum number of characters the widget can hold 
+     *
+     * @param aChars maximum number of characters for this widget. if 0 then there isn't any limit
+     * @result NS_Ok if no errors
+     */
+    
+    NS_IMETHOD SetMaxTextLength(PRUint32 aChars) = 0;
+
+
+    /**
+     * Set the text widget to be read-only
+     *
+     * @param  aReadOnlyFlag PR_TRUE the widget is read-only,
+     *         PR_FALSE indicates the widget is writable. 
+     * @param  PR_TRUE if it was read only. PR_FALSE if it was writable           
+     * @result NS_Ok if no errors
+     */
+
+    NS_IMETHOD SetReadOnly(PRBool aNewReadOnlyFlag, PRBool& aOldReadOnlyFlag) = 0;
+    
+    /**
+     * Select all of the contents
+     * @result NS_Ok if no errors
+     */
+
+    NS_IMETHOD SelectAll() = 0;
+
+    /**
+     * Set the selection in this text component
+     * @param aStartSel starting selection position in characters
+     * @param aEndSel ending selection position in characters 
+     * @result NS_Ok if no errors
+     */
+
+    NS_IMETHOD SetSelection(PRUint32 aStartSel, PRUint32 aEndSel) = 0;
+
+    /**
+     * Get the selection in this text component
+     * @param aStartSel starting selection position in characters
+     * @param aEndSel ending selection position in characters 
+     * @result NS_Ok if no errors
+     */
+
+    NS_IMETHOD GetSelection(PRUint32 *aStartSel, PRUint32 *aEndSel) = 0;
+
+    /**
+     * Set the caret position
+     * @param aPosition caret position in characters
+     * @result NS_Ok if no errors
+     */
+
+    NS_IMETHOD SetCaretPosition(PRUint32 aPosition) = 0;
+
+    /**
+     * Get the caret position
+     * @return caret position in characters
+     * @result NS_Ok if no errors
+     */
+
+    NS_IMETHOD GetCaretPosition(PRUint32& aPosition) = 0;
+};
+
+#endif // nsITextAreaWidget_h__
+

mozilla/widget/public/nsITextWidget.h

@@ -0,0 +1,179 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+#ifndef nsITextWidget_h__
+#define nsITextWidget_h__
+
+#include "nsIWidget.h"
+#include "nsString.h"
+
+// {F8030011-C342-11d1-97F0-00609703C14E}
+#define NS_ITEXTWIDGET_IID \
+{ 0xf8030011, 0xc342, 0x11d1, { 0x97, 0xf0, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
+
+
+struct nsTextWidgetInitData : public nsWidgetInitData {
+  nsTextWidgetInitData()
+    : mIsPassword(PR_FALSE),
+      mIsReadOnly(PR_FALSE)
+  {
+  }
+
+  PRBool mIsPassword;
+  PRBool mIsReadOnly;
+};
+
+
+/**
+ *
+ * Single line text editor. 
+ * Unlike a nsIWidget, The text editor must automatically clear 
+ * itself to the background color when paint messages are generated.
+ *
+ */
+
+class nsITextWidget : public nsISupports
+{
+
+  public:
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_ITEXTWIDGET_IID)
+
+    /**
+     * Get the text of this component.
+     *
+     * @param aTextBuffer  on return contains the text of this component
+     * @param aBufferSize  the size of the buffer passed in
+     * @param aActualSize  the number of char copied
+     * @result NS_Ok if no errors
+     *
+     */
+
+    NS_IMETHOD GetText(nsString &aTextBuffer, PRUint32 aBufferSize, PRUint32& aActualSize) = 0;
+
+    /**
+     * Set the text of this component.
+     *
+     * @param   aText -- an object containing a copy of the text
+     * @return  the number of chars in the text string
+     * @result NS_Ok if no errors
+     *
+     */
+
+    NS_IMETHOD SetText(const nsString &aText, PRUint32& aActualSize) = 0;
+
+    /**
+     * Insert text into this component.
+     * When aStartPos and aEndPos are a valid range this function performs a replace.
+     * When aStartPos and aEndPos are equal this function performs an insert.
+     * When aStartPos and aEndPos are both -1 (0xFFFFFFFF) this function performs an append.
+     * If aStartPos and aEndPos are out of range they are rounded to the closest end.
+     *
+     * @param   aText     the text to set
+     * @param   aStartPos starting position for inserting text
+     * @param   aEndPos   ending position for inserting text
+     * @result NS_Ok if no errors
+     */
+
+    NS_IMETHOD InsertText(const nsString &aText, PRUint32 aStartPos, PRUint32 aEndPos, PRUint32& aActualSize) = 0;
+
+    /**
+     * Remove any content from this text widget
+     * @result NS_Ok if no errors
+     */
+
+    NS_IMETHOD RemoveText(void) = 0;
+
+    /**
+     * Indicates a password will be entered. 
+     *
+     * @param aIsPassword PR_TRUE shows contents as asterisks. PR_FALSE shows
+     * contents as normal text.
+     * @result NS_Ok if no errors
+     */
+    
+    NS_IMETHOD SetPassword(PRBool aIsPassword) = 0;
+
+    /**
+     * Sets the maximum number of characters the widget can hold 
+     *
+     * @param aChars maximum number of characters for this widget. if 0 then there isn't any limit
+     * @result NS_Ok if no errors
+     */
+    
+    NS_IMETHOD SetMaxTextLength(PRUint32 aChars) = 0;
+
+
+    /**
+     * Set the text widget to be read-only
+     *
+     * @param  aReadOnlyFlag PR_TRUE the widget is read-only,
+     *         PR_FALSE indicates the widget is writable. 
+     * @param  PR_TRUE if it was read only. PR_FALSE if it was writable           
+     * @result NS_Ok if no errors
+     */
+
+    NS_IMETHOD SetReadOnly(PRBool aNewReadOnlyFlag, PRBool& aOldReadOnlyFlag) = 0;
+    
+    /**
+     * Select all of the contents
+     * @result NS_Ok if no errors
+     */
+
+    NS_IMETHOD SelectAll() = 0;
+
+    /**
+     * Set the selection in this text component
+     * @param aStartSel starting selection position in characters
+     * @param aEndSel ending selection position in characters 
+     * @result NS_Ok if no errors
+     */
+
+    NS_IMETHOD SetSelection(PRUint32 aStartSel, PRUint32 aEndSel) = 0;
+
+    /**
+     * Get the selection in this text component
+     * @param aStartSel starting selection position in characters
+     * @param aEndSel ending selection position in characters 
+     * @result NS_Ok if no errors
+     */
+
+    NS_IMETHOD GetSelection(PRUint32 *aStartSel, PRUint32 *aEndSel) = 0;
+
+    /**
+     * Set the caret position
+     * @param aPosition caret position in characters
+     * @result NS_Ok if no errors
+     */
+
+    NS_IMETHOD SetCaretPosition(PRUint32 aPosition) = 0;
+
+    /**
+     * Get the caret position
+     * @return caret position in characters
+     * @result NS_Ok if no errors
+     */
+
+    NS_IMETHOD GetCaretPosition(PRUint32& aPosition) = 0;
+
+};
+
+#endif // nsITextWidget_h__
+

mozilla/widget/public/nsIToolkit.idl

@@ -0,0 +1,50 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is the Mozilla browser.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Contributor(s): 
+ *   Stuart Parmenter <pavlov@netscape.com>
+ */
+
+#include "nsISupports.idl"
+
+%{ C++
+#include "prthread.h"
+%}
+
+[ptr] native PRThread(PRThread);
+
+
+[uuid(18032BD0-B265-11d1-AA2A-000000000000)]
+interface nsIToolkit : nsISupports
+{
+  /**
+   * Initialize this toolkit with aThread. 
+   * @param aThread The thread passed in runs the message pump.
+   *  NULL can be passed in, in which case a new thread gets created
+   *  and a message pump will run in that thread
+   *
+   */
+  void Init(in PRThread aThread);
+
+};
+
+
+%{ C++
+extern NS_METHOD NS_GetCurrentToolkit(nsIToolkit* *aResult);
+%}

mozilla/widget/public/nsITransferable.idl

@@ -0,0 +1,123 @@
+/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is Mozilla Communicator.
+ * 
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corp.  Portions created by Netscape are Copyright (C) 1999 Netscape 
+ * Communications Corp.  All Rights Reserved.
+ * 
+ * Contributor(s): 
+ *   Mike Pinkerton
+ */
+
+#include "nsISupports.idl"
+#include "nsISupportsArray.idl"
+#include "nsIFormatConverter.idl"
+
+
+%{ C++
+
+// these probably shouldn't live here, but in some central repository shared
+// by the entire app.
+#define kTextMime      "text/plain"
+#define kXIFMime       "text/xif"
+#define kUnicodeMime   "text/unicode"
+#define kHTMLMime      "text/html"
+#define kAOLMailMime   "AOLMAIL"
+#define kPNGImageMime  "image/png"
+#define kJPEGImageMime "image/jpg"
+#define kGIFImageMime  "image/gif"
+#define kDropFilesMime "text/dropfiles"
+
+%}
+
+
+[scriptable, uuid(8B5314BC-DB01-11d2-96CE-0060B0FB9956)]
+interface nsITransferable : nsISupports
+{
+  /**
+    * Computes a list of flavors (mime types as nsISupportsString) that the transferable 
+    * can export, either through intrinsic knowledge or output data converters.
+    *
+    * @param  aDataFlavorList fills list with supported flavors. This is a copy of
+    *          the internal list, so it may be edited w/out affecting the transferable.
+    */
+  nsISupportsArray flavorsTransferableCanExport ( ) ;
+
+  /**
+    * Given a flavor retrieve the data. 
+    *
+    * @param  aFlavor (in parameter) the flavor of data to retrieve
+    * @param  aData the data. Some variant of class in nsISupportsPrimitives.idl
+    * @param  aDataLen the length of the data
+    */
+  void getTransferData ( in string aFlavor, out nsISupports aData, out unsigned long aDataLen ) ;
+
+  /**
+    * Returns the best flavor in the transferable, given those that have
+    * been added to it with |AddFlavor()|
+    *
+    * @param  aFlavor (out parameter) the flavor of data that was retrieved
+    * @param  aData the data. Some variant of class in nsISupportsPrimitives.idl
+    * @param  aDataLen the length of the data
+    */
+  void getAnyTransferData ( out string aFlavor, out nsISupports aData, out unsigned long aDataLen ) ;
+
+  /**
+    * Returns true if the data is large.
+    */
+  boolean isLargeDataSet ( ) ;
+
+    ///////////////////////////////
+    // Setter part of interface 
+    ///////////////////////////////
+
+  /**
+    * Computes a list of flavors (mime types as nsISupportsString) that the transferable can
+    * accept into it, either through intrinsic knowledge or input data converters.
+    *
+    * @param  outFlavorList fills list with supported flavors. This is a copy of
+    *          the internal list, so it may be edited w/out affecting the transferable.
+    */
+  nsISupportsArray flavorsTransferableCanImport ( ) ;
+
+  /**
+    * Sets the data in the transferable with the specified flavor. The transferable
+    * will maintain its own copy the data, so it is not necessary to do that beforehand.
+    *
+    * @param  aFlavor the flavor of data that is being set
+    * @param  aData the data, some variant of class in nsISupportsPrimitives.idl
+    * @param  aDataLen the length of the data
+    */
+  void setTransferData ( in string aFlavor, in nsISupports aData, in unsigned long aDataLen ) ;
+
+  /**
+    * Add the data flavor, indicating that this transferable 
+    * can receive this type of flavor
+    *
+    * @param  aDataFlavor a new data flavor to handle
+    */
+  void addDataFlavor ( in string aDataFlavor ) ;
+
+  /**
+    * Removes the data flavor matching the given one (string compare) and the data
+    * that goes along with it.
+    *
+    * @param  aDataFlavor a data flavor to remove
+    */
+  void removeDataFlavor ( in string aDataFlavor ) ;
+
+  attribute nsIFormatConverter converter;
+
+};
+

mozilla/widget/public/nsIWidget.h

@@ -0,0 +1,725 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsIWidget_h__
+#define nsIWidget_h__
+
+#include "nsISupports.h"
+#include "nsColor.h"
+#include "nsIMouseListener.h"
+#include "nsIMenuListener.h"
+#include "nsIImage.h"
+
+#include "prthread.h"
+#include "nsGUIEvent.h"
+
+// forward declarations
+class   nsIAppShell;
+class   nsIToolkit;
+class   nsIFontMetrics;
+class   nsIToolkit;
+class   nsIRenderingContext;
+class   nsIEnumerator;
+class   nsIDeviceContext;
+struct  nsRect;
+struct  nsFont;
+class   nsIMenuBar;
+class   nsIEventListener;
+class   nsIRollupListener;
+
+/**
+ * Callback function that processes events.
+ * The argument is actually a subtype (subclass) of nsEvent which carries
+ * platform specific information about the event. Platform specific code knows
+ * how to deal with it.
+ * The return value determines whether or not the default action should take place.
+ */
+
+typedef nsEventStatus (*PR_CALLBACK EVENT_CALLBACK)(nsGUIEvent *event);
+
+/**
+ * Flags for the getNativeData function.
+ * See getNativeData()
+ */
+#define NS_NATIVE_WINDOW    0
+#define NS_NATIVE_GRAPHIC   1
+#define NS_NATIVE_COLORMAP  2
+#define NS_NATIVE_WIDGET    3
+#define NS_NATIVE_DISPLAY   4
+#define NS_NATIVE_REGION		5
+#define NS_NATIVE_OFFSETX		6
+#define NS_NATIVE_OFFSETY		7
+#define NS_NATIVE_PLUGIN_PORT	8
+#define NS_NATIVE_SCREEN      9
+
+// {18032AD5-B265-11d1-AA2A-000000000000}
+#define NS_IWIDGET_IID \
+{ 0x18032ad5, 0xb265, 0x11d1, \
+{ 0xaa, 0x2a, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } }
+
+
+// Hide the native window systems real window type so as to avoid
+// including native window system types and api's. This is necessary
+// to ensure cross-platform code.
+typedef void* nsNativeWidget;
+
+/**
+ * Border styles
+ */
+
+enum nsWindowType {
+  // default top level window
+  eWindowType_toplevel,
+  // top level window but usually handled differently by the OS
+  eWindowType_dialog,
+  // used for combo boxes, etc
+  eWindowType_popup,
+  // child windows (contained inside a window on the desktop (has no border))
+  eWindowType_child
+};
+
+
+enum nsBorderStyle
+{
+  // no border, titlebar, etc.. opposite of all
+  eBorderStyle_none     = 0,
+
+  // all window decorations
+  eBorderStyle_all      = 1 << 0,
+
+  // enables the border on the window.  these are only for decoration and are not resize hadles
+  eBorderStyle_border   = 1 << 1,
+
+  // enables the resize handles for the window.  if this is set, border is implied to also be set
+  eBorderStyle_resizeh  = 1 << 2,
+
+  // enables the titlebar for the window
+  eBorderStyle_title    = 1 << 3,
+
+  // enables the window menu button on the title bar.  this being on should force the title bar to display
+  eBorderStyle_menu     = 1 << 4,
+
+  // enables the minimize button so the user can minimize the window.
+  //   turned off for tranient windows since they can not be minimized seperate from their parent
+  eBorderStyle_minimize = 1 << 5,
+
+  // enables the maxmize button so the user can maximize the window
+  eBorderStyle_maximize = 1 << 6,
+
+  // show the close button
+  eBorderStyle_close    = 1 << 7,
+
+  // whatever the OS wants... i.e. don't do anything
+  eBorderStyle_default  = -1
+};
+
+/**
+ * Cursor types.
+ */
+
+enum nsCursor {   ///(normal cursor,       usually rendered as an arrow)
+                eCursor_standard, 
+                  ///(system is busy,      usually rendered as a hourglass or watch)
+                eCursor_wait, 
+                  ///(Selecting something, usually rendered as an IBeam)
+                eCursor_select, 
+                  ///(can hyper-link,      usually rendered as a human hand)
+                eCursor_hyperlink, 
+                  ///(west/east sizing,    usually rendered as ->||<-)
+                eCursor_sizeWE,
+                  ///(north/south sizing,  usually rendered as sizeWE rotated 90 degrees)
+                eCursor_sizeNS,
+                eCursor_arrow_north,
+                eCursor_arrow_north_plus,
+                eCursor_arrow_south,
+                eCursor_arrow_south_plus,
+                eCursor_arrow_west,
+                eCursor_arrow_west_plus,
+                eCursor_arrow_east,
+                eCursor_arrow_east_plus,
+                eCursor_crosshair,
+                //Don't know what 'move' cursor should be.  See CSS2.
+                eCursor_move,
+                eCursor_help
+                }; 
+
+
+/**
+ * Basic struct for widget initialization data.
+ * @see Create member function of nsIWidget
+ */
+
+struct nsWidgetInitData {
+  nsWidgetInitData()
+    : clipChildren(PR_FALSE), clipSiblings(PR_FALSE),
+      mWindowType(eWindowType_child),
+      mBorderStyle(eBorderStyle_default)
+  {
+  }
+
+  // when painting exclude area occupied by child windows and sibling windows
+  PRPackedBool  clipChildren, clipSiblings;
+  nsWindowType mWindowType;
+  nsBorderStyle mBorderStyle;
+};
+
+/**
+ * The base class for all the widgets. It provides the interface for
+ * all basic and necessary functionality.
+ */
+class nsIWidget : public nsISupports {
+
+  public:
+
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IWIDGET_IID)
+
+    /**
+     * Create and initialize a widget. 
+     *
+     * The widget represents a window that can be drawn into. It also is the 
+     * base class for user-interface widgets such as buttons and text boxes.
+     *
+     * All the arguments can be NULL in which case a top level window
+     * with size 0 is created. The event callback function has to be
+     * provided only if the caller wants to deal with the events this
+     * widget receives.  The event callback is basically a preprocess
+     * hook called synchronously. The return value determines whether
+     * the event goes to the default window procedure or it is hidden
+     * to the os. The assumption is that if the event handler returns
+     * false the widget does not see the event. The widget should not 
+     * automatically clear the window to the background color. The 
+     * calling code must handle paint messages and clear the background 
+     * itself. 
+     *
+     * @param     parent or null if it's a top level window
+     * @param     aRect     the widget dimension
+     * @param     aHandleEventFunction the event handler callback function
+     * @param     aContext
+     * @param     aAppShell the parent application shell. If nsnull,
+     *                      the parent window's application shell will be used.
+     * @param     aToolkit
+     * @param     aInitData data that is used for widget initialization
+     *
+     */
+    NS_IMETHOD Create(nsIWidget        *aParent,
+                        const nsRect     &aRect,
+                        EVENT_CALLBACK   aHandleEventFunction,
+                        nsIDeviceContext *aContext,
+                        nsIAppShell      *aAppShell = nsnull,
+                        nsIToolkit       *aToolkit = nsnull,
+                        nsWidgetInitData *aInitData = nsnull) = 0;
+
+    /**
+     * Create and initialize a widget with a native window parent
+     *
+     * The widget represents a window that can be drawn into. It also is the 
+     * base class for user-interface widgets such as buttons and text boxes.
+     *
+     * All the arguments can be NULL in which case a top level window
+     * with size 0 is created. The event callback function has to be
+     * provided only if the caller wants to deal with the events this
+     * widget receives.  The event callback is basically a preprocess
+     * hook called synchronously. The return value determines whether
+     * the event goes to the default window procedure or it is hidden
+     * to the os. The assumption is that if the event handler returns
+     * false the widget does not see the event.
+     *
+     * @param     aParent   native window.
+     * @param     aRect     the widget dimension
+     * @param     aHandleEventFunction the event handler callback function
+     */
+    NS_IMETHOD Create(nsNativeWidget aParent,
+                        const nsRect     &aRect,
+                        EVENT_CALLBACK   aHandleEventFunction,
+                        nsIDeviceContext *aContext,
+                        nsIAppShell      *aAppShell = nsnull,
+                        nsIToolkit       *aToolkit = nsnull,
+                        nsWidgetInitData *aInitData = nsnull) = 0;
+
+
+    /**
+     * Accessor functions to get and set the client data associated with the
+     * widget.
+     */
+    //@{
+    NS_IMETHOD  GetClientData(void*& aClientData) = 0;
+    NS_IMETHOD  SetClientData(void* aClientData) = 0;
+    //@}
+
+    /**
+     * Close and destroy the internal native window. 
+     * This method does not delete the widget.
+     */
+
+    NS_IMETHOD Destroy(void) = 0;
+
+    /**
+     * Return the parent Widget of this Widget or nsnull if this is a 
+     * top level window
+     *
+     * @return the parent widget or nsnull if it does not have a parent
+     *
+     */
+    virtual nsIWidget* GetParent(void) = 0;
+
+    /**
+     * Return an nsEnumerator over the children of this widget.
+     *
+     * @return an enumerator over the list of children or nsnull if it does not
+     * have any children
+     *
+     */
+    virtual nsIEnumerator*  GetChildren(void) = 0;
+
+    /**
+     * Show or hide this widget
+     *
+     * @param aState PR_TRUE to show the Widget, PR_FALSE to hide it
+     *
+     */
+    NS_IMETHOD Show(PRBool aState) = 0;
+
+    /**
+     * Make the window modal
+     *
+     */
+    NS_IMETHOD SetModal(PRBool aModal) = 0;
+
+    /**
+     * Returns whether the window is visible
+     *
+     */
+    NS_IMETHOD IsVisible(PRBool & aState) = 0;
+
+    /**
+     * Move this widget.
+     *
+     * @param aX the new x position expressed in the parent's coordinate system
+     * @param aY the new y position expressed in the parent's coordinate system
+     *
+     **/
+    NS_IMETHOD Move(PRInt32 aX, PRInt32 aY) = 0;
+
+    /**
+     * Resize this widget. 
+     *
+     * @param aWidth  the new width expressed in the parent's coordinate system
+     * @param aHeight the new height expressed in the parent's coordinate system
+     * @param aRepaint whether the widget should be repainted
+     *
+     */
+    NS_IMETHOD Resize(PRInt32 aWidth,
+                      PRInt32 aHeight,
+                      PRBool   aRepaint) = 0;
+
+    /**
+     * Move or resize this widget.
+     *
+     * @param aX       the new x position expressed in the parent's coordinate system
+     * @param aY       the new y position expressed in the parent's coordinate system
+     * @param aWidth   the new width expressed in the parent's coordinate system
+     * @param aHeight  the new height expressed in the parent's coordinate system
+     * @param aRepaint whether the widget should be repainted if the size changes
+     *
+     */
+    NS_IMETHOD Resize(PRInt32 aX,
+                      PRInt32 aY,
+                      PRInt32 aWidth,
+                      PRInt32 aHeight,
+                      PRBool   aRepaint) = 0;
+
+    /**
+     * Set's the widget's z-index.
+     */
+    NS_IMETHOD SetZIndex(PRInt32 aZIndex) = 0;
+
+    /**
+     * Get's the widget's z-index. 
+     */
+    NS_IMETHOD GetZIndex(PRInt32* aZIndex) = 0;
+
+    /**
+     * Enable or disable this Widget
+     *
+     * @param aState PR_TRUE to enable the Widget, PR_FALSE to disable it.
+     *
+     */
+    NS_IMETHOD Enable(PRBool aState) = 0;
+
+    /**
+     * Give focus to this widget.
+     */
+    NS_IMETHOD SetFocus(void) = 0;
+
+    /**
+     * Get this widget's outside dimensions relative to it's parent widget
+     *
+     * @param aRect on return it holds the  x. y, width and height of this widget
+     *
+     */
+    NS_IMETHOD GetBounds(nsRect &aRect) = 0;
+  
+    
+    /**
+     * Get this widget's client area dimensions, if the window has a 3D border appearance
+     * this returns the area inside the border, The x and y are always zero
+     *
+     * @param aRect on return it holds the  x. y, width and height of the client area of this widget
+     *
+     */
+    NS_IMETHOD GetClientBounds(nsRect &aRect) = 0;
+
+    /**
+     * Gets the width and height of the borders
+     * @param aWidth the width of the border
+     * @param aHeight the height of the border
+     *
+     */
+    NS_IMETHOD GetBorderSize(PRInt32 &aWidth, PRInt32 &aHeight) = 0;
+
+    /**
+     * Get the foreground color for this widget
+     *
+     * @return this widget's foreground color
+     *
+     */
+    virtual nscolor GetForegroundColor(void) = 0;
+
+    /**
+     * Set the foreground color for this widget
+     *
+     * @param aColor the new foreground color
+     *
+     */
+
+    NS_IMETHOD SetForegroundColor(const nscolor &aColor) = 0;
+
+    /**
+     * Get the background color for this widget
+     *
+     * @return this widget's background color
+     *
+     */
+
+    virtual nscolor GetBackgroundColor(void) = 0;
+
+    /**
+     * Set the background color for this widget
+     *
+     * @param aColor the new background color
+     *
+     */
+
+    NS_IMETHOD SetBackgroundColor(const nscolor &aColor) = 0;
+
+    /**
+     * Get the font for this widget
+     *
+     * @return the font metrics 
+     */
+
+    virtual nsIFontMetrics* GetFont(void) = 0;
+
+    /**
+     * Set the font for this widget 
+     *
+     * @param aFont font to display. See nsFont for allowable fonts
+     */
+
+    NS_IMETHOD SetFont(const nsFont &aFont) = 0;
+
+    /**
+     * Get the cursor for this widget.
+     *
+     * @return this widget's cursor.
+     */
+
+    virtual nsCursor GetCursor(void) = 0;
+
+    /**
+     * Set the cursor for this widget
+     *
+     * @param aCursor the new cursor for this widget
+     */
+
+    NS_IMETHOD SetCursor(nsCursor aCursor) = 0;
+
+    /**
+     * Invalidate the widget and repaint it.
+     *
+     * @param aIsSynchronouse PR_TRUE then repaint synchronously. If PR_FALSE repaint later.
+     * @see #Update()
+     */
+
+    NS_IMETHOD Invalidate(PRBool aIsSynchronous) = 0;
+
+    /**
+     * Invalidate a specified rect for a widget and repaints it.
+     *
+     * @param aIsSynchronouse PR_TRUE then repaint synchronously. If PR_FALSE repaint later.
+     * @see #Update()
+     */
+
+    NS_IMETHOD Invalidate(const nsRect & aRect, PRBool aIsSynchronous) = 0;
+
+    /**
+     * Invalidate a specified region for a widget and repaints it.
+     *
+     * @param aIsSynchronouse PR_TRUE then repaint synchronously. If PR_FALSE repaint later.
+     * @see #Update()
+     */
+
+    NS_IMETHOD InvalidateRegion(const nsIRegion* aRegion, PRBool aIsSynchronous) = 0;
+
+    /**
+     * Force a synchronous repaint of the window if there are dirty rects.
+     *
+     * @see Invalidate()
+     */
+
+     NS_IMETHOD Update() = 0;
+
+    /**
+     * Adds a mouse listener to this widget
+     * Any existing mouse listener is replaced
+     *
+     * @param aListener mouse listener to add to this widget.
+     */
+
+    NS_IMETHOD AddMouseListener(nsIMouseListener * aListener) = 0;
+
+    /**
+     * Adds an event listener to this widget
+     * Any existing event listener is replaced
+     *
+     * @param aListener event listener to add to this widget.
+     */
+
+    NS_IMETHOD AddEventListener(nsIEventListener * aListener) = 0;
+
+    /**
+     * Adds a menu listener to this widget
+     * Any existing menu listener is replaced
+     *
+     * @param aListener menu listener to add to this widget.
+     */
+
+    NS_IMETHOD AddMenuListener(nsIMenuListener * aListener) = 0;
+    
+    /**
+     * Return the widget's toolkit
+     *
+     * @return the toolkit this widget was created in. See nsToolkit.
+     */
+
+    virtual nsIToolkit* GetToolkit() = 0;    
+
+    /**
+     * Set the color map for this widget
+     *
+     * @param aColorMap color map for displaying this widget
+     *
+     */
+
+    NS_IMETHOD SetColorMap(nsColorMap *aColorMap) = 0;
+
+    /**
+     * Scroll this widget.
+     *
+     * @param aDx amount to scroll along the x-axis
+     * @param aDy amount to scroll along the y-axis.
+     * @param aClipRect clipping rectangle to limit the scroll to.
+     *
+     */
+
+    NS_IMETHOD Scroll(PRInt32 aDx, PRInt32 aDy, nsRect *aClipRect) = 0;
+
+    /**
+     * Scroll an area of this widget.
+     *
+     * @param aRect source rectangle to scroll in the widget
+     * @param aDx x offset from the source
+     * @param aDy y offset from the source
+     *
+     */
+
+    NS_IMETHOD ScrollRect(nsRect &aSrcRect, PRInt32 aDx, PRInt32 aDy) = 0;
+
+    /** 
+     * Internal methods
+     */
+
+    //@{
+    virtual void AddChild(nsIWidget* aChild) = 0;
+    virtual void RemoveChild(nsIWidget* aChild) = 0;
+    virtual void* GetNativeData(PRUint32 aDataType) = 0;
+    virtual void FreeNativeData(void * data, PRUint32 aDataType) = 0;//~~~
+    virtual nsIRenderingContext* GetRenderingContext() = 0;
+    virtual nsIDeviceContext* GetDeviceContext() = 0;
+    virtual nsIAppShell *GetAppShell() = 0;
+    //@}
+
+    /**
+     * Set border style
+     * Must be called before Create.
+     * @param aBorderStyle @see nsBorderStyle
+     */
+
+    NS_IMETHOD SetBorderStyle(nsBorderStyle aBorderStyle) = 0;
+
+    /**
+     * Set the widget's title.
+     * Must be called after Create.
+     *
+     * @param aTitle string displayed as the title of the widget
+     */
+
+    NS_IMETHOD SetTitle(const nsString& aTitle) = 0;
+
+    /**
+     * Set the widget's MenuBar.
+     * Must be called after Create.
+     *
+     * @param aMenuBar the menubar
+     */
+
+    NS_IMETHOD SetMenuBar(nsIMenuBar * aMenuBar) = 0;
+
+    /**
+     * Set the widget's MenuBar's visibility
+     *
+     * @param aShow PR_TRUE to show, PR_FALSE to hide
+     */
+
+    NS_IMETHOD ShowMenuBar(PRBool aShow) = 0;
+
+     /**
+     * Convert from this widget coordinates to screen coordinates.
+     *
+     * @param  aOldRect  widget coordinates stored in the x,y members
+     * @param  aNewRect  screen coordinates stored in the x,y members
+     */
+
+    NS_IMETHOD WidgetToScreen(const nsRect& aOldRect, nsRect& aNewRect) = 0;
+
+    /**
+     * Convert from screen coordinates to this widget's coordinates.
+     *
+     * @param  aOldRect  screen coordinates stored in the x,y members
+     * @param  aNewRect  widget's coordinates stored in the x,y members
+     */
+
+    NS_IMETHOD ScreenToWidget(const nsRect& aOldRect, nsRect& aNewRect) = 0;
+
+    /**
+     * When adjustments are to made to a whole set of child widgets, call this
+     * before resizing/positioning the child windows to minimize repaints. Must
+     * be followed by EndResizingChildren() after child windows have been
+     * adjusted.
+     *
+     */
+
+    NS_IMETHOD BeginResizingChildren(void) = 0;
+
+    /**
+     * Call this when finished adjusting child windows. Must be preceded by
+     * BeginResizingChildren().
+     *
+     */
+
+    NS_IMETHOD EndResizingChildren(void) = 0;
+
+    /**
+     * Returns the preferred width and height for the widget
+     *
+     */
+    NS_IMETHOD GetPreferredSize(PRInt32& aWidth, PRInt32& aHeight) = 0;
+
+    /**
+     * Set the preferred width and height for the widget
+     *
+     */
+    NS_IMETHOD SetPreferredSize(PRInt32 aWidth, PRInt32 aHeight) = 0;
+
+    /**
+     * Dispatches and event to the widget
+     *
+     */
+    NS_IMETHOD DispatchEvent(nsGUIEvent* event, nsEventStatus & aStatus) = 0;
+
+
+#ifdef LOSER
+    /**
+     * FSets the vertical scrollbar widget
+     *
+     */
+    NS_IMETHOD SetVerticalScrollbar(nsIWidget * aScrollbar) = 0;
+#endif
+
+    /**
+     * For printing and lightweight widgets
+     *
+     */
+    NS_IMETHOD Paint(nsIRenderingContext& aRenderingContext,
+                     const nsRect& aDirtyRect) = 0;
+   
+    /**
+     * Enables the dropping of files to a widget (XXX this is temporary)
+     *
+     */
+    NS_IMETHOD EnableDragDrop(PRBool aEnable) = 0;
+   
+    virtual void  ConvertToDeviceCoordinates(nscoord	&aX,nscoord	&aY) = 0;
+
+    /**
+     * Enables/Disables system mouse capture.
+     * @param aCapture PR_TRUE enables mouse capture, PR_FALSE disables mouse capture 
+     *
+     */
+    NS_IMETHOD CaptureMouse(PRBool aCapture) = 0;
+
+	/**
+	 * Enables/Disables system capture of any and all events that would cause a
+	 * dropdown to be rolled up, This method ignores the aConsumeRollupEvent 
+   * parameter when aDoCapture is FALSE
+	 * @param aCapture PR_TRUE enables capture, PR_FALSE disables capture 
+	 * @param aConsumeRollupEvent PR_TRUE consumes the rollup event, PR_FALSE dispatches rollup event
+	 *
+	 */
+    NS_IMETHOD CaptureRollupEvents(nsIRollupListener * aListener, PRBool aDoCapture, PRBool aConsumeRollupEvent) = 0;
+
+  /**
+   *   Determine whether a given event should be processed assuming we are
+   * the currently active modal window.
+   *   Note that the exact semantics of this method are platform-dependent.
+   * The Macintosh, for instance, cares deeply that this method do exactly
+   * as advertised. Gtk, for instance, handles modality in a completely
+   * different fashion and does little if anything with this method.
+   * @param aRealEvent event is real or a null placeholder (Macintosh)
+   * @param aEvent void pointer to native event structure
+   * @param aForWindow return value. PR_TRUE iff event should be processed.
+   */
+  NS_IMETHOD ModalEventFilter(PRBool aRealEvent, void *aEvent, PRBool *aForWindow) = 0;
+
+};
+
+#endif // nsIWidget_h__

mozilla/widget/public/nsIWidget.idl

@@ -0,0 +1,556 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is the Mozilla browser.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Contributor(s): 
+ *   Stuart Parmenter <pavlov@netscape.com>
+ *   Rod Spears <rods@netscape.com>
+ *   Kevin McCluskey <kmcclusk@netscape.com>
+ *   Mike Pinkerton <pinkerton@netscape.com>
+ *   ... and other people
+ */
+
+#include "nsISupports.idl"
+#include "nsIScriptableRegion.idl"
+#include "nsIRollupListener.idl"
+#include "nsIToolkit.idl"
+#include "nsIAppShell.idl"
+#include "nsIEnumerator.idl"
+
+%{ C++
+#include "nsRect.h"
+#include "nsColor.h"
+#include "nsIMouseListener.h"
+#include "nsIMenuListener.h"
+#include "nsIImage.h"
+
+#include "prthread.h"
+#include "nsGUIEvent.h"
+
+// forward declarations
+class   nsIAppShell;
+class   nsIToolkit;
+class   nsIRenderingContext;
+class   nsIEnumerator;
+class   nsIDeviceContext;
+struct  nsRect;
+struct  nsFont;
+class   nsIEventListener;
+class   nsIRollupListener;
+%}
+
+[ptr] native nsGUIEvent(nsGUIEvent);
+[ptr] native nsIMouseListener(nsIMouseListener);
+[ptr] native nsIEventListener(nsIEventListener);
+[ptr] native nsIMenuListener(nsIMenuListener);
+[ptr] native nsIRegion(nsIRegion);
+[ptr] native nsRect(nsRect);
+[ref] native nsRectRef(nsRect);
+[ptr] native nsFont(nsFont);
+[ptr] native nsColorMap(nsColorMap);
+
+[ptr] native nsIRenderingContext(nsIRenderingContext);
+[ptr] native nsIDeviceContext(nsIDeviceContext);
+
+native nscolor(nscolor);
+native nscoord(nscoord);
+native nsEventStatus(nsEventStatus);
+[ref] native nsEventStatusRef(nsEventStatus);
+native PR_CALLBACK(PR_CALLBACKK);
+native EVENT_CALLBACK(EVENT_CALLBACK);
+
+typedef long nsCursor;
+
+
+/*
+ * Hide the native window systems real window type so as to avoid
+ * including native window system types and api's. This is necessary
+ * to ensure cross-platform code.
+ */
+typedef voidStar nsNativeWidget;
+
+
+%{ C++
+typedef nsEventStatus (*PR_CALLBACK EVENT_CALLBACK)(nsGUIEvent *event);
+
+
+/**
+ * Basic struct for widget initialization data.
+ * @see Create member function of nsIWidget
+ */
+
+  struct nsWidgetInitData {
+    nsWidgetInitData()
+      : clipChildren(PR_FALSE), clipSiblings(PR_FALSE)
+      //      mWindowType(eWindowType_child),
+      //      mBorderStyle(eBorderStyle_default)
+    {
+    }
+
+    // when painting exclude area occupied by child windows and sibling windows
+    PRPackedBool  clipChildren, clipSiblings;
+    //    nsWindowType mWindowType;
+    //    nsBorderStyle mBorderStyle;
+  };
+%}
+
+
+[uuid(18032AD5-B265-11d1-AA2A-000000000000)]
+interface nsIWidget : nsISupports
+{
+
+  /*
+   * Flags for GetNativeData()
+   */
+  const short NS_NATIVE_WINDOW            = 0;
+  const short NS_NATIVE_GRAPHIC           = 1;
+  const short NS_NATIVE_COLORMAP          = 2;
+  const short NS_NATIVE_WIDGET            = 3;
+  const short NS_NATIVE_DISPLAY           = 4;
+  const short NS_NATIVE_REGION            = 5;
+  const short NS_NATIVE_OFFSETX           = 6;
+  const short NS_NATIVE_OFFSETY           = 7;
+  const short NS_NATIVE_PLUGIN_PORT       = 8;
+  const short NS_NATIVE_SCREEN            = 9;
+
+
+  /**
+   * Cursor types.
+   */
+
+  //(normal cursor,       usually rendered as an arrow)
+  const long eCursor_standard            = 0;
+  //(system is busy,      usually rendered as a hourglass or watch)
+  const long eCursor_wait                = 1;
+  //(Selecting something, usually rendered as an IBeam)
+  const long eCursor_select              = 2;
+  //(can hyper-link,      usually rendered as a human hand)
+  const long eCursor_hyperlink           = 3;
+  //(west/east sizing,    usually rendered as ->||<-)
+  const long eCursor_sizeWE              = 4;
+  //(north/south sizing,  usually rendered as sizeWE rotated 90 degrees)
+  const long eCursor_sizeNS              = 5;
+  const long eCursor_arrow_north         = 6;
+  const long eCursor_arrow_north_plus    = 7;
+  const long eCursor_arrow_south         = 8;
+  const long eCursor_arrow_south_plus    = 9;
+  const long eCursor_arrow_west          = 10;
+  const long eCursor_arrow_west_plus     = 11;
+  const long eCursor_arrow_east          = 12;
+  const long eCursor_arrow_east_plus     = 13;
+  const long eCursor_crosshair           = 14;
+  //Don't know what 'move' cursor should be.  See CSS2.
+  const long eCursor_move                = 15;
+  const long eCursor_help                = 16;
+
+
+  /**
+   * initialize a widget
+   *
+   * The widget represents a window that can be drawn into. It also is the 
+   * base class for user-interface widgets such as buttons and text boxes.
+   *
+   * All the arguments can be NULL in which case a top level window
+   * with size 0 is created. The event callback function has to be
+   * provided only if the caller wants to deal with the events this
+   * widget receives.  The event callback is basically a preprocess
+   * hook called synchronously. The return value determines whether
+   * the event goes to the default window procedure or it is hidden
+   * to the os. The assumption is that if the event handler returns
+   * false the widget does not see the event. The widget should not 
+   * automatically clear the window to the background color. The 
+   * calling code must handle paint messages and clear the background 
+   * itself. 
+   *
+   * @param     aAppShell      the parent application shell. If nsnull,
+   *                           the parent window's application shell will be used.
+   * @param     aToolkit       toolkit
+   * @param     aContext       device context
+   * @param     aEventFunction the event handler callback function
+   *
+   */
+  void initWidget(in nsIAppShell      aAppShell,
+                  in nsIToolkit       aToolkit,
+                  in nsIDeviceContext aContext,
+                  in EVENT_CALLBACK   aEventFunction);
+              
+  /**
+   * Get some kind of native data
+   */
+  voidStar getNativeData(in PRUint32 aDataType);
+
+  /**
+   * Move this widget.
+   *
+   * @param aX the new x position expressed in the parent's coordinate system
+   * @param aY the new y position expressed in the parent's coordinate system
+   *
+   **/
+  void move(in PRInt32 aX, in PRInt32 aY);
+
+  /**
+   * Resize this widget. 
+   *
+   * @param aWidth  the new width expressed in the parent's coordinate system
+   * @param aHeight the new height expressed in the parent's coordinate system
+   * @param aRepaint whether the widget should be repainted
+   *
+   */
+  void resize(in PRInt32 aWidth,
+              in PRInt32 aHeight,
+              in PRBool  aRepaint);
+
+  /**
+   * Move and resize this widget.
+   *
+   * @param aX       the new x position expressed in the parent's coordinate system
+   * @param aY       the new y position expressed in the parent's coordinate system
+   * @param aWidth   the new width expressed in the parent's coordinate system
+   * @param aHeight  the new height expressed in the parent's coordinate system
+   * @param aRepaint whether the widget should be repainted if the size changes
+   *
+   */
+  void moveResize(in PRInt32 aX,
+                  in PRInt32 aY,
+                  in PRInt32 aWidth,
+                  in PRInt32 aHeight,
+                  in PRBool  aRepaint);
+
+  /**
+   * Enable or disable this Widget
+   *
+   * @param aState PR_TRUE to enable the Widget, PR_FALSE to disable it.
+   *
+   */
+  void enable(in PRBool aState);
+
+
+  // XXX GO AWAY
+
+  /**
+   * Get this widget's outside dimensions relative to it's parent widget
+   *
+   * @param aRect on return it holds the  x. y, width and height of this widget
+   *
+   */
+  //  readonly attribute nsRect Bounds;
+
+  // this is really out..
+  void getBounds(in nsRectRef aRect);
+
+
+  // XXX keep this, but make it ints
+  /**
+   * Get this widget's client area dimensions, if the window has a 3D border appearance
+   * this returns the area inside the border, The x and y are always zero
+   *
+   * @param aRect on return it holds the  x. y, width and height of the client area of this widget
+   *
+   */
+  //  readonly attribute nsRect ClientBounds;
+
+  // this is really out..
+  void getClientBounds(in nsRectRef aRect);
+
+
+
+  // Is this still used?
+  /**
+   * Returns the preferred width and height for the widget
+   *
+   */
+  void getPreferredSize(out PRInt32 aWidth,
+                        out PRInt32 aHeight);
+  
+  /**
+   * Set the preferred width and height for the widget
+   *
+   */
+  void setPreferredSize(in PRInt32 aWidth, in PRInt32 aHeight);
+
+
+
+
+  /**
+   * Invalidate the widget and repaint it.
+   *
+   * @param aIsSynchronouse PR_TRUE then repaint synchronously. If PR_FALSE repaint later.
+   * @see #Update()
+   */
+  void invalidate(in PRBool aIsSynchronous);
+
+  /**
+   * Invalidate a specified rect for a widget and repaints it.
+   *
+   * @param aIsSynchronouse PR_TRUE then repaint synchronously. If PR_FALSE repaint later.
+   * @see #Update()
+   */
+  void invalidateRect([const] in nsRect aRect, in PRBool aIsSynchronous);
+
+  /**
+   * Invalidate a specified rect for a widget and repaints it.
+   *
+   * @param aIsSynchronouse PR_TRUE then repaint synchronously. If PR_FALSE repaint later.
+   * @see #Update()
+   */
+  //  void InvalidateRegion([const] in nsIScriptableRegion aRegion, in PRBool aIsSynchronous);
+  void invalidateRegion([const] in nsIRegion aRegion, in PRBool aIsSynchronous);
+
+  /**
+   * Force a synchronous repaint of the window if there are dirty rects.
+   *
+   * @see Invalidate()
+   */
+  void update();
+
+
+  /**
+   * Convert from this widget coordinates to screen coordinates.
+   *
+   * @param  aOldRect  widget coordinates stored in the x,y members
+   * @param  aNewRect  screen coordinates stored in the x,y members
+   */
+  void widgetToScreen([const] in nsRect aOldRect, out nsRect aNewRect);
+
+  /**
+   * Convert from screen coordinates to this widget's coordinates.
+   *
+   * @param  aOldRect  screen coordinates stored in the x,y members
+   * @param  aNewRect  widget's coordinates stored in the x,y members
+   */
+  void screenToWidget([const] in nsRect aOldRect, out nsRect aNewRect);
+
+  // is this used?
+  void convertToDeviceCoordinates(inout nscoord aX, inout nscoord aY);
+
+
+  // can this go away?
+  /**
+   * For printing and lightweight widgets
+   *
+   */
+  void paint(in nsIRenderingContext aRenderingContext,
+             [const] in nsRect aDirtyRect);
+  
+
+
+  /**
+   * Enables the dropping of files to a widget (XXX this is temporary)
+   *
+   */
+  void enableDragDrop(in PRBool aEnable);
+
+
+
+  /**
+   * Enables/Disables system mouse capture.
+   * @param aCapture PR_TRUE enables mouse capture, PR_FALSE disables mouse capture 
+   *
+   */
+  void captureMouse(in PRBool aCapture);
+
+  /**
+   * Enables/Disables system capture of any and all events that would cause a
+   * dropdown to be rolled up, This method ignores the aConsumeRollupEvent 
+   * parameter when aDoCapture is FALSE
+   * @param aCapture PR_TRUE enables capture, PR_FALSE disables capture 
+   * @param aConsumeRollupEvent PR_TRUE consumes the rollup event, PR_FALSE dispatches rollup event
+   *
+   */
+  void captureRollupEvents(in nsIRollupListener aListener, in PRBool aDoCapture, in PRBool aConsumeRollupEvent);
+
+
+
+  /**
+   * Adds a mouse listener to this widget
+   * Any existing mouse listener is replaced
+   *
+   * @param aListener mouse listener to add to this widget.
+   */
+  void addMouseListener(in nsIMouseListener aListener);
+
+  /**
+   * Adds an event listener to this widget
+   * Any existing event listener is replaced
+   *
+   * @param aListener event listener to add to this widget.
+   */
+  void addEventListener(in nsIEventListener aListener);
+
+  /**
+   * Adds a menu listener to this widget
+   * Any existing menu listener is replaced
+   *
+   * @param aListener menu listener to add to this widget.
+   */
+  void addMenuListener(in nsIMenuListener aListener);
+
+
+  // is this an internal method?
+  /**
+   * Dispatches and event to the widget
+   *
+   */
+  void dispatchEvent(in nsGUIEvent event, in nsEventStatusRef aStatus);
+
+
+  /** 
+   * Internal methods
+   */
+  void addChild(in nsIWidget aChild);
+  void removeChild(in nsIWidget aChild);
+
+  /* ATTRIBUTES */
+
+
+  /**
+   * Device Context used to do printing... probably shouldn't be here
+   */
+  readonly attribute nsIDeviceContext deviceContext;
+
+  /* attributes */
+
+  /**
+   * Get the AppShell
+   */
+  readonly attribute nsIAppShell appShell;
+
+  /**
+   * Get the nsIToolkit
+   */
+  readonly attribute nsIToolkit toolkit;
+
+  /**
+   * callback for the event
+   */
+  [noscript] readonly attribute EVENT_CALLBACK eventFunction;
+
+
+  /* things that MUST be set AFTER the widget is created */
+
+  /**
+   * Get and Set the widget's z-index.
+   */
+  attribute PRInt32 zIndex;
+
+  /**
+   * Set/Get the foreground color for this widget
+   *
+   * @param aColor the new foreground color
+   *
+   */
+  attribute nscolor foregroundColor;
+
+  /**
+   * Set/Get the background color for this widget
+   *
+   * @param aColor the new background color
+   *
+   */
+  attribute nscolor backgroundColor;
+
+  /**
+   * Set/Get the font for this widget 
+   *
+   * @param aFont font to display. See nsFont for allowable fonts
+   */
+  attribute nsFont font;
+
+  /**
+   * Set/Get the cursor for this widget
+   *
+   * @param aCursor the new cursor for this widget
+   */
+
+  attribute nsCursor cursor;
+
+  /**
+   * Set the color map for this widget
+   *
+   * @param aColorMap color map for displaying this widget
+   *
+   */
+  attribute nsColorMap colorMap;
+
+  /**
+   * Accessor functions to get and set the client data associated with the
+   * widget.
+   */
+  attribute voidStar clientData;
+
+  /**
+   * Return an nsEnumerator over the children of this widget.
+   *
+   * @return an enumerator over the list of children or nsnull if it does not
+   * have any children
+   *
+   */
+  readonly attribute nsIEnumerator children;
+
+%{ C++
+  /* backwards compat stuff */
+  NS_IMETHOD Show(PRBool aShow) = 0;
+
+  NS_IMETHOD IsVisible(PRBool & aState) = 0;
+  NS_IMETHOD Resize(PRInt32 aX,
+                    PRInt32 aY,
+                    PRInt32 aWidth,
+                    PRInt32 aHeight,
+                    PRBool  aRepaint) = 0;
+
+  virtual nscolor GetForegroundColor(void) = 0;
+  virtual nscolor GetBackgroundColor(void) = 0;
+
+  NS_IMETHOD SetFont(const nsFont &aFont) = 0;
+  virtual nsIFontMetrics* GetFont(void) = 0;
+
+  NS_IMETHOD Invalidate(const nsRect & aRect, PRBool aIsSynchronous) = 0;
+  NS_IMETHOD SetTitle(const nsString& aTitle) = 0;
+  NS_IMETHOD GetPreferredSize(PRInt32& aWidth, PRInt32& aHeight) = 0;
+
+  virtual nsIWidget* GetParent(void) = 0;
+
+  virtual nsIEnumerator*  GetChildren(void) = 0;
+
+  virtual void* GetNativeData(PRUint32 aDataType) = 0;
+  virtual void FreeNativeData(void * data, PRUint32 aDataType) = 0;
+  virtual nsIRenderingContext* GetRenderingContext() = 0;
+  virtual nsIDeviceContext* GetDeviceContext() = 0;
+  virtual nsIAppShell *GetAppShell() = 0;
+  virtual nsIToolkit* GetToolkit() = 0;    
+
+  /* the big ugly ones */
+  NS_IMETHOD Create(nsIWidget        *aParent,
+                    const nsRect     &aRect,
+                    EVENT_CALLBACK   aHandleEventFunction,
+                    nsIDeviceContext *aContext,
+                    nsIAppShell      *aAppShell = nsnull,
+                    nsIToolkit       *aToolkit = nsnull,
+                    nsWidgetInitData *aInitData = nsnull) = 0;
+  NS_IMETHOD Create(nsNativeWidget aParent,
+                    const nsRect     &aRect,
+                    EVENT_CALLBACK   aHandleEventFunction,
+                    nsIDeviceContext *aContext,
+                    nsIAppShell      *aAppShell = nsnull,
+                    nsIToolkit       *aToolkit = nsnull,
+                    nsWidgetInitData *aInitData = nsnull) = 0;
+
+%}
+
+};
+

mozilla/widget/public/nsIWindow.idl

@@ -0,0 +1,203 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is the Mozilla browser.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Contributor(s): 
+ *   Stuart Parmenter <pavlov@netscape.com>
+ *   Rod Spears <rods@netscape.com>
+ *   Kevin McCluskey <kmcclusk@netscape.com>
+ *   Mike Pinkerton <pinkerton@netscape.com>
+ *   ... and other people
+ */
+
+#include "nsISupports.idl"
+#include "nsIWidget.idl"
+
+%{ C++
+#include "nsRect.h"
+#include "nsIMouseListener.h"
+#include "nsIMenuListener.h"
+#include "nsIImage.h"
+
+#include "prthread.h"
+#include "nsGUIEvent.h"
+
+// forward declarations
+struct  nsRect;
+class   nsIMenuBar;
+%}
+
+[ptr] native nsIMenuBar(nsIMenuBar);
+
+typedef long nsBorderStyle;
+typedef long nsWindowType;
+
+
+[uuid(491359ea-1dd2-11b2-af7c-bb0346efd9b6)]
+interface nsIWindow : nsIWidget
+{
+  /*
+   * types of windows
+   */
+  const long eWindowType_toplevel = 0;
+  const long eWindowType_dialog = 1;
+  const long eWindowType_popup = 2;
+  const long eWindowType_child = 3; 
+
+  
+  /*
+   * Border styles
+   */
+  // no border, titlebar, etc.. opposite of all
+  const long eBorderStyle_none     = 0;
+
+  // all window decorations
+  const long eBorderStyle_all      = 1 << 0;
+
+  // enables the border on the window.  these are only for decoration and are not resize hadles
+  const long eBorderStyle_border   = 1 << 1;
+
+  // enables the resize handles for the window.  if this is set, border is implied to also be set
+  const long eBorderStyle_resizeh  = 1 << 2;
+
+  // enables the titlebar for the window
+  const long eBorderStyle_title    = 1 << 3;
+
+  // enables the window menu button on the title bar.  this being on should force the title bar to display
+  const long eBorderStyle_menu     = 1 << 4;
+
+  // enables the minimize button so the user can minimize the window.
+  //   turned off for tranient windows since they can not be minimized seperate from their parent
+  const long eBorderStyle_minimize = 1 << 5;
+
+  // enables the maxmize button so the user can maximize the window
+  const long eBorderStyle_maximize = 1 << 6;
+
+  // show the close button
+  const long eBorderStyle_close    = 1 << 7;
+
+  // whatever the OS wants... i.e. don't do anything
+  const long eBorderStyle_default  = -1;
+
+
+  /**
+   * initialize a window
+   *
+   * The widget represents a window that can be drawn into. It also is the 
+   * base class for user-interface widgets such as buttons and text boxes.
+   *
+   * All the arguments can be NULL in which case a top level window
+   * with size 0 is created. The event callback function has to be
+   * provided only if the caller wants to deal with the events this
+   * widget receives.  The event callback is basically a preprocess
+   * hook called synchronously. The return value determines whether
+   * the event goes to the default window procedure or it is hidden
+   * to the os. The assumption is that if the event handler returns
+   * false the widget does not see the event. The widget should not 
+   * automatically clear the window to the background color. The 
+   * calling code must handle paint messages and clear the background 
+   * itself. 
+   *
+   * @param     aWindowType    type of window to create
+   * @param     aBorderStyle   border style of the window to create
+   *
+   */
+  void initWindowStyle(in nsWindowType     aWindowType,
+                       in nsBorderStyle    aBorderStyle);
+
+  /**
+   * Make the window modal 
+   *
+   * 
+   *
+   */
+  void setModal(in boolean modal);
+
+  /**
+   * Gets the width and height of the borders
+   * @param aWidth the width of the border
+   * @param aHeight the height of the border
+   *
+   */
+  void getBorderSize(out PRInt32 aWidth, out PRInt32 aHeight);
+
+  /**
+   * Scroll this widget.
+   *
+   * @param aDx amount to scroll along the x-axis
+   * @param aDy amount to scroll along the y-axis.
+   * @param aClipRect clipping rectangle to limit the scroll to.
+   *
+   */
+  void scroll(in PRInt32 aDx, in PRInt32 aDy, in nsRect aClipRect);
+
+  /**
+   * Scroll an area of this widget.
+   *
+   * @param aRect source rectangle to scroll in the widget
+   * @param aDx x offset from the source
+   * @param aDy y offset from the source
+   *
+   */
+  void scrollRect(in nsRectRef aSrcRect, in PRInt32 aDx, in PRInt32 aDy);
+
+  /**
+   * Set the widget's MenuBar.
+   * Must be called after Create.
+   *
+   * @param aMenuBar the menubar
+   */
+  void setMenuBar(in nsIMenuBar aMenuBar);
+
+  /**
+   * Set the widget's MenuBar's visibility
+   *
+   * @param aShow PR_TRUE to show, PR_FALSE to hide
+   */
+  void showMenuBar(in PRBool aShow);
+
+  /**
+   * When adjustments are to made to a whole set of child widgets, call this
+   * before resizing/positioning the child windows to minimize repaints. Must
+   * be followed by EndResizingChildren() after child windows have been
+   * adjusted.
+   *
+   */
+  void beginResizingChildren();
+
+  /**
+   * Call this when finished adjusting child windows. Must be preceded by
+   * BeginResizingChildren().
+   *
+   */
+  void endResizingChildren();
+
+  /* ATTRIBUTES */
+
+
+  /**
+   * Window type
+   */
+  readonly attribute nsWindowType windowType;
+
+  /**
+   * Border style
+   */
+  readonly attribute nsBorderStyle borderStyle;
+
+};

mozilla/widget/public/nsRepeater.h

@@ -0,0 +1,64 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsRepeater_h___
+#define nsRepeater_h___
+
+#include "nscore.h"
+
+class EventRecord;
+
+class NS_BASE Repeater {
+  public:
+  
+    Repeater();
+    virtual ~Repeater();
+    
+    virtual	void RepeatAction(const EventRecord &aMacEvent) = 0;
+    
+    void StartRepeating();
+    void StopRepeating();
+    void StartIdling();
+    void StopIdling();
+    
+    static void DoRepeaters(const EventRecord &aMacEvent);
+    static void DoIdlers(const EventRecord &aMacEvent);
+    
+  protected:
+    
+    void AddToRepeatList();
+    void RemoveFromRepeatList();
+    void AddToIdleList();
+    void RemoveFromIdleList();
+    
+    static Repeater* sRepeaters;
+    static Repeater* sIdlers;
+    
+    bool mRepeating;
+    bool mIdling;
+    Repeater* mPrevRptr;
+    Repeater* mNextRptr;
+    Repeater* mPrevIdlr;
+    Repeater* mNextIdlr;
+};
+
+#endif

mozilla/widget/public/nsStringUtil.h

@@ -0,0 +1,54 @@
+/* -*- Mode: c++; tab-width: 2; indent-tabs-mode: nil; -*- */
+/*
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+// Convience macros for converting nsString's to chars +
+// creating temporary char[] bufs.
+
+#ifndef NS_STR_UTIL_H
+#define NS_STR_UTIL_H
+
+// nsString to temporary char[] macro
+
+// Convience MACROS to convert an nsString to a char * which use a 
+// static char array if possible to reduce memory fragmentation, 
+// otherwise they allocate a char[] which must be freed.
+// REMEMBER to always use the NS_FREE_STR_BUF after using the 
+// NS_ALLOC_STR_BUF. You can not nest NS_ALLOC_STR_BUF's. 
+
+#define NS_ALLOC_CHAR_BUF(aBuf, aSize, aActualSize) \
+  int _ns_tmpActualSize = aActualSize;              \
+  char _ns_smallBuffer[aSize];                      \
+  char * const aBuf = _ns_tmpActualSize <= aSize ? _ns_smallBuffer : new char[_ns_tmpActualSize]; 
+
+#define NS_FREE_CHAR_BUF(aBuf)   \
+  if (aBuf != _ns_smallBuffer) \
+   delete[] aBuf;
+
+#define NS_ALLOC_STR_BUF(aBuf, aStrName, aTempSize) \
+  NS_ALLOC_CHAR_BUF(aBuf, aTempSize, aStrName.Length()+1); \
+  aStrName.ToCString(aBuf, aStrName.Length()+1);
+
+#define NS_FREE_STR_BUF(aBuf)  \
+  NS_FREE_CHAR_BUF(aBuf)
+
+
+#endif  // NSStringUtil

mozilla/widget/public/nsWidgetSupport.h

@@ -0,0 +1,141 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsWidgetSupport_h__
+#define nsWidgetSupport_h__
+
+#include "nscore.h"
+#include "nsISupports.h"
+#include "nsIWidget.h"
+
+
+struct nsRect;
+class nsITextAreaWidget;
+class nsIFileWidget;
+class nsIAppShell;
+class nsIButton;
+class nsIComboBox;
+class nsIEventListener;
+class nsILabel;
+class nsIListBox;
+class nsIListWidget;
+class nsILookAndFeel;
+class nsIMouseListener;
+class nsIToolkit;
+class nsIWidget;
+class nsICheckButton;
+class nsIScrollbar;
+class nsIRadioButton;
+class nsITextWidget;
+class nsIBrowserWindow;
+
+// These are a series of support methods which help in the creation
+// of widgets. They are not needed, but are provided as a convenience
+// mechanism when creating widgets
+
+
+extern NS_WIDGET nsresult 
+NS_CreateButton( nsISupports* aParent, 
+								nsIButton* aButton, 
+								const nsRect& aRect, 
+								EVENT_CALLBACK aHandleEventFunction,
+								const nsFont* aFont = nsnull);
+
+extern NS_WIDGET nsresult 
+NS_CreateCheckButton( nsISupports* aParent, 
+											nsICheckButton* aCheckButton, 
+											const nsRect& aRect, 
+											EVENT_CALLBACK aHandleEventFunction,
+											const nsFont* aFont = nsnull);
+
+extern NS_WIDGET nsresult 
+NS_CreateRadioButton( nsISupports* aParent, 
+											nsIRadioButton* aButton, 
+											const nsRect& aRect, 
+											EVENT_CALLBACK aHandleEventFunction,
+											const nsFont* aFont = nsnull);
+
+extern NS_WIDGET nsresult 
+NS_CreateLabel( nsISupports* aParent,	
+                nsILabel* aLabel, 
+                const nsRect& aRect, 
+                EVENT_CALLBACK aHandleEventFunction,
+                const nsFont* aFont = nsnull);
+
+extern NS_WIDGET nsresult 
+NS_CreateTextWidget(nsISupports* aParent,	
+                    nsITextWidget* aWidget, 
+                    const nsRect& aRect, 
+                    EVENT_CALLBACK aHandleEventFunction,
+                    const nsFont* aFont = nsnull);
+
+extern NS_WIDGET nsresult 
+NS_CreateTextAreaWidget(nsISupports* aParent,	
+                    nsITextAreaWidget* aWidget, 
+                    const nsRect& aRect, 
+                    EVENT_CALLBACK aHandleEventFunction,
+                    const nsFont* aFont = nsnull);
+
+
+extern NS_WIDGET nsresult 
+NS_CreateListBox(nsISupports* aParent,	
+                      nsIListBox* aWidget, 
+                      const nsRect& aRect, 
+                      EVENT_CALLBACK aHandleEventFunction,
+                      const nsFont* aFont = nsnull);
+
+
+extern NS_WIDGET nsresult 
+NS_CreateComboBox(nsISupports* aParent,	
+                      nsIComboBox* aWidget, 
+                      const nsRect& aRect, 
+                      EVENT_CALLBACK aHandleEventFunction,
+                      const nsFont* aFont = nsnull);
+
+
+extern NS_WIDGET nsresult 
+NS_CreateScrollBar(nsISupports* aParent,	
+                      nsIScrollbar* aWidget, 
+                      const nsRect& aRect, 
+                      EVENT_CALLBACK aHandleEventFunction);
+
+
+extern NS_WIDGET nsresult 
+NS_ShowWidget(nsISupports* aWidget, PRBool aShow);
+
+extern NS_WIDGET nsresult 
+NS_MoveWidget(nsISupports* aWidget, PRUint32 aX, PRUint32 aY);
+
+extern NS_WIDGET nsresult 
+NS_EnableWidget(nsISupports* aWidget, PRBool aEnable);
+
+extern NS_WIDGET nsresult 
+NS_SetFocusToWidget(nsISupports* aWidget);
+
+extern NS_WIDGET nsresult 
+NS_GetWidgetNativeData(nsISupports* aWidget, void** aNativeData);
+
+
+
+
+
+#endif

mozilla/widget/public/nsWidgetsCID.h

@@ -0,0 +1,200 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+/* 2d96b3d0-c051-11d1-a827-0040959a28c9 */
+#define NS_WINDOW_CID \
+{ 0x2d96b3d0, 0xc051, 0x11d1, \
+    {0xa8, 0x27, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9}}
+
+/* 2d96b3d1-c051-11d1-a827-0040959a28c9 */
+#define NS_CHILD_CID \
+{ 0x2d96b3d1, 0xc051, 0x11d1, \
+    {0xa8, 0x27, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9} }
+
+
+/* BA7DE611-6088-11d3-A83E-00105A183419 */
+#define NS_POPUP_CID \
+{ 0xba7de611, 0x6088, 0x11d3,  \
+    { 0xa8, 0x3e, 0x0, 0x10, 0x5a, 0x18, 0x34, 0x19 } }
+
+
+/* 2d96b3d2-c051-11d1-a827-0040959a28c9 */
+#define NS_BUTTON_CID \
+{ 0x2d96b3d2, 0xc051, 0x11d1, \
+    {0xa8, 0x27, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9} }
+
+/* 2d96b3d3-c051-11d1-a827-0040959a28c9 */
+#define NS_CHECKBUTTON_CID \
+{ 0x2d96b3d3, 0xc051, 0x11d1, \
+    {0xa8, 0x27, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9} }
+
+/* 2d96b3d4-c051-11d1-a827-0040959a28c9 */
+#define NS_COMBOBOX_CID \
+{ 0x2d96b3d4, 0xc051, 0x11d1, \
+    {0xa8, 0x27, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9} }
+
+/* 2d96b3d5-c051-11d1-a827-0040959a28c9 */
+#define NS_FILEWIDGET_CID \
+{ 0x2d96b3d5, 0xc051, 0x11d1, \
+    {0xa8, 0x27, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9} }
+
+/* 2d96b3d6-c051-11d1-a827-0040959a28c9 */
+#define NS_LISTBOX_CID \
+{ 0x2d96b3d6, 0xc051, 0x11d1, \
+    {0xa8, 0x27, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9} }
+
+/* 2d96b3d7-c051-11d1-a827-0040959a28c9 */
+#define NS_RADIOBUTTON_CID \
+{ 0x2d96b3d7, 0xc051, 0x11d1, \
+    {0xa8, 0x27, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9} }
+
+/* 2d96b3d9-c051-11d1-a827-0040959a28c9 */
+#define NS_HORZSCROLLBAR_CID \
+{ 0x2d96b3d9, 0xc051, 0x11d1, \
+    {0xa8, 0x27, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9} }
+
+/* 2d96b3da-c051-11d1-a827-0040959a28c9 */
+#define NS_VERTSCROLLBAR_CID \
+{ 0x2d96b3da, 0xc051, 0x11d1, \
+    {0xa8, 0x27, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9} }
+
+/* 2d96b3db-c051-11d1-a827-0040959a28c9 */
+#define NS_TEXTAREA_CID \
+{ 0x2d96b3db, 0xc051, 0x11d1, \
+    {0xa8, 0x27, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9} }
+
+/* 2d96b3dc-c051-11d1-a827-0040959a28c9 */
+#define NS_TEXTFIELD_CID \
+{ 0x2d96b3dc, 0xc051, 0x11d1, \
+    {0xa8, 0x27, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9} }
+
+/* 2d96b3df-c051-11d1-a827-0040959a28c9 */
+#define NS_APPSHELL_CID \
+{ 0x2d96b3df, 0xc051, 0x11d1, \
+    {0xa8, 0x27, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9} }
+
+/* 2d96b3e0-c051-11d1-a827-0040959a28c9 */
+#define NS_TOOLKIT_CID \
+ { 0x2d96b3e0, 0xc051, 0x11d1, \
+    {0xa8, 0x27, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9} }
+
+/* XXX the following CID's are not in order. This needs
+   to be fixed. */
+
+/* 21B51DE0-21A3-11d2-B6E0-00805F8A2676 */
+#define NS_LOOKANDFEEL_CID \
+{ 0x21b51de0, 0x21a3, 0x11d2, \
+    { 0xb6, 0xe0, 0x0, 0x80, 0x5f, 0x8a, 0x26, 0x76 } }
+
+/* 4A781D61-3D28-11d2-8DB8-00609703C14E */
+#define NS_DIALOG_CID \
+{ 0x4a781d61, 0x3d28, 0x11d2, \
+    { 0x8d, 0xb8, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
+
+/* F3131891-3DC7-11d2-8DB8-00609703C14E */
+#define NS_LABEL_CID \
+{ 0xf3131891, 0x3dc7, 0x11d2, \
+    { 0x8d, 0xb8, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
+
+//-----------------------------------------------------------
+// Menus 
+//-----------------------------------------------------------
+
+// {BC658C81-4BEB-11d2-8DBB-00609703C14E}
+#define NS_MENUBAR_CID      \
+{ 0xbc658c81, 0x4beb, 0x11d2, \
+  { 0x8d, 0xbb, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
+
+// {35A3DEC1-4992-11d2-8DBA-00609703C14E}
+#define NS_MENU_CID      \
+{ 0x35a3dec1, 0x4992, 0x11d2, \
+  { 0x8d, 0xba, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
+
+// {7F045771-4BEB-11d2-8DBB-00609703C14E}
+#define NS_MENUITEM_CID      \
+{ 0x7f045771, 0x4beb, 0x11d2, \
+  { 0x8d, 0xbb, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
+
+// {1677DAE1-04E2-11d3-B35C-00A0CC3C1CDE}
+#define NS_CONTEXTMENU_CID      \
+{ 0x1677dae1, 0x4e2, 0x11d3, \
+  { 0xb3, 0x5c, 0x0, 0xa0, 0xcc, 0x3c, 0x1c, 0xde } }
+
+//f58c2550-4a7c-11d2-bee2-00805f8a8dbd
+#define NS_IMAGEBUTTON_CID      \
+ { 0xf58c2550, 0x4a7c, 0x11d2, \
+   {0xbe, 0xe2, 0x00, 0x80, 0x5f, 0x8a, 0x8d, 0xbd} }
+
+// {F6CD4F21-53AF-11d2-8DC4-00609703C14E}
+#define NS_POPUPMENU_CID      \
+{ 0xf6cd4f21, 0x53af, 0x11d2, \
+  { 0x8d, 0xc4, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
+
+#define NS_MENUBUTTON_CID      \
+{ 0x67b8e261, 0x53c3, 0x11d2,  \
+  { 0x8d, 0xc4, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
+
+// {D3C3B8B2-55B5-11d2-9A2A-000000000000}
+#define NS_IMAGEBUTTONLISTENER_CID      \
+{ 0xd3c3b8b2, 0x55b5, 0x11d2, \
+  { 0x9a, 0x2a, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } }
+
+// {285EF9B2-094A-11d3-9A87-0050046CDA96}
+#define NS_FONTRETRIEVERSERVICE_CID \
+{ 0x285ef9b2, 0x94a, 0x11d3, { 0x9a, 0x87, 0x0, 0x50, 0x4, 0x6c, 0xda, 0x96 } }
+
+//-----------------------------------------------------------
+//Drag & Drop & Clipboard
+//-----------------------------------------------------------
+// {8B5314BB-DB01-11d2-96CE-0060B0FB9956}
+#define NS_DRAGSERVICE_CID      \
+{ 0x8b5314bb, 0xdb01, 0x11d2, { 0x96, 0xce, 0x0, 0x60, 0xb0, 0xfb, 0x99, 0x56 } }
+
+// {8B5314BC-DB01-11d2-96CE-0060B0FB9956}
+#define NS_TRANSFERABLE_CID      \
+{ 0x8b5314bc, 0xdb01, 0x11d2, { 0x96, 0xce, 0x0, 0x60, 0xb0, 0xfb, 0x99, 0x56 } }
+
+// {8B5314BA-DB01-11d2-96CE-0060B0FB9956}
+#define NS_CLIPBOARD_CID      \
+{ 0x8b5314ba, 0xdb01, 0x11d2, { 0x96, 0xce, 0x0, 0x60, 0xb0, 0xfb, 0x99, 0x56 } }
+
+// {8B5314BD-DB01-11d2-96CE-0060B0FB9956}
+#define NS_DATAFLAVOR_CID      \
+{ 0x8b5314bd, 0xdb01, 0x11d2, { 0x96, 0xce, 0x0, 0x60, 0xb0, 0xfb, 0x99, 0x56 } }
+
+// {948A0023-E3A7-11d2-96CF-0060B0FB9956}
+#define NS_XIFFORMATCONVERTER_CID      \
+{ 0x948a0023, 0xe3a7, 0x11d2, { 0x96, 0xcf, 0x0, 0x60, 0xb0, 0xfb, 0x99, 0x56 } }
+
+#define NS_DATAOBJ_CID \
+{ 0x1bba7640, 0xdf52, 0x11cf, { 0x82, 0x7b, 0, 0xa0, 0x24, 0x3a, 0xe5, 0x05 } }
+
+// {E93E73B1-0197-11d3-96D4-0060B0FB9956}
+#define NS_FILELISTTRANSFERABLE_CID      \
+{ 0xe93e73b1, 0x197, 0x11d3, { 0x96, 0xd4, 0x0, 0x60, 0xb0, 0xfb, 0x99, 0x56 } }
+
+//-----------------------------------------------------------
+//Other
+//-----------------------------------------------------------
+// {B148EED2-236D-11d3-B35C-00A0CC3C1CDE}
+#define NS_SOUND_CID \
+{ 0xb148eed2, 0x236d, 0x11d3, { 0xb3, 0x5c, 0x0, 0xa0, 0xcc, 0x3c, 0x1c, 0xde } }

mozilla/widget/src/Makefile.in

@@ -0,0 +1,62 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+DEPTH		= ../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS		= xpwidgets support
+
+#
+# Dont build the DSO under the 'build' directory as windows does.
+#
+# The DSOs get built in the toolkit dir itself.  Do this so that 
+# multiple implementations of widget can be built on the same
+# source tree.
+#
+ifndef MOZ_MONOLITHIC_TOOLKIT
+
+ifdef MOZ_ENABLE_GTK
+DIRS		+= gtk
+endif
+
+ifdef MOZ_ENABLE_MOTIF
+DIRS		+= motif
+endif
+
+ifdef MOZ_ENABLE_XLIB
+DIRS		+= xlib
+endif
+
+ifdef MOZ_ENABLE_QT
+DIRS		+= qt
+endif
+
+else
+DIRS		+= $(MOZ_WIDGET_TOOLKIT)
+endif
+
+# unix_services are only useful in unix, duh...
+ifeq (,$(filter beos os2 rhapsody photon,$(MOZ_WIDGET_TOOLKIT)))
+DIRS		+= unix_services
+endif
+
+include $(topsrcdir)/config/rules.mk
+

mozilla/widget/src/beos/Makefile.in

@@ -0,0 +1,75 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+LIBRARY_NAME	= widget_beos
+
+REQUIRES	= util img xpcom raptor netlib
+
+CPPSRCS		= \
+		nsAppShell.cpp \
+		nsButton.cpp \
+		nsCheckButton.cpp \
+		nsClipboard.cpp \
+		nsComboBox.cpp \
+		nsDragService.cpp \
+		nsFileWidget.cpp \
+		nsFontRetrieverService.cpp \
+		nsFontSizeIterator.cpp \
+		nsLabel.cpp \
+		nsListBox.cpp \
+		nsLookAndFeel.cpp \
+		nsMenu.cpp \
+		nsMenuBar.cpp \
+		nsMenuItem.cpp \
+		nsObject.cpp \
+		nsPopUpMenu.cpp \
+		nsRadioButton.cpp \
+		nsScrollbar.cpp \
+		nsSound.cpp \
+		nsTextAreaWidget.cpp \
+		nsTextHelper.cpp \
+		nsTextWidget.cpp \
+		nsToolkit.cpp \
+		nsWidgetFactory.cpp \
+		nsWindow.cpp \
+		$(NULL)
+
+SHARED_LIBRARY_LIBS = $(DIST)/lib/libraptorbasewidget_s.a
+
+EXTRA_DSO_LDOPTS = \
+		$(TOOLKIT_DSO_LDOPTS) \
+		$(MKSHLIB_FORCE_ALL) \
+		$(SHARED_LIBRARY_LIBS) \
+		$(MKSHLIB_UNFORCE_ALL) \
+		$(TK_LIBS) \
+		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
+
+DEFINES		+= -D_IMPL_NS_WIDGET -I$(srcdir)/../xpwidgets -I$(srcdir)
+
+CXXFLAGS	+= $(TK_CFLAGS)
+
+$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
+

mozilla/widget/src/beos/nsAppShell.cpp

@@ -0,0 +1,332 @@
+/* -*- Mode: c++; tab-width: 2; indent-tabs-mode: nil; -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsAppShell.h"
+#include "nsIEventQueueService.h"
+#include "nsIServiceManager.h"
+#include "nsIWidget.h"
+#include "nsIAppShell.h"
+#include "nsWindow.h"
+#include "nsSwitchToUIThread.h"
+#include "plevent.h"
+
+#include <stdlib.h>
+#include <AppKit.h>
+#include <AppFileInfo.h>
+
+struct ThreadInterfaceData
+{
+	void	*data;
+	int32	sync;
+};
+
+static sem_id my_find_sem(const char *name)
+{
+	sem_id	ret = B_ERROR;
+
+	/* Get the sem_info for every sempahore in this team. */
+	sem_info info;
+	int32 cookie = 0;
+
+	while(get_next_sem_info(0, &cookie, &info) == B_OK)
+		if(strcmp(name, info.name) == 0)
+		{
+			ret = info.sem;
+			break;
+		}
+
+	return ret;
+}
+
+//-------------------------------------------------------------------------
+//
+// nsISupports implementation macro
+//
+//-------------------------------------------------------------------------
+NS_DEFINE_IID(kIAppShellIID, NS_IAPPSHELL_IID);
+NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
+NS_IMPL_ISUPPORTS(nsAppShell,kIAppShellIID);
+
+static bool GetAppSig(char *sig)
+{
+	app_info 		appInfo;
+	BFile 			file;
+	BAppFileInfo	appFileInfo;
+	image_info		info;
+	int32			cookie = 0;
+	*sig = 0;
+	return get_next_image_info(0, &cookie, &info) == B_OK &&
+		file.SetTo(info.name, B_READ_ONLY) == B_OK &&
+		appFileInfo.SetTo(&file) == B_OK &&
+		appFileInfo.GetSignature(sig) == B_OK;
+}
+
+class nsBeOSApp : public BApplication
+{
+	sem_id	init;
+public:
+	nsBeOSApp(const char *signature, sem_id initsem);
+	virtual void ReadyToRun(void);
+};
+
+nsBeOSApp::nsBeOSApp(const char *signature, sem_id initsem)
+ : BApplication(signature), init(initsem)
+{
+}
+
+void nsBeOSApp::ReadyToRun(void)
+{
+	release_sem(init);
+}
+
+int32 bapp_thread(void *arg)
+{
+	// create and start BApplication
+	char	sig[B_MIME_TYPE_LENGTH + 1];
+	GetAppSig(sig);
+	nsBeOSApp	*app = new nsBeOSApp(sig, (sem_id)arg);
+	app->Run();
+	return 0;
+}
+
+//-------------------------------------------------------------------------
+//
+// nsAppShell constructor
+//
+//-------------------------------------------------------------------------
+nsAppShell::nsAppShell()  
+{ 
+  NS_INIT_REFCNT();
+  mDispatchListener = 0;
+
+	sem_id initsem = create_sem(0, "bapp init");
+	resume_thread(spawn_thread(bapp_thread, "BApplication", B_NORMAL_PRIORITY, (void *)initsem));
+	acquire_sem(initsem);
+	delete_sem(initsem);
+}
+
+
+//-------------------------------------------------------------------------
+//
+// Create the application shell
+//
+//-------------------------------------------------------------------------
+
+NS_METHOD nsAppShell::Create(int* argc, char ** argv)
+{
+	// system wide unique names
+	// NOTE: this needs to be run from within the main application thread
+	char		portname[64];
+	char		semname[64];
+	sprintf(portname, "event%lx", PR_GetCurrentThread());
+	sprintf(semname, "sync%lx", PR_GetCurrentThread());
+
+	if((eventport = find_port(portname)) < 0)
+	{
+		// we're here first
+		eventport = create_port(100, portname);
+		syncsem = create_sem(0, semname);
+	}
+	else
+	{
+		// the PLEventQueue stuff (in plevent.c) created the queue before we started
+		syncsem = my_find_sem(semname);
+	}
+
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsAppShell::SetDispatchListener(nsDispatchListener* aDispatchListener) 
+{
+  mDispatchListener = aDispatchListener;
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+// Enter a message handler loop
+//
+//-------------------------------------------------------------------------
+
+nsresult nsAppShell::Run()
+{
+	int32				code;
+	ThreadInterfaceData	id;
+
+	NS_ADDREF_THIS();
+
+	while(read_port(eventport, &code, &id, sizeof(id)) >= 0)
+	{
+		switch(code)
+		{
+			case 'WMti' :
+				extern void nsTimerExpired(void *);	// hack: this is in gfx
+				nsTimerExpired(id.data);
+				break;
+
+			case WM_CALLMETHOD :
+				{
+				MethodInfo *mInfo = (MethodInfo *)id.data;
+				mInfo->Invoke();
+				if(! id.sync)
+					delete mInfo;
+				}
+				break;
+
+			case 'natv' :	// native queue PLEvent
+				{
+				PREventQueue *queue = (PREventQueue *)id.data;
+				PR_ProcessPendingEvents(queue);
+				}
+				break;
+
+			default :
+				printf("nsAppShell::Run - UNKNOWN EVENT\n");
+				break;
+		}
+
+		if(mDispatchListener)
+			mDispatchListener->AfterDispatch();
+
+		if(id.sync)
+			release_sem(syncsem);
+	}
+
+	Release();
+
+	return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+// Exit a message handler loop
+//
+//-------------------------------------------------------------------------
+
+NS_METHOD nsAppShell::Exit()
+{
+	// interrupt message flow
+	close_port(eventport);
+
+	return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+// nsAppShell destructor
+//
+//-------------------------------------------------------------------------
+nsAppShell::~nsAppShell()
+{
+	if(be_app->Lock())
+		be_app->Quit();
+}
+
+//-------------------------------------------------------------------------
+//
+// GetNativeData
+//
+//-------------------------------------------------------------------------
+void* nsAppShell::GetNativeData(PRUint32 aDataType)
+{
+  if (aDataType == NS_NATIVE_SHELL) {
+    return NULL;
+  }
+  return nsnull;
+}
+
+//-------------------------------------------------------------------------
+//
+// Spinup - do any preparation necessary for running a message loop
+//
+//-------------------------------------------------------------------------
+NS_METHOD nsAppShell::Spinup()
+{
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+// Spindown - do any cleanup necessary for finishing a message loop
+//
+//-------------------------------------------------------------------------
+NS_METHOD nsAppShell::Spindown()
+{
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+// PushThreadEventQueue - begin processing events from a new queue
+//   note this is the Windows implementation and may suffice, but
+//   this is untested on beos.
+//
+//-------------------------------------------------------------------------
+NS_METHOD nsAppShell::PushThreadEventQueue()
+{
+  nsresult rv;
+
+  // push a nested event queue for event processing from netlib
+  // onto our UI thread queue stack.
+  NS_WITH_SERVICE(nsIEventQueueService, eQueueService, kEventQueueServiceCID, &rv);
+  if (NS_SUCCEEDED(rv))
+    rv = eQueueService->PushThreadEventQueue();
+  else
+    NS_ERROR("Appshell unable to obtain eventqueue service.");
+  return rv;
+}
+
+//-------------------------------------------------------------------------
+//
+// PopThreadEventQueue - stop processing on a previously pushed event queue
+//   note this is the Windows implementation and may suffice, but
+//   this is untested on beos.
+//
+//-------------------------------------------------------------------------
+NS_METHOD nsAppShell::PopThreadEventQueue()
+{
+  nsresult rv;
+
+  NS_WITH_SERVICE(nsIEventQueueService, eQueueService, kEventQueueServiceCID, &rv);
+  if (NS_SUCCEEDED(rv))
+    rv = eQueueService->PopThreadEventQueue();
+  else
+    NS_ERROR("Appshell unable to obtain eventqueue service.");
+  return rv;
+}
+
+NS_METHOD nsAppShell::GetNativeEvent(PRBool &aRealEvent, void *&aEvent)
+{
+	printf("nsAppShell::GetNativeEvent - FIXME: not implemented\n");
+	return NS_OK;
+}
+
+NS_METHOD nsAppShell::DispatchNativeEvent(PRBool aRealEvent, void *aEvent)
+{
+	printf("nsAppShell::DispatchNativeEvent - FIXME: not implemented\n");
+	return NS_OK;
+}
+
+NS_METHOD nsAppShell::EventIsForModalWindow(PRBool aRealEvent, void *aEvent, nsIWidget *aWidget, PRBool *aForWindow)
+{
+	printf("nsAppShell::EventIsForModalWindow - FIXME: not implemented\n");
+	*aForWindow = PR_FALSE;
+	return NS_OK;
+}
+

mozilla/widget/src/beos/nsAppShell.h

@@ -0,0 +1,60 @@
+/* -*- Mode: c++; tab-width: 2; indent-tabs-mode: nil; -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsAppShell_h__
+#define nsAppShell_h__
+
+#include "nsObject.h"
+#include "nsIAppShell.h"
+#include <OS.h>
+
+/**
+ * Native BeOS Application shell wrapper
+ */
+
+class nsAppShell : public nsIAppShell
+{
+  public:
+                            nsAppShell(); 
+    virtual                 ~nsAppShell();
+
+    NS_DECL_ISUPPORTS
+
+    // nsIAppShellInterface
+  
+    NS_IMETHOD            Create(int* argc, char ** argv);
+    virtual nsresult      Run(); 
+    NS_IMETHOD          Spinup();
+    NS_IMETHOD          Spindown();
+    NS_IMETHOD          PushThreadEventQueue();
+    NS_IMETHOD          PopThreadEventQueue();
+    NS_IMETHOD          GetNativeEvent(PRBool &aRealEvent, void *&aEvent);
+    NS_IMETHOD          DispatchNativeEvent(PRBool aRealEvent, void * aEvent);
+    NS_IMETHOD          EventIsForModalWindow(PRBool aRealEvent, void *aEvent,
+                          nsIWidget *aWidget, PRBool *aForWindow);
+    NS_IMETHOD		Exit();
+    NS_IMETHOD		SetDispatchListener(nsDispatchListener* aDispatchListener);
+    virtual void*	GetNativeData(PRUint32 aDataType);
+
+  private:
+    nsDispatchListener	*mDispatchListener;
+	port_id					eventport;
+	sem_id					syncsem;
+};
+
+#endif // nsAppShell_h__

mozilla/widget/src/beos/nsButton.cpp

@@ -0,0 +1,282 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsButton.h"
+#include "nsToolkit.h"
+#include "nsColor.h"
+#include "nsGUIEvent.h"
+#include "nsString.h"
+#include "nsStringUtil.h"
+
+#include "nsILookAndFeel.h"
+#include "nsWidgetsCID.h"
+#include "nsIComponentManager.h"
+
+#include "nsIDeviceContext.h"
+#include "nsIFontMetrics.h"
+
+static NS_DEFINE_IID(kLookAndFeelCID, NS_LOOKANDFEEL_CID);
+static NS_DEFINE_IID(kILookAndFeelIID, NS_ILOOKANDFEEL_IID);
+
+
+NS_IMPL_ADDREF(nsButton)
+NS_IMPL_RELEASE(nsButton)
+
+//-------------------------------------------------------------------------
+//
+// nsButton constructor
+//
+//-------------------------------------------------------------------------
+nsButton::nsButton() : nsWindow() , nsIButton()
+{
+  NS_INIT_REFCNT();
+}
+
+//-------------------------------------------------------------------------
+//
+// nsButton destructor
+//
+//-------------------------------------------------------------------------
+nsButton::~nsButton()
+{
+}
+
+/**
+ * Implement the standard QueryInterface for NS_IWIDGET_IID and NS_ISUPPORTS_IID
+ * @modify gpk 8/4/98
+ * @param aIID The name of the class implementing the method
+ * @param _classiiddef The name of the #define symbol that defines the IID
+ * for the class (e.g. NS_ISUPPORTS_IID)
+ * 
+*/ 
+nsresult nsButton::QueryInterface(const nsIID& aIID, void** aInstancePtr)
+{
+    if (NULL == aInstancePtr) {
+        return NS_ERROR_NULL_POINTER;
+    }
+
+    static NS_DEFINE_IID(kIButton, NS_IBUTTON_IID);
+    if (aIID.Equals(kIButton)) {
+        *aInstancePtr = (void*) ((nsIButton*)this);
+        NS_ADDREF_THIS();
+        return NS_OK;
+    }
+
+    return nsWindow::QueryInterface(aIID,aInstancePtr);
+}
+
+
+//-------------------------------------------------------------------------
+//
+// Set this button label
+//
+//-------------------------------------------------------------------------
+NS_METHOD nsButton::SetLabel(const nsString& aText)
+{
+  mLabel = aText;
+  if(NULL == mView) {
+    return NS_ERROR_FAILURE;
+  }
+  NS_ALLOC_STR_BUF(label, aText, 256);
+  if(mButton)
+  {
+    if(mButton->Looper())
+    	mButton->LockLooper();
+
+    mButton->SetLabel(label);
+    
+    if(mButton->Looper())
+    	mButton->UnlockLooper();
+  }
+  NS_FREE_STR_BUF(label);
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+// Get this button label
+//
+//-------------------------------------------------------------------------
+NS_METHOD nsButton::GetLabel(nsString& aBuffer)
+{
+  aBuffer = mLabel;
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+// move, paint, resizes message - ignore
+//
+//-------------------------------------------------------------------------
+PRBool nsButton::OnMove(PRInt32, PRInt32)
+{
+  return PR_FALSE;
+}
+
+PRBool nsButton::OnPaint(nsRect &r)
+{
+  //printf("** nsButton::OnPaint **\n");
+  return PR_FALSE;
+}
+
+PRBool nsButton::OnResize(nsRect &aWindowRect)
+{
+    return PR_FALSE;
+}
+
+/**
+ * Renders the Button for Printing
+ *
+ **/
+NS_METHOD nsButton::Paint(nsIRenderingContext& aRenderingContext,
+                          const nsRect& aDirtyRect)
+{
+  float appUnits;
+  float devUnits;
+  float scale;
+  nsIDeviceContext * context;
+  aRenderingContext.GetDeviceContext(context);
+
+  context->GetCanonicalPixelScale(scale);
+  context->GetAppUnitsToDevUnits(devUnits);
+  context->GetDevUnitsToAppUnits(appUnits);
+
+  nsRect rect;
+  GetBoundsAppUnits(rect, appUnits);
+  aRenderingContext.SetColor(NS_RGB(0,0,0));
+
+  nscolor bgColor  = NS_RGB(255,255,255);
+  nscolor fgColor  = NS_RGB(0,0,0);
+  nscolor hltColor = NS_RGB(240,240,240);
+  nscolor sdwColor = NS_RGB(128,128,128);
+
+  nsILookAndFeel * lookAndFeel;
+  if (NS_OK == nsComponentManager::CreateInstance(kLookAndFeelCID, nsnull, kILookAndFeelIID, (void**)&lookAndFeel)) {
+   lookAndFeel->GetColor(nsILookAndFeel::eColor_WidgetBackground,  bgColor);
+   lookAndFeel->GetColor(nsILookAndFeel::eColor_WidgetForeground,  fgColor);
+   lookAndFeel->GetColor(nsILookAndFeel::eColor_Widget3DShadow,    sdwColor);
+   lookAndFeel->GetColor(nsILookAndFeel::eColor_Widget3DHighlight, hltColor);
+  }
+
+  aRenderingContext.SetColor(bgColor);
+  aRenderingContext.FillRect(rect);
+
+  /*aRenderingContext.SetColor(bgColor);
+  for (int i=0;i<int(scale);i++) {
+    aRenderingContext.DrawRect(rect);
+    rect.x      += 3; 
+    rect.y      += 3;
+    rect.width  -= 6; 
+    rect.height -= 6;
+  }*/
+
+  nscoord onePixel  = nscoord(scale);
+  nscoord twoPixels = nscoord(scale*2);
+
+  rect.x      += onePixel; 
+  rect.y      += onePixel;
+  rect.width  -= twoPixels; 
+  rect.height -= twoPixels;
+
+  nscoord right     = rect.x+rect.width;
+  nscoord bottom    = rect.y+rect.height;
+
+
+  // Draw Left & Top
+  aRenderingContext.SetColor(NS_RGB(225,225,225));
+  DrawScaledLine(aRenderingContext, rect.x, rect.y, right, rect.y, scale, appUnits, PR_TRUE); // top
+  DrawScaledLine(aRenderingContext, rect.x, rect.y, rect.x, bottom, scale, appUnits, PR_FALSE); // left
+
+  //DrawScaledLine(aRenderingContext, rect.x+onePixel, rect.y+onePixel, right-onePixel, rect.y+onePixel, scale, appUnits, PR_TRUE); // top + 1
+  //DrawScaledLine(aRenderingContext, rect.x+onePixel, rect.y+onePixel, rect.x+onePixel, bottom-onePixel, scale, appUnits, PR_FALSE); // left + 1
+
+  // Draw Right & Bottom
+  aRenderingContext.SetColor(NS_RGB(128,128,128));
+  DrawScaledLine(aRenderingContext, right, rect.y+onePixel, right, bottom, scale, appUnits, PR_FALSE); // right 
+  DrawScaledLine(aRenderingContext, rect.x+onePixel, bottom, right, bottom, scale, appUnits, PR_TRUE); // bottom
+
+  //DrawScaledLine(aRenderingContext, right-onePixel, rect.y+twoPixels, right-onePixel, bottom, scale, appUnits, PR_FALSE); // right + 1
+  //DrawScaledLine(aRenderingContext, rect.x+twoPixels, bottom-onePixel, right, bottom-onePixel, scale, appUnits, PR_TRUE); // bottom + 1
+
+  aRenderingContext.SetFont(*mFont);
+
+  nscoord textWidth;
+  nscoord textHeight;
+  aRenderingContext.GetWidth(mLabel, textWidth);
+
+  nsIFontMetrics* metrics;
+  context->GetMetricsFor(*mFont, metrics);
+  metrics->GetMaxAscent(textHeight);
+
+  nscoord x = ((rect.width  - textWidth) / 2)  + rect.x;
+  nscoord y = ((rect.height - textHeight) / 2) + rect.y;
+  aRenderingContext.DrawString(mLabel, x, y);
+
+
+  NS_RELEASE(context);
+  return NS_OK;
+}
+
+BView *nsButton::CreateBeOSView()
+{
+	return mButton = new nsButtonBeOS(this, BRect(0, 0, 0, 0), "", "");
+}
+
+//-------------------------------------------------------------------------
+// Sub-class of BeOS Button
+//-------------------------------------------------------------------------
+nsButtonBeOS::nsButtonBeOS( nsIWidget *aWidgetWindow, BRect aFrame, 
+    const char *aName, const char *aLabel, uint32 aResizingMode, uint32 aFlags )
+  : BButton( aFrame, aName, aLabel, new BMessage('clik'), aResizingMode, aFlags ),
+    nsIWidgetStore( aWidgetWindow )
+{
+}
+
+void nsButtonBeOS::AttachedToWindow()
+{
+	SetTarget(this);
+}
+
+void nsButtonBeOS::MessageReceived(BMessage *msg)
+{
+	switch(msg->what)
+	{
+		case 'clik' :
+			{
+			nsWindow	*w = (nsWindow *)GetMozillaWidget();
+			nsToolkit	*t;
+			if(w && (t = w->GetToolkit()) != 0)
+			{
+				uint32	args[5];
+				args[0] = NS_MOUSE_LEFT_CLICK;
+				args[1] = (uint32)0;
+				args[2] = (uint32)0;
+				args[3] = 1;
+				args[4] = modifiers();
+				MethodInfo *info = new MethodInfo(w, w, nsWindow::BTNCLICK, 5, args);
+				t->CallMethodAsync(info);
+				NS_RELEASE(t);
+			}
+			}
+			break;
+
+		default :
+			BButton::MessageReceived(msg);
+	}
+}
+

mozilla/widget/src/beos/nsButton.h

@@ -0,0 +1,77 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsButton_h__
+#define nsButton_h__
+
+#include "nsdefs.h"
+#include "nsWindow.h"
+#include "nsSwitchToUIThread.h"
+
+#include "nsIButton.h"
+
+#include <Button.h>
+
+/**
+ * Native Win32 button wrapper
+ */
+
+class nsButton :  public nsWindow,
+                  public nsIButton
+{
+
+public:
+  nsButton();
+  virtual ~nsButton();
+
+   //nsISupports
+  NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr);                           
+  NS_IMETHOD_(nsrefcnt) AddRef(void);                                       
+  NS_IMETHOD_(nsrefcnt) Release(void);                                      
+  
+  // nsIButton part
+  NS_IMETHOD SetLabel(const nsString& aText);
+  NS_IMETHOD GetLabel(nsString& aBuffer);
+  
+  // nsBaseWidget
+  NS_IMETHOD Paint(nsIRenderingContext& aRenderingContext,
+                 const nsRect& aDirtyRect);
+
+  virtual PRBool OnMove(PRInt32 aX, PRInt32 aY);
+  virtual PRBool OnPaint(nsRect &r);
+  virtual PRBool OnResize(nsRect &aWindowRect);
+
+protected:
+  nsString mLabel;
+  virtual BView *CreateBeOSView();
+  BButton *mButton;
+};
+
+//
+// A BButton subclass
+//
+class nsButtonBeOS : public BButton, public nsIWidgetStore {
+  public:
+    nsButtonBeOS( nsIWidget *aWidgetWindow, BRect aFrame, const char *aName,
+        const char *aLabel, uint32 aResizingMode = B_FOLLOW_LEFT | B_FOLLOW_TOP, 
+        uint32 aFlags = B_WILL_DRAW | B_NAVIGABLE );
+	void AttachedToWindow();
+	void MessageReceived(BMessage *msg);
+};
+
+#endif // nsButton_h__

mozilla/widget/src/beos/nsCList.h

@@ -0,0 +1,102 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef CLIST_H
+#define CLIST_H
+
+#include <stddef.h>
+
+// -----------------------------------------------------------------------
+//
+// Simple circular linked-list implementation...
+//
+// -----------------------------------------------------------------------
+
+// Foreward declarations...
+struct CList;
+
+#define OBJECT_PTR_FROM_CLIST(className, listElement) \
+            ((char*)listElement - offsetof(className, m_link))
+                
+
+struct CList {
+    CList *next;
+    CList *prev;
+
+    CList() {
+        next = prev = this;
+    }
+
+    ~CList() {
+        Remove();
+    }
+        
+    //
+    // Append an element to the end of this list
+    //
+    void Append(CList &element) {
+        element.next = this;
+        element.prev = prev;
+        prev->next = &element;
+        prev = &element;
+    }
+
+    //
+    // Add an element to the beginning of this list
+    //
+    void Add(CList &element) {
+        element.next = next;
+        element.prev = this;
+        next->prev = &element;
+        next = &element;
+    }
+
+    //
+    // Append this element to the end of a list
+    //
+    void AppendToList(CList &list) {
+        list.Append(*this);
+    }
+
+    //
+    // Add this element to the beginning of a list
+    //
+    void AddToList(CList &list) {
+        list.Add(*this);
+    }
+
+    //
+    // Remove this element from the list and re-initialize
+    //
+    void Remove(void) {
+        prev->next = next;
+        next->prev = prev;
+ 
+        next = prev = this;
+    }
+
+    //
+    // Is this list empty ?
+    //
+    bool IsEmpty(void) {
+        return (next == this);
+    }
+};    
+
+#endif // CLIST_H
+

mozilla/widget/src/beos/nsCheckButton.cpp

@@ -0,0 +1,237 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsCheckButton.h"
+#include "nsToolkit.h"
+#include "nsColor.h"
+#include "nsGUIEvent.h"
+#include "nsString.h"
+#include "nsStringUtil.h"
+
+#include "nsILookAndFeel.h"
+#include "nsWidgetsCID.h"
+#include "nsIComponentManager.h"
+
+#include "nsIDeviceContext.h"
+
+NS_IMPL_ADDREF(nsCheckButton)
+NS_IMPL_RELEASE(nsCheckButton)
+
+//-------------------------------------------------------------------------
+//
+// nsCheckButton constructor
+//
+//-------------------------------------------------------------------------
+nsCheckButton::nsCheckButton() : nsWindow() , nsICheckButton(),
+  mState(PR_FALSE)
+{
+  NS_INIT_REFCNT();
+}
+
+
+//-------------------------------------------------------------------------
+//
+// nsCheckButton destructor
+//
+//-------------------------------------------------------------------------
+nsCheckButton::~nsCheckButton()
+{
+}
+
+
+/**
+ * Implement the standard QueryInterface for NS_IWIDGET_IID and NS_ISUPPORTS_IID
+ * @modify gpk 8/4/98
+ * @param aIID The name of the class implementing the method
+ * @param _classiiddef The name of the #define symbol that defines the IID
+ * for the class (e.g. NS_ISUPPORTS_IID)
+ * 
+*/ 
+nsresult nsCheckButton::QueryInterface(const nsIID& aIID, void** aInstancePtr)
+{
+    if (NULL == aInstancePtr) {
+        return NS_ERROR_NULL_POINTER;
+    }
+
+    static NS_DEFINE_IID(kICheckButtonIID, NS_ICHECKBUTTON_IID);
+    if (aIID.Equals(kICheckButtonIID)) {
+        *aInstancePtr = (void*) ((nsICheckButton*)this);
+        NS_ADDREF_THIS();
+        return NS_OK;
+    }
+    return nsWindow::QueryInterface(aIID,aInstancePtr);
+}
+
+
+//-------------------------------------------------------------------------
+//
+// Set this button label
+//
+//-------------------------------------------------------------------------
+NS_METHOD nsCheckButton::SetState(const PRBool aState)
+{
+	mState = aState;
+	if(mCheckBox && mCheckBox->LockLooper())
+	{
+		mCheckBox->SetValue(aState ? 1 : 0);
+		mCheckBox->UnlockLooper();
+	}
+	return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+// Set this button label
+//
+//-------------------------------------------------------------------------
+NS_METHOD nsCheckButton::GetState(PRBool& aState)
+{
+	aState = mState;
+	if(mCheckBox && mCheckBox->LockLooper())
+	{
+		aState = mCheckBox->Value() ? PR_TRUE : PR_FALSE;
+		mCheckBox->UnlockLooper();
+	}
+	return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+// Set this button label
+//
+//-------------------------------------------------------------------------
+NS_METHOD nsCheckButton::SetLabel(const nsString& aText)
+{
+	char label[256];
+	aText.ToCString(label, 256);
+	label[255] = '\0';
+	if(mCheckBox && mCheckBox->LockLooper())
+	{
+		mCheckBox->SetLabel(label);
+		mCheckBox->UnlockLooper();
+	}
+	return NS_OK;
+}
+
+
+//-------------------------------------------------------------------------
+//
+// Get this button label
+//
+//-------------------------------------------------------------------------
+NS_METHOD nsCheckButton::GetLabel(nsString& aBuffer)
+{
+	if(mCheckBox && mCheckBox->LockLooper())
+	{
+		aBuffer.SetLength(0);
+		aBuffer.Append(mCheckBox->Label());
+		mCheckBox->UnlockLooper();
+	}
+	return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+// move, paint, resizes message - ignore
+//
+//-------------------------------------------------------------------------
+PRBool nsCheckButton::OnMove(PRInt32, PRInt32)
+{
+  return PR_FALSE;
+}
+
+PRBool nsCheckButton::OnPaint(nsRect &r)
+{
+    return PR_FALSE;
+}
+
+PRBool nsCheckButton::OnResize(nsRect &aWindowRect)
+{
+    return PR_FALSE;
+}
+
+
+/**
+ * Renders the CheckButton for Printing
+ *
+ **/
+NS_METHOD nsCheckButton::Paint(nsIRenderingContext& aRenderingContext,
+                               const nsRect&        aDirtyRect)
+{
+  nsRect rect;
+  float  appUnits;
+  float  scale;
+  nsIDeviceContext * context;
+  aRenderingContext.GetDeviceContext(context);
+
+  context->GetCanonicalPixelScale(scale);
+  context->GetDevUnitsToAppUnits(appUnits);
+
+  GetBoundsAppUnits(rect, appUnits);
+
+  nscoord one   = nscoord(PRFloat64(rect.height) * 1.0/20.0);
+  nscoord three = nscoord(PRFloat64(rect.width)  * 3.0/20.0);
+  nscoord five  = nscoord(PRFloat64(rect.width)  * 5.0/20.0);
+  nscoord six   = nscoord(PRFloat64(rect.height) * 5.0/20.0);
+  nscoord eight = nscoord(PRFloat64(rect.height) * 7.0/20.0);
+  nscoord nine  = nscoord(PRFloat64(rect.width)  * 9.0/20.0);
+  nscoord ten   = nscoord(PRFloat64(rect.height) * 9.0/20.0);
+
+  rect.x      += three;
+  rect.y      += nscoord(PRFloat64(rect.height) * 3.5 /20.0);
+  rect.width  = nscoord(PRFloat64(rect.width) * 12.0/20.0);
+  rect.height = nscoord(PRFloat64(rect.height) * 12.0/20.0);
+
+  aRenderingContext.SetColor(NS_RGB(0,0,0));
+
+  nscoord onePixel  = nscoord((appUnits+0.6F));
+  DrawScaledRect(aRenderingContext, rect, scale, appUnits);
+  nscoord x = rect.x;
+  nscoord y = rect.y;
+
+  if (mState) {
+    nscoord inc   = nscoord(PRFloat64(rect.height) *   0.75/20.0);
+    nscoord yy = 0;
+    for (nscoord i=0;i<4;i++) {
+      DrawScaledLine(aRenderingContext, x+three, y+eight+yy,  x+five, y+ten+yy, scale, appUnits, PR_FALSE); // top
+      DrawScaledLine(aRenderingContext, x+five,  y+ten+yy,    x+nine, y+six+yy, scale, appUnits, PR_FALSE); // top
+      //aRenderingContext.DrawLine(x+three, y+eight+yy,  x+five, y+ten+yy);
+      //aRenderingContext.DrawLine(x+five,  y+ten+yy,    x+nine, y+six+yy);
+      yy += nscoord(scale);
+    }
+  }
+
+  NS_RELEASE(context);
+  return NS_OK;
+}
+
+BView *nsCheckButton::CreateBeOSView()
+{
+	return mCheckBox = new nsCheckBoxBeOS(this, BRect(0, 0, 0, 0), "", "", NULL);
+}
+
+//-------------------------------------------------------------------------
+// Sub-class of BeOS CheckBox
+//-------------------------------------------------------------------------
+nsCheckBoxBeOS::nsCheckBoxBeOS( nsIWidget *aWidgetWindow, BRect aFrame, 
+    const char *aName, const char *aLabel, BMessage *aMessage,
+    uint32 aResizingMode, uint32 aFlags )
+  : BCheckBox( aFrame, aName, aLabel, aMessage, aResizingMode, aFlags ),
+    nsIWidgetStore( aWidgetWindow )
+{
+}

mozilla/widget/src/beos/nsCheckButton.h

@@ -0,0 +1,77 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsCheckButton_h__
+#define nsCheckButton_h__
+
+#include "nsdefs.h"
+#include "nsWindow.h"
+#include "nsSwitchToUIThread.h"
+
+#include "nsICheckButton.h"
+
+#include <CheckBox.h>
+
+/**
+ * Native Win32 Checkbox wrapper
+ */
+
+class nsCheckButton : public nsWindow,
+                      public nsICheckButton
+{
+
+public:
+                            nsCheckButton();
+    virtual                 ~nsCheckButton();
+
+    // nsISupports
+    NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr);                           
+    NS_IMETHOD_(nsrefcnt) AddRef(void);                                       
+    NS_IMETHOD_(nsrefcnt) Release(void);                                      
+  
+    // nsICheckButton part
+    NS_IMETHOD SetLabel(const nsString &aText);
+    NS_IMETHOD GetLabel(nsString &aBuffer);
+    NS_IMETHOD SetState(const PRBool aState);
+    NS_IMETHOD GetState(PRBool& aState);
+
+    NS_IMETHOD Paint(nsIRenderingContext& aRenderingContext,
+                     const nsRect& aDirtyRect);
+
+    virtual PRBool          OnMove(PRInt32 aX, PRInt32 aY);
+    virtual PRBool          OnPaint(nsRect &r);
+    virtual PRBool          OnResize(nsRect &aWindowRect);
+
+
+protected:
+  PRBool mState; 
+  virtual BView *CreateBeOSView();
+  BCheckBox	*mCheckBox;
+};
+
+//
+// A BCheckBox subclass
+//
+class nsCheckBoxBeOS : public BCheckBox, public nsIWidgetStore {
+  public:
+    nsCheckBoxBeOS( nsIWidget *aWidgetWindow, BRect aFrame, const char *aName,
+        const char *aLabel, BMessage *aMessage, uint32 aResizingMode = B_FOLLOW_LEFT | B_FOLLOW_TOP, 
+        uint32 aFlags = B_WILL_DRAW | B_NAVIGABLE );
+};
+
+#endif // nsCheckButton_h__

mozilla/widget/src/beos/nsClipboard.cpp

@@ -0,0 +1,523 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsClipboard.h"
+
+#include "nsCOMPtr.h"
+
+#include "nsIClipboardOwner.h"
+#include "nsITransferable.h"   // kTextMime
+
+#include "nsIWidget.h"
+#include "nsIServiceManager.h"
+#include "nsWidgetsCID.h"
+
+#include <View.h>
+
+// The class statics:
+BView *nsClipboard::sView = 0;
+
+NS_IMPL_ADDREF_INHERITED(nsClipboard, nsBaseClipboard)
+NS_IMPL_RELEASE_INHERITED(nsClipboard, nsBaseClipboard)
+
+static NS_DEFINE_CID(kCClipboardCID,       NS_CLIPBOARD_CID);
+
+#if defined(DEBUG_akkana) || defined(DEBUG_mcafee)
+#define DEBUG_CLIPBOARD
+#endif
+ 
+
+//-------------------------------------------------------------------------
+//
+// nsClipboard constructor
+//
+//-------------------------------------------------------------------------
+nsClipboard::nsClipboard() : nsBaseClipboard()
+{
+#ifdef DEBUG_CLIPBOARD
+  printf("  nsClipboard::nsClipboard()\n");
+#endif /* DEBUG_CLIPBOARD */
+
+  //NS_INIT_REFCNT();
+  mIgnoreEmptyNotification = PR_FALSE;
+  mClipboardOwner = nsnull;
+  mTransferable   = nsnull;
+//  mSelectionData.data = nsnull;
+//  mSelectionData.length = 0;
+}
+
+//-------------------------------------------------------------------------
+//
+// nsClipboard destructor
+//
+//-------------------------------------------------------------------------
+nsClipboard::~nsClipboard()
+{
+#ifdef DEBUG_CLIPBOARD
+  printf("  nsClipboard::~nsClipboard()\n");  
+#endif /* DEBUG_CLIPBOARD */
+
+//  // Remove all our event handlers:
+//  if (sView &&
+//      gdk_selection_owner_get (GDK_SELECTION_PRIMARY) == sWidget->window)
+//    gtk_selection_remove_all(sWidget);
+//
+//  // free the selection data, if any
+//  if (mSelectionData.data != nsnull)
+//    g_free(mSelectionData.data);
+}
+
+/**
+ * @param aIID The name of the class implementing the method
+ * @param _classiiddef The name of the #define symbol that defines the IID
+ * for the class (e.g. NS_ISUPPORTS_IID)
+ * 
+*/ 
+nsresult nsClipboard::QueryInterface(const nsIID& aIID, void** aInstancePtr)
+{
+  if (NULL == aInstancePtr) {
+    return NS_ERROR_NULL_POINTER;
+  }
+
+  nsresult rv = NS_NOINTERFACE;
+
+  if (aIID.Equals(nsIClipboard::GetIID())) {
+    *aInstancePtr = (void*) ((nsIClipboard*)this);
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+
+  return rv;
+}
+
+
+void nsClipboard::SetTopLevelView(BView *v)
+{
+  // Don't set up any more event handlers if we're being called twice
+  // for the same toplevel widget
+  if (sView == v)
+    return;
+
+  if (sView != 0 && sView->Window() != 0)
+    return;
+
+  if(v == 0 || v->Window() == 0)
+  {
+#ifdef DEBUG_CLIPBOARD
+    printf("  nsClipboard::SetTopLevelView: widget passed in is null or has no window!\n");
+#endif /* DEBUG_CLIPBOARD */
+    return;
+  }
+
+#ifdef DEBUG_CLIPBOARD
+  printf("  nsClipboard::SetTopLevelView\n");
+#endif /* DEBUG_CLIPBOARD */
+  
+//  // If we're changing from one widget to another
+//  // (shouldn't generally happen), clear the old event handlers:
+//  if (sView &&
+//      gdk_selection_owner_get (GDK_SELECTION_PRIMARY) == sWidget->window)
+//    gtk_selection_remove_all(sWidget);
+//
+//  sWidget = w;
+//
+//  // Get the clipboard from the service manager.
+//  nsresult rv;
+//  NS_WITH_SERVICE(nsIClipboard, clipboard, kCClipboardCID, &rv);
+//
+//  if (!NS_SUCCEEDED(rv)) {
+//    printf("Couldn't get clipboard service!\n");
+//    return;
+//  }
+//
+//  // Handle selection requests if we called gtk_selection_add_target:
+//  gtk_signal_connect(GTK_OBJECT(sWidget), "selection_get",
+//                     GTK_SIGNAL_FUNC(nsClipboard::SelectionGetCB),
+//                     clipboard);
+//
+//  // When someone else takes the selection away:
+//  gtk_signal_connect(GTK_OBJECT(sWidget), "selection_clear_event",
+//                     GTK_SIGNAL_FUNC(nsClipboard::SelectionClearCB),
+//                     clipboard);
+//
+//  // Set up the paste handler:
+//  gtk_signal_connect(GTK_OBJECT(sWidget), "selection_received",
+//                     GTK_SIGNAL_FUNC(nsClipboard::SelectionReceivedCB),
+//                     clipboard);
+//
+//#if 0
+//  // Handle selection requests if we called gtk_selection_add_targets:
+//  gtk_signal_connect(GTK_OBJECT(sWidget), "selection_request_event",
+//                     GTK_SIGNAL_FUNC(nsClipboard::SelectionRequestCB),
+//                     clipboard);
+//  
+//  // Watch this, experimenting with Gtk :-)
+//  gtk_signal_connect(GTK_OBJECT(sWidget), "selection_notify_event",
+//                     GTK_SIGNAL_FUNC(nsClipboard::SelectionNotifyCB),
+//                     clipboard);
+//#endif
+//
+//  // Hmm, sometimes we need this, sometimes not.  I'm not clear why.
+//  // See also long comment above on why we don't register a whole target list.
+//
+//  // Register all the target types we handle:
+//  gtk_selection_add_target(sWidget, 
+//                           GDK_SELECTION_PRIMARY,
+//                           GDK_SELECTION_TYPE_STRING,
+//                           GDK_SELECTION_TYPE_STRING);
+}
+
+
+/**
+  * 
+  *
+  */
+NS_IMETHODIMP nsClipboard::SetNativeClipboardData()
+{
+  mIgnoreEmptyNotification = PR_TRUE;
+
+#ifdef DEBUG_CLIPBOARD
+  printf("  nsClipboard::SetNativeClipboardData()\n");
+#endif /* DEBUG_CLIPBOARD */
+
+  // make sure we have a good transferable
+  if (nsnull == mTransferable) {
+    printf("  SetNativeClipboardData: no transferable!\n");
+    return NS_ERROR_FAILURE;
+  }
+
+//  // If we're already the selection owner, don't need to do anything,
+//  // we'll already get the events:
+//  if (gdk_selection_owner_get (GDK_SELECTION_PRIMARY) == sWidget->window)
+//    return NS_OK;
+//
+//  // Clear the native clipboard
+//  if (sWidget &&
+//      gdk_selection_owner_get (GDK_SELECTION_PRIMARY) == sWidget->window)
+//    gtk_selection_remove_all(sWidget);
+//
+//
+//  // register as the selection owner:
+//  gint have_selection =
+//    gtk_selection_owner_set(sWidget,
+//                            GDK_SELECTION_PRIMARY,
+//                            GDK_CURRENT_TIME);
+//  if (have_selection == 0)
+//    return NS_ERROR_FAILURE;
+
+  mIgnoreEmptyNotification = PR_FALSE;
+
+  return NS_OK;
+}
+
+
+//
+// The blocking Paste routine
+//
+NS_IMETHODIMP
+nsClipboard::GetNativeClipboardData(nsITransferable * aTransferable)
+{
+  nsresult rv = NS_OK;
+
+#ifdef DEBUG_CLIPBOARD
+  printf("  nsClipboard::GetNativeClipboardData()\n");
+#endif /* DEBUG_CLIPBOARD */
+
+  // make sure we have a good transferable
+  if (nsnull == aTransferable) {
+    printf("  GetNativeClipboardData: Transferable is null!\n");
+    return NS_ERROR_FAILURE;
+  }
+
+  // Dunno why we need to do this, copying the win32 code ...
+  nsCOMPtr<nsITransferable> trans = do_QueryInterface(aTransferable);
+  if (!trans)
+    return rv;
+
+//  //
+//  // We can't call the copy callback when we're blocking on the paste callback;
+//  // so if this app is already the selection owner, we need to copy our own
+//  // data without going through the X server.
+//  //
+//  if (gdk_selection_owner_get (GDK_SELECTION_PRIMARY) == sWidget->window)
+//  {
+//    // XXX only support text/plain for now
+//    nsAutoString  dataFlavor(kTextMime);
+//
+//    // Get data out of our existing transferable.
+//    void     *clipboardData;
+//    PRUint32 dataLength;
+//    rv = mTransferable->GetTransferData(&dataFlavor, 
+//                                        &clipboardData,
+//                                        &dataLength);
+//    if (NS_SUCCEEDED(rv))
+//      rv = trans->SetTransferData(&dataFlavor,
+//                                  clipboardData, dataLength);
+//    return rv;
+//  }
+//
+//#define ONLY_SUPPORT_PLAIN_TEXT 1
+//#ifdef ONLY_SUPPORT_PLAIN_TEXT
+//  gtk_selection_convert(sWidget, GDK_SELECTION_PRIMARY,
+//                        GDK_SELECTION_TYPE_STRING, GDK_CURRENT_TIME);
+//  // Tried to use straight Xlib call but this would need more work:
+//  //XConvertSelection(GDK_WINDOW_XDISPLAY(sWidget->window),
+//  //                  XA_PRIMARY, XA_STRING, gdk_selection_property, 
+//  //                  GDK_WINDOW_XWINDOW(sWidget->window), GDK_CURRENT_TIME);
+//
+//#else /* ONLY_SUPPORT_PLAIN_TEXT */
+//    //
+//    // XXX This code isn't implemented for Unix yet!
+//    // Instead of SetTransferData it will have to call gtk_selection_convert.
+//    //
+//
+//  // Get the transferable list of data flavors
+//  nsVoidArray * dfList;
+//  aTransferable->GetTransferDataFlavors(&dfList);
+//
+//  // Walk through flavors and see which flavor matches the one being pasted:
+//  PRUint32 i;
+//  PRUint32 cnt = 0;
+//  nsresult rv = dfList->Count(&cnt);
+//  NS_ASSERTION(NS_SUCCEEDED(rv), "Count failed");
+//  for (i=0;i<cnt;i++) {
+//    nsString * df = (nsString *)dfList->ElementAt(i);
+//    if (nsnull != df) {
+//      UINT format = GetFormat(*df);
+//
+//      void   * data;
+//      PRUint32 dataLen;
+//
+//      if (nsnull != aDataObject) {
+//        res = GetNativeDataOffClipboard(aDataObject, format, &data, &dataLen);
+//        if (NS_OK == res) {
+//          trans->SetTransferData(df, data, dataLen);
+//        }
+//      } else if (nsnull != aWindow) {
+//        res = GetNativeDataOffClipboard(aWindow, format, &data, &dataLen);
+//        if (NS_OK == res) {
+//          trans->SetTransferData(df, data, dataLen);
+//        }
+//      } 
+//    }
+//  }
+//#endif /* ONLY_SUPPORT_PLAIN_TEXT */
+//
+//  //
+//  // We've told X what type to send, and we just have to wait
+//  // for the callback saying that the data have been transferred.
+//  //
+//
+//  // Set a flag saying that we're blocking waiting for the callback:
+//  mBlocking = PR_TRUE;
+//#ifdef DEBUG_CLIPBOARD
+//  printf("Waiting for the callback\n");
+//#endif /* DEBUG_CLIPBOARD */
+//
+//  // Now we need to wait until the callback comes in ...
+//  // i is in case we get a runaway (yuck).
+//  for (int i=0; mBlocking == PR_TRUE && i < 10000; ++i)
+//  {
+//    gtk_main_iteration_do(PR_TRUE);
+//  }
+//
+//#ifdef DEBUG_CLIPBOARD
+//  printf("Got the callback: '%s', %d\n",
+//         mSelectionData.data, mSelectionData.length);
+//#endif /* DEBUG_CLIPBOARD */
+//
+//  // We're back from the callback, no longer blocking:
+//  mBlocking = PR_FALSE;
+//
+//  // 
+//  // Now we have data in mSelectionData.data.
+//  // We just have to copy it to the transferable.
+//  // 
+//  nsAutoString  dataFlavor(kTextMime);
+//  trans->SetTransferData(&dataFlavor, mSelectionData.data, mSelectionData.length);
+//
+//  // Can't free the selection data -- the transferable just saves a pointer.
+//  // But the transferable is responsible for freeing it, so we have to
+//  // consider it freed now:
+//  //g_free(mSelectionData.data);
+//  mSelectionData.data = nsnull;
+//  mSelectionData.length = 0;
+
+  return NS_OK;
+}
+
+//
+// Called when the data from a paste comes in:
+// 
+//void
+//nsClipboard::SelectionReceivedCB (GtkWidget *aWidget,
+//                                  GtkSelectionData *aSelectionData,
+//                                  gpointer aData)
+//{
+//#ifdef DEBUG_CLIPBOARD
+//  printf("  nsClipboard::SelectionReceivedCB\n");
+//#endif /* DEBUG_CLIPBOARD */
+//
+//  // ARGHH!  GTK doesn't pass the arg to the callback, so we can't
+//  // get "this" back!  Until we solve this, get it from the service mgr:
+//  nsresult rv;
+//  NS_WITH_SERVICE(nsIClipboard, iclipboard, kCClipboardCID, &rv);
+//
+//  if (NS_FAILED(rv)) {
+//    printf("Couldn't get clipboard service!\n");
+//    return;
+//  }
+//  nsClipboard* clipboard = (nsClipboard*)iclipboard;
+//  if (!clipboard) {
+//    printf("couldn't convert nsIClipboard to nsClipboard\n");
+//    return;
+//  }
+//
+//  clipboard->SelectionReceiver(aWidget, aSelectionData);
+//}
+//
+//void
+//nsClipboard::SelectionReceiver (GtkWidget *aWidget,
+//                                GtkSelectionData *aSelectionData)
+//{
+//  mBlocking = PR_FALSE;
+//
+//  if (aSelectionData->length < 0)
+//  {
+//    printf("Error retrieving selection: length was %d\n",
+//           aSelectionData->length);
+//    return;
+//  }
+//
+//  switch (aSelectionData->type)
+//  {
+//    case GDK_SELECTION_TYPE_STRING:
+//      mSelectionData = *aSelectionData;
+//      mSelectionData.data = g_new(guchar, aSelectionData->length + 1);
+//      memcpy(mSelectionData.data,
+//             aSelectionData->data, aSelectionData->length);
+//      // Null terminate in case anyone cares,
+//      // and so we can print the string for debugging:
+//      mSelectionData.data[aSelectionData->length] = '\0';
+//      mSelectionData.length = aSelectionData->length;
+//      return;
+//
+//    default:
+//      printf("Can't convert type %s (%ld) to string\n",
+//             gdk_atom_name (aSelectionData->type), aSelectionData->type);
+//      return;
+//  }
+//}
+//
+/**
+  * No-op.
+  *
+  */
+NS_IMETHODIMP nsClipboard::ForceDataToClipboard()
+{
+#ifdef DEBUG_CLIPBOARD
+  printf("  nsClipboard::ForceDataToClipboard()\n");
+#endif /* DEBUG_CLIPBOARD */
+
+  // make sure we have a good transferable
+  if (nsnull == mTransferable) {
+    return NS_ERROR_FAILURE;
+  }
+
+  return NS_OK;
+}
+
+//
+//// This is the callback which is called when another app
+//// requests the selection.
+////
+//void nsClipboard::SelectionGetCB(GtkWidget        *widget,
+//                                 GtkSelectionData *aSelectionData,
+//                                 guint      /*info*/,
+//                                 guint      /*time*/,
+//                                 gpointer   aData)
+//{ 
+//#ifdef DEBUG_CLIPBOARD
+//  printf("  nsClipboard::SelectionGetCB\n"); 
+//#endif /* DEBUG_CLIPBOARD */
+//
+//  nsClipboard *clipboard = (nsClipboard *)aData;
+//
+//  void     *clipboardData;
+//  PRUint32 dataLength;
+//  nsresult rv;
+//
+//  // Make sure we have a transferable:
+//  if (!clipboard->mTransferable) {
+//    printf("Clipboard has no transferable!\n");
+//    return;
+//  }
+//
+//  // XXX hack, string-only for now.
+//  // Create string data-flavor.
+//  nsString dataFlavor (kTextMime);
+//
+//  // Get data out of transferable.
+//  rv = clipboard->mTransferable->GetTransferData(&dataFlavor, 
+//                                                 &clipboardData,
+//                                                 &dataLength);
+//
+//  // Currently we only offer the data in GDK_SELECTION_TYPE_STRING format.
+//  if (NS_SUCCEEDED(rv) && clipboardData && dataLength > 0) {
+//    gtk_selection_data_set(aSelectionData,
+//                           GDK_SELECTION_TYPE_STRING, 8,
+//                           (unsigned char *)clipboardData,
+//                           dataLength);
+//  }
+//  else
+//    printf("Transferable didn't support the data flavor\n");
+//}
+//
+//
+//
+//// Called when another app requests selection ownership:
+//void nsClipboard::SelectionClearCB(GtkWidget *widget,
+//                                   GdkEventSelection *event,
+//                                   gpointer data)
+//{
+//#ifdef DEBUG_CLIPBOARD
+//  printf("  nsClipboard::SelectionClearCB\n");
+//#endif /* DEBUG_CLIPBOARD */
+//}
+//
+//
+//// The routine called when another app asks for the content of the selection
+//void
+//nsClipboard::SelectionRequestCB (GtkWidget *aWidget,
+//                                 GtkSelectionData *aSelectionData,
+//                                 gpointer aData)
+//{
+//#ifdef DEBUG_CLIPBOARD
+//  printf("  nsClipboard::SelectionRequestCB\n");
+//#endif /* DEBUG_CLIPBOARD */
+//}
+//
+//void
+//nsClipboard::SelectionNotifyCB (GtkWidget *aWidget,
+//                                  GtkSelectionData *aSelectionData,
+//                                  gpointer aData)
+//{
+//#ifdef DEBUG_CLIPBOARD
+//   printf("  nsClipboard::SelectionNotifyCB\n");
+//#endif /* DEBUG_CLIPBOARD */
+//}

mozilla/widget/src/beos/nsClipboard.h

@@ -0,0 +1,88 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsClipboard_h__
+#define nsClipboard_h__
+
+#include "nsBaseClipboard.h"
+#include <Clipboard.h>
+
+class nsITransferable;
+class nsIClipboardOwner;
+class nsIWidget;
+
+/**
+ * Native BeOS Clipboard wrapper
+ */
+
+class nsClipboard : public nsBaseClipboard
+{
+
+public:
+  nsClipboard();
+  virtual ~nsClipboard();
+
+  //nsISupports
+  NS_DECL_ISUPPORTS_INHERITED
+
+  // nsIClipboard  
+  NS_IMETHOD ForceDataToClipboard();
+
+  static void SetTopLevelView(BView *v);
+
+
+protected:
+  NS_IMETHOD SetNativeClipboardData();
+  NS_IMETHOD GetNativeClipboardData(nsITransferable * aTransferable);
+
+  PRBool            mIgnoreEmptyNotification;
+
+  static BView  *sView;
+
+//  // Used for communicating pasted data
+//  // from the asynchronous X routines back to a blocking paste:
+//  GtkSelectionData mSelectionData;
+//  PRBool mBlocking;
+//
+//  void SelectionReceiver(GtkWidget *aWidget,
+//                         GtkSelectionData *aSelectionData);
+//
+//  static void SelectionGetCB(GtkWidget *widget, 
+//                             GtkSelectionData *selection_data,
+//                             guint      /*info*/,
+//                             guint      /*time*/,
+//                             gpointer data);
+//
+//  static void SelectionClearCB(GtkWidget *widget, 
+//                               GdkEventSelection *event,
+//                               gpointer data );
+//
+//  static void SelectionRequestCB(GtkWidget *aWidget,
+//                             GtkSelectionData *aSelectionData,
+//                             gpointer aData);
+//  
+//  static void SelectionReceivedCB(GtkWidget *aWidget,
+//                                  GtkSelectionData *aSelectionData,
+//                                  gpointer aData);
+//
+//  static void SelectionNotifyCB(GtkWidget *aWidget,
+//                                GtkSelectionData *aSelectionData,
+//                                gpointer aData);
+};
+
+#endif // nsClipboard_h__

mozilla/widget/src/beos/nsComboBox.cpp

@@ -0,0 +1,380 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsComboBox.h"
+#include "nsToolkit.h"
+#include "nsColor.h"
+#include "nsGUIEvent.h"
+#include "nsString.h"
+#include "nsStringUtil.h"
+
+#include "nsILookAndFeel.h"
+#include "nsWidgetsCID.h"
+#include "nsIComponentManager.h"
+
+#include "nsIDeviceContext.h"
+#include "nsIFontMetrics.h"
+
+static NS_DEFINE_IID(kLookAndFeelCID, NS_LOOKANDFEEL_CID);
+static NS_DEFINE_IID(kILookAndFeelIID, NS_ILOOKANDFEEL_IID);
+NS_IMPL_ADDREF(nsComboBox)
+NS_IMPL_RELEASE(nsComboBox)
+
+//-------------------------------------------------------------------------
+//
+// nsComboBox constructor
+//
+//-------------------------------------------------------------------------
+nsComboBox::nsComboBox() : nsWindow(), nsIListWidget(), nsIComboBox()
+{
+  NS_INIT_REFCNT();
+  mBackground = NS_RGB(124, 124, 124);
+  mDropDownHeight = 60; // Default to 60 pixels for drop-down list height
+}
+
+//-------------------------------------------------------------------------
+//
+//  destructor
+//
+//-------------------------------------------------------------------------
+NS_METHOD nsComboBox::AddItemAt(nsString &aItem, PRInt32 aPosition)
+{
+	if(mMenuField && mMenuField->LockLooper())
+	{
+		NS_ALLOC_STR_BUF(val, aItem, 256);
+		mMenuField->Menu()->AddItem(new BMenuItem(val, 0), aPosition);
+		NS_FREE_STR_BUF(val);
+		mMenuField->UnlockLooper();
+	}
+	return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+//  Finds an item at a postion
+//
+//-------------------------------------------------------------------------
+PRInt32  nsComboBox::FindItem(nsString &aItem, PRInt32 aStartPos)
+{
+#if 0
+  NS_ALLOC_STR_BUF(val, aItem, 256);
+  int index = ::SendMessage(mWnd, CB_FINDSTRINGEXACT, (int)aStartPos, (LPARAM)(LPCTSTR)val); 
+  NS_FREE_STR_BUF(val);
+
+  return index;
+#endif
+	printf("nsListBox::FindItem not implemented\n");
+	return -1;
+}
+
+//-------------------------------------------------------------------------
+//
+//  CountItems - Get Item Count
+//
+//-------------------------------------------------------------------------
+PRInt32  nsComboBox::GetItemCount()
+{
+	PRInt32	result = 0;
+	if(mMenuField && mMenuField->LockLooper())
+	{
+		result = mMenuField->Menu()->CountItems();
+		mMenuField->UnlockLooper();
+	}
+	return result;
+}
+
+//-------------------------------------------------------------------------
+//
+//  Removes an Item at a specified location
+//
+//-------------------------------------------------------------------------
+PRBool  nsComboBox::RemoveItemAt(PRInt32 aPosition)
+{
+	if(mMenuField && mMenuField->LockLooper())
+	{
+		BMenuItem *it = mMenuField->Menu()->RemoveItem(aPosition);
+		delete it;
+		mMenuField->UnlockLooper();
+		return it ? PR_TRUE : PR_FALSE;
+	}
+	return PR_FALSE;
+}
+
+//-------------------------------------------------------------------------
+//
+//  Removes an Item at a specified location
+//
+//-------------------------------------------------------------------------
+PRBool nsComboBox::GetItemAt(nsString& anItem, PRInt32 aPosition)
+{
+	PRBool result = PR_FALSE;
+	anItem.SetLength(0);
+	if(mMenuField && mMenuField->LockLooper())
+	{
+		BMenuItem	*it = mMenuField->Menu()->ItemAt(aPosition);
+		anItem.Append(it->Label());
+		mMenuField->UnlockLooper();
+		result = PR_TRUE;
+	}
+	return result;
+}
+
+//-------------------------------------------------------------------------
+//
+//  Gets the selected of selected item
+//
+//-------------------------------------------------------------------------
+NS_METHOD nsComboBox::GetSelectedItem(nsString& aItem)
+{
+    GetItemAt(aItem, GetSelectedIndex()); 
+	return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+//  Gets the list of selected otems
+//
+//-------------------------------------------------------------------------
+PRInt32 nsComboBox::GetSelectedIndex()
+{  
+	PRInt32	index = -1;
+	if(mMenuField && mMenuField->LockLooper())
+	{
+		BMenuItem	*it = mMenuField->Menu()->FindMarked();
+		index = it ? mMenuField->Menu()->IndexOf(it) : -1;
+		mMenuField->UnlockLooper();
+	}
+	return index;
+}
+
+//-------------------------------------------------------------------------
+//
+//  SelectItem
+//
+//-------------------------------------------------------------------------
+NS_METHOD nsComboBox::SelectItem(PRInt32 aPosition)
+{
+	if(mMenuField && mMenuField->LockLooper())
+	{
+		BMenuItem *it = mMenuField->Menu()->ItemAt(aPosition);
+		if(it)
+			it->SetMarked(true);
+		mMenuField->UnlockLooper();
+	}
+	return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+//  Deselect
+//
+//-------------------------------------------------------------------------
+NS_METHOD nsComboBox::Deselect()
+{
+	if(mMenuField && mMenuField->LockLooper())
+	{
+		BMenuItem	*it = mMenuField->Menu()->FindMarked();
+		if(it)
+			it->SetMarked(false);
+		mMenuField->UnlockLooper();
+	}
+	return NS_OK;
+}
+
+
+//-------------------------------------------------------------------------
+//
+//  destructor
+//
+//-------------------------------------------------------------------------
+nsComboBox::~nsComboBox()
+{
+}
+
+//-------------------------------------------------------------------------
+//
+// Query interface implementation
+//
+//-------------------------------------------------------------------------
+nsresult nsComboBox::QueryInterface(const nsIID& aIID, void** aInstancePtr)
+{
+  static NS_DEFINE_IID(kInsComboBoxIID, NS_ICOMBOBOX_IID);
+  static NS_DEFINE_IID(kInsListWidgetIID, NS_ILISTWIDGET_IID);
+
+  if (aIID.Equals(kInsComboBoxIID)) {
+    *aInstancePtr = (void*) ((nsIComboBox*)this);
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+  else if (aIID.Equals(kInsListWidgetIID)) {
+    *aInstancePtr = (void*) ((nsIListWidget*)this);
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+
+  return nsWindow::QueryInterface(aIID,aInstancePtr);
+}
+
+//-------------------------------------------------------------------------
+//
+// move, paint, resizes message - ignore
+//
+//-------------------------------------------------------------------------
+PRBool nsComboBox::OnMove(PRInt32, PRInt32)
+{
+  return PR_FALSE;
+}
+
+PRBool nsComboBox::OnPaint(nsRect &r)
+{
+    return PR_FALSE;
+}
+
+PRBool nsComboBox::OnResize(nsRect &aWindowRect)
+{
+    return PR_FALSE;
+}
+
+
+//-------------------------------------------------------------------------
+//
+// Cache the drop down list height in mDropDownHeight
+//
+//-------------------------------------------------------------------------
+
+NS_METHOD nsComboBox::PreCreateWidget(nsWidgetInitData *aInitData)
+{
+  nsComboBoxInitData* comboData = (nsComboBoxInitData*)aInitData;
+  mDropDownHeight = comboData->mDropDownHeight;
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+// Modify the height passed to create and resize to be 
+// the combo box drop down list height. (Note: Windows uses
+// the height of the window to specify the drop-down list size,
+// not the height of combobox text area.
+//
+//-------------------------------------------------------------------------
+
+PRInt32 nsComboBox::GetHeight(PRInt32 aProposedHeight)
+{
+  return(mDropDownHeight);
+}
+
+
+//-------------------------------------------------------------------------
+//
+// get position/dimensions
+//
+//-------------------------------------------------------------------------
+
+NS_METHOD nsComboBox::GetBounds(nsRect &aRect)
+{
+#if 0
+  nsWindow::GetNonClientBounds(aRect);
+#endif
+printf("nsListBox::GetBounds not wrong\n");	// the following is just a placeholder
+  nsWindow::GetClientBounds(aRect);
+  return NS_OK;
+}
+
+/**
+ * Renders the TextWidget for Printing
+ *
+ **/
+NS_METHOD nsComboBox::Paint(nsIRenderingContext& aRenderingContext,
+                              const nsRect& aDirtyRect)
+{
+  nsBaseWidget::Paint(aRenderingContext, aDirtyRect);
+  /*nsRect rect;
+  GetBoundsAppUnits(rect, aTwipsConversion);
+  aRenderingContext.SetColor(NS_RGB(0,0,0));
+
+  nscolor bgColor  = NS_RGB(255,255,255);
+  nscolor fgColor  = NS_RGB(0,0,0);
+  nscolor hltColor = NS_RGB(240,240,240);
+  nscolor sdwColor = NS_RGB(128,128,128);
+  nsILookAndFeel * lookAndFeel;
+  if (NS_OK == nsComponentManager::CreateInstance(kLookAndFeelCID, nsnull, kILookAndFeelIID, (void**)&lookAndFeel)) {
+   lookAndFeel->GetColor(nsILookAndFeel::eColor_WidgetBackground,  bgColor);
+   lookAndFeel->GetColor(nsILookAndFeel::eColor_WidgetForeground,  fgColor);
+   lookAndFeel->GetColor(nsILookAndFeel::eColor_Widget3DShadow,    sdwColor);
+   lookAndFeel->GetColor(nsILookAndFeel::eColor_Widget3DHighlight, hltColor);
+  }
+
+  nsIDeviceContext * context;
+  //nsDrawingSurface surface;
+  aRenderingContext.GetDeviceContext(context);
+  //context->GetDrawingSurface(aRenderingContext, surface);
+
+  //HDC the_hdc = ((nsDrawingSurfaceWin *)&surface)->mDC;
+
+  //::SendMessage(mWnd, WM_PAINT, (WPARAM)the_hdc, NULL);
+  
+
+  // shrink by one pixel
+  
+  nscoord onePixel  = nscoord((aTwipsConversion+0.6F));
+  nscoord twoPixels = onePixel*2;
+
+  nsString text("(ComboBox)");
+  //GetSelectedItem(text);
+
+
+  aRenderingContext.SetColor(bgColor);
+  aRenderingContext.FillRect(rect);
+
+  aRenderingContext.SetColor(NS_RGB(0,0,0));
+  aRenderingContext.DrawRect(rect);
+
+
+  aRenderingContext.SetFont(*mFont);
+
+  nscoord textWidth;
+  nscoord textHeight;
+  aRenderingContext.GetWidth(text, textWidth);
+
+  nsIFontMetrics* metrics;
+  context->GetMetricsFor(*mFont, metrics);
+  metrics->GetMaxAscent(textHeight);
+
+  nscoord x = (twoPixels * 2)  + rect.x;
+  nscoord y = ((rect.height - textHeight) / 2) + rect.y;
+  //aRenderingContext.DrawString(text, x, y);
+  */
+  return NS_OK;
+}
+
+
+BView *nsComboBox::CreateBeOSView()
+{
+	return mMenuField = new nsMenuFieldBeOS((nsIWidget *)this, BRect(0, 0, 0, 0), "");
+}
+
+//-------------------------------------------------------------------------
+// Sub-class of BeOS MenuField
+//-------------------------------------------------------------------------
+nsMenuFieldBeOS::nsMenuFieldBeOS( nsIWidget *aWidgetWindow, BRect aFrame, 
+    const char *aName, uint32 aResizingMode, uint32 aFlags )
+  : BMenuField( aFrame, aName, "", new BPopUpMenu(""), aResizingMode, aFlags ),
+    nsIWidgetStore( aWidgetWindow )
+{
+	SetDivider(0);
+}

mozilla/widget/src/beos/nsComboBox.h

@@ -0,0 +1,93 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsComboBox_h__
+#define nsComboBox_h__
+
+#include "nsdefs.h"
+#include "nsWindow.h"
+#include "nsSwitchToUIThread.h"
+#include "nsIComboBox.h"
+
+#include <MenuItem.h>
+#include <PopUpMenu.h>
+#include <MenuField.h>
+
+/**
+ * Native Win32 Combobox wrapper
+ */
+
+class nsComboBox : public nsWindow,
+                   public nsIListWidget,
+                   public nsIComboBox
+{
+
+public:
+    nsComboBox();
+    ~nsComboBox();
+
+        // nsISupports
+    NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr);                           
+    NS_IMETHOD_(nsrefcnt) AddRef(void);                                       
+    NS_IMETHOD_(nsrefcnt) Release(void);          
+
+    // nsIWidget overrides
+    virtual PRBool OnMove(PRInt32 aX, PRInt32 aY);
+    virtual PRBool OnPaint(nsRect &r);
+    virtual PRBool OnResize(nsRect &aWindowRect);
+
+    // nsIWidget
+    NS_IMETHOD     GetBounds(nsRect &aRect);
+
+    // nsIComboBox interface
+    NS_IMETHOD      AddItemAt(nsString &aItem, PRInt32 aPosition);
+    virtual PRInt32 FindItem(nsString &aItem, PRInt32 aStartPos);
+    virtual PRInt32 GetItemCount();
+    virtual PRBool  RemoveItemAt(PRInt32 aPosition);
+    virtual PRBool  GetItemAt(nsString& anItem, PRInt32 aPosition);
+    NS_IMETHOD      GetSelectedItem(nsString& aItem);
+    virtual PRInt32 GetSelectedIndex();
+    NS_IMETHOD      SelectItem(PRInt32 aPosition);
+    NS_IMETHOD      Deselect() ;
+
+    NS_IMETHOD Paint(nsIRenderingContext& aRenderingContext,
+                     const nsRect& aDirtyRect);
+
+    NS_IMETHOD      PreCreateWidget(nsWidgetInitData *aInitData);
+
+protected:
+
+      // Modify the height passed to create and resize to be 
+      // the combo box drop down list height.
+    PRInt32 GetHeight(PRInt32 aProposedHeight);    
+    PRInt32 mDropDownHeight;
+	BView *CreateBeOSView();
+	BMenuField *mMenuField;
+};
+
+//
+// A BMenuField subclass
+//
+class nsMenuFieldBeOS : public BMenuField, public nsIWidgetStore {
+  public:
+	nsMenuFieldBeOS( nsIWidget *aWidgetWindow, BRect aFrame, 
+	    const char *name, uint32 aResizingMode = B_FOLLOW_LEFT | B_FOLLOW_TOP, 
+        uint32 aFlags = B_WILL_DRAW | B_NAVIGABLE );
+};
+
+#endif // nsComboBox_h__

mozilla/widget/src/beos/nsDialog.cpp

@@ -0,0 +1,165 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsDialog.h"
+#include "nsToolkit.h"
+#include "nsColor.h"
+#include "nsGUIEvent.h"
+#include "nsString.h"
+#include "nsStringUtil.h"
+
+#include "nsIAppShell.h"
+#include "nsIFontMetrics.h"
+#include "nsGUIEvent.h"
+#include "nsIRenderingContext.h"
+#include "nsIDeviceContext.h"
+#include "nsRect.h"
+#include "nsTransform2D.h"
+#include "nsStringUtil.h"
+#include "nsGfxCIID.h"
+#include "resource.h"
+
+NS_IMPL_ADDREF(nsDialog)
+NS_IMPL_RELEASE(nsDialog)
+
+//-------------------------------------------------------------------------
+//
+// nsDialog constructor
+//
+//-------------------------------------------------------------------------
+nsDialog::nsDialog() : nsWindow(), nsIDialog()
+{
+  NS_INIT_REFCNT();
+}
+
+
+//-------------------------------------------------------------------------
+//
+// Create the proper widget
+//
+//-------------------------------------------------------------------------
+NS_METHOD nsDialog::Create(nsIWidget *aParent,
+                      const nsRect &aRect,
+                      EVENT_CALLBACK aHandleEventFunction,
+                      nsIDeviceContext *aContext,
+                      nsIAppShell *aAppShell,
+                      nsIToolkit *aToolkit,
+                      nsWidgetInitData *aInitData)
+{
+  return nsWindow::Create(aParent,aRect,aHandleEventFunction,aContext,aAppShell,aToolkit,aInitData);
+  
+}
+
+
+//-------------------------------------------------------------------------
+//
+// nsDialog destructor
+//
+//-------------------------------------------------------------------------
+nsDialog::~nsDialog()
+{
+}
+
+//-------------------------------------------------------------------------
+//
+// Set this button label
+//
+//-------------------------------------------------------------------------
+NS_METHOD nsDialog::SetLabel(const nsString& aText)
+{
+#if 0
+  NS_ALLOC_STR_BUF(label, aText, 256);
+  VERIFY(::SetWindowText(mWnd, label));
+  NS_FREE_STR_BUF(label);
+#endif
+printf("nsDialog::SetLabel not implemented\n");
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+// Get this button label
+//
+//-------------------------------------------------------------------------
+NS_METHOD nsDialog::GetLabel(nsString& aBuffer)
+{
+#if 0
+  int actualSize = ::GetWindowTextLength(mWnd)+1;
+  NS_ALLOC_CHAR_BUF(label, 256, actualSize);
+  ::GetWindowText(mWnd, label, actualSize);
+  aBuffer.SetLength(0);
+  aBuffer.Append(label);
+  NS_FREE_CHAR_BUF(label);
+#endif
+printf("nsDialog::SetLabel not implemented\n");
+  return NS_OK;
+}
+
+
+
+//-------------------------------------------------------------------------
+//
+// Query interface implementation
+//
+//-------------------------------------------------------------------------
+nsresult nsDialog::QueryInterface(const nsIID& aIID, void** aInstancePtr)
+{
+  nsresult result = nsWindow::QueryInterface(aIID, aInstancePtr);
+
+  static NS_DEFINE_IID(kInsDialogIID, NS_IDIALOG_IID);
+  if (result == NS_NOINTERFACE && aIID.Equals(kInsDialogIID)) {
+      *aInstancePtr = (void*) ((nsIDialog*)this);
+      NS_ADDREF_THIS();
+      result = NS_OK;
+  }
+
+  return result;
+}
+
+
+//-------------------------------------------------------------------------
+//
+// move, paint, resizes message - ignore
+//
+//-------------------------------------------------------------------------
+PRBool nsDialog::OnMove(PRInt32, PRInt32)
+{
+  return PR_FALSE;
+}
+
+PRBool nsDialog::OnPaint(nsRect &r)
+{
+  return nsWindow::OnPaint(r);
+}
+
+PRBool nsDialog::OnResize(nsRect &aWindowRect)
+{
+  return nsWindow::OnResize(aWindowRect);
+}
+
+//-------------------------------------------------------------------------
+//
+// get position/dimensions
+//
+//-------------------------------------------------------------------------
+
+NS_METHOD nsDialog::GetBounds(nsRect &aRect)
+{
+  return nsWindow::GetBounds(aRect);
+}
+

mozilla/widget/src/beos/nsDragService.cpp

@@ -0,0 +1,230 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsDragService.h"
+#include "nsITransferable.h"
+#include "nsIServiceManager.h"
+
+#include "nsWidgetsCID.h"
+
+static NS_DEFINE_IID(kIDragServiceIID,   NS_IDRAGSERVICE_IID);
+static NS_DEFINE_CID(kCDragServiceCID,   NS_DRAGSERVICE_CID);
+
+// The class statics:
+BView *nsDragService::sView = 0;
+
+NS_IMPL_ADDREF_INHERITED(nsDragService, nsBaseDragService)
+NS_IMPL_RELEASE_INHERITED(nsDragService, nsBaseDragService)
+
+//-------------------------------------------------------------------------
+// static variables
+//-------------------------------------------------------------------------
+  //static PRBool gHaveDrag = PR_FALSE;
+
+//-------------------------------------------------------------------------
+//
+// DragService constructor
+//
+//-------------------------------------------------------------------------
+nsDragService::nsDragService()
+{
+  NS_INIT_REFCNT();
+}
+
+//-------------------------------------------------------------------------
+//
+// DragService destructor
+//
+//-------------------------------------------------------------------------
+nsDragService::~nsDragService()
+{
+}
+
+/**
+ * @param aIID The name of the class implementing the method
+ * @param _classiiddef The name of the #define symbol that defines the IID
+ * for the class (e.g. NS_ISUPPORTS_IID)
+ * 
+*/ 
+nsresult nsDragService::QueryInterface(const nsIID& aIID, void** aInstancePtr)
+{
+
+  if (NULL == aInstancePtr) {
+    return NS_ERROR_NULL_POINTER;
+  }
+
+  nsresult rv = NS_NOINTERFACE;
+
+  if (aIID.Equals(nsIDragService::GetIID())) {
+    *aInstancePtr = (void*) ((nsIDragService*)this);
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+
+  return rv;
+}
+
+//---------------------------------------------------------
+NS_IMETHODIMP nsDragService::StartDragSession (nsITransferable * aTransferable, PRUint32 aActionType)
+
+{
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_IMETHODIMP nsDragService::GetData (nsITransferable * aTransferable,
+                                        PRUint32 aItemIndex)
+{
+  return NS_ERROR_FAILURE;
+}
+
+//-------------------------------------------------------------------------
+void nsDragService::SetTopLevelView(BView *v)
+{
+  printf("  nsDragService::SetTopLevelWidget\n");
+  
+  // Don't set up any more event handlers if we're being called twice
+  // for the same toplevel widget
+  if (sView == v)
+    return;
+
+  sView = v;
+
+  // Get the DragService from the service manager.
+  nsresult rv;
+  NS_WITH_SERVICE(nsIDragService, dragService, kCDragServiceCID, &rv);
+
+  if (NS_FAILED(rv)) {
+    return;
+  }
+
+#if 0
+  gtk_signal_connect (GTK_OBJECT (pixmap), "drag_leave",
+		      GTK_SIGNAL_FUNC (nsDragService::DragLeave), dragService);
+
+  gtk_signal_connect (GTK_OBJECT (pixmap), "drag_motion",
+		      GTK_SIGNAL_FUNC (nsDragService::DragMotion), dragService);
+
+  gtk_signal_connect (GTK_OBJECT (pixmap), "drag_drop",
+		      GTK_SIGNAL_FUNC (nsDragService::DragDrop), dragService);
+
+  gtk_signal_connect (GTK_OBJECT (pixmap), "drag_data_received",
+		      GTK_SIGNAL_FUNC (nsDragService::DragDataReceived), dragService);
+#endif
+
+}
+
+//-------------------------------------------------------------------------
+//void  
+//nsDragService::DragLeave (GtkWidget	       *widget,
+//			                    GdkDragContext   *context,
+//			                    guint             time)
+//{
+//  g_print("leave\n");
+//  //gHaveDrag = PR_FALSE;
+//}
+//
+////-------------------------------------------------------------------------
+//PRBool
+//nsDragService::DragMotion(GtkWidget	       *widget,
+//			                    GdkDragContext   *context,
+//			                    gint              x,
+//			                    gint              y,
+//			                    guint             time)
+//{
+//  g_print("drag motion\n");
+//  GtkWidget *source_widget;
+//
+//#if 0
+//  if (!gHaveDrag) {
+//      gHaveDrag = PR_TRUE;
+//  }
+//#endif
+//
+//  source_widget = gtk_drag_get_source_widget (context);
+//  g_print("motion, source %s\n", source_widget ?
+//	          gtk_type_name (GTK_OBJECT (source_widget)->klass->type) :
+//	          "unknown");
+//
+//  gdk_drag_status (context, context->suggested_action, time);
+//  
+//  return PR_TRUE;
+//}
+//
+////-------------------------------------------------------------------------
+//PRBool
+//nsDragService::DragDrop(GtkWidget	       *widget,
+//			                  GdkDragContext   *context,
+//			                  gint              x,
+//			                  gint              y,
+//			                  guint             time)
+//{
+//  g_print("drop\n");
+//  //gHaveDrag = PR_FALSE;
+//
+//  if (context->targets){
+//    gtk_drag_get_data (widget, context, 
+//			                 GPOINTER_TO_INT (context->targets->data), 
+//			                 time);
+//    return PR_TRUE;
+//  }
+//  
+//  return PR_FALSE;
+//}
+//
+////-------------------------------------------------------------------------
+//void  
+//nsDragService::DragDataReceived  (GtkWidget          *widget,
+//			                            GdkDragContext     *context,
+//			                            gint                x,
+//			                            gint                y,
+//			                            GtkSelectionData   *data,
+//			                            guint               info,
+//			                            guint               time)
+//{
+//  if ((data->length >= 0) && (data->format == 8)) {
+//    g_print ("Received \"%s\"\n", (gchar *)data->data);
+//    gtk_drag_finish (context, PR_TRUE, PR_FALSE, time);
+//    return;
+//  }
+//  
+//  gtk_drag_finish (context, PR_FALSE, PR_FALSE, time);
+//}
+//  
+////-------------------------------------------------------------------------
+//void  
+//nsDragService::DragDataGet(GtkWidget          *widget,
+//		                       GdkDragContext     *context,
+//		                       GtkSelectionData   *selection_data,
+//		                       guint               info,
+//		                       guint               time,
+//		                       gpointer            data)
+//{
+//  gtk_selection_data_set (selection_data,
+//                          selection_data->target,
+//                          8, (guchar *)"I'm Data!", 9);
+//}
+//
+////-------------------------------------------------------------------------
+//void  
+//nsDragService::DragDataDelete(GtkWidget          *widget,
+//			                        GdkDragContext     *context,
+//			                        gpointer            data)
+//{
+//  g_print ("Delete the data!\n");
+//}

mozilla/widget/src/beos/nsDragService.h

@@ -0,0 +1,91 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsDragService_h__
+#define nsDragService_h__
+
+#include "nsBaseDragService.h"
+#include <View.h>
+
+
+/**
+ * Native BeOS DragService wrapper
+ */
+
+class nsDragService : public nsBaseDragService
+{
+
+public:
+  nsDragService();
+  virtual ~nsDragService();
+
+  //nsISupports
+  NS_DECL_ISUPPORTS_INHERITED
+  
+  
+  //nsIDragService
+  NS_IMETHOD StartDragSession (nsITransferable * aTransferable, 
+                               PRUint32 aActionType);
+
+  // Native Impl.
+  NS_IMETHOD GetData (nsITransferable * aTransferable, PRUint32 aItemIndex);
+
+  static void SetTopLevelView(BView *v);
+
+  static BView  *sView;
+
+protected:
+  static PRBool gHaveDrag;
+
+//  static void DragLeave(GtkWidget      *widget,
+//                        GdkDragContext *context,
+//                        guint           time);
+//
+//  static PRBool DragMotion(GtkWidget      *widget,
+//                           GdkDragContext *context,
+//                           gint            x,
+//                           gint            y,
+//                           guint           time);
+//
+//  static PRBool DragDrop(GtkWidget   *widget,
+//                         GdkDragContext *context,
+//                         gint            x,
+//                         gint            y,
+//                         guint            time);
+//
+//  static void DragDataReceived(GtkWidget        *widget,
+//			                         GdkDragContext   *context,
+//			                         gint              x,
+//			                         gint              y,
+//			                         GtkSelectionData *data,
+//			                         guint             info,
+//			                         guint             time);
+//
+//  static void DragDataGet(GtkWidget          *widget,
+//		                      GdkDragContext     *context,
+//		                      GtkSelectionData   *selection_data,
+//		                      guint               info,
+//		                      guint               time,
+//		                      gpointer            data);
+//
+//  static void  DragDataDelete(GtkWidget          *widget,
+//			                        GdkDragContext     *context,
+//			                        gpointer            data);
+};
+
+#endif // nsDragService_h__

mozilla/widget/src/beos/nsDropTarget.cpp

@@ -0,0 +1,251 @@
+/* -*- Mode: c++; tab-width: 2; indent-tabs-mode: nil; -*- 
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+//#include "stdafx.h"
+//#include "olebase.h"
+//#include "idropsrc.h"
+#include "nsDropTarget.h"
+//#include "contndoc.h"
+#include "stdio.h"
+#include "nsIWidget.h"
+
+#include "nsWindow.h"
+//Don't forget to RegisterDragDrop and to 
+//CoLockObjectExternal.
+//You must RevokeDragDrop before destroying this object
+//
+nsDropTarget::nsDropTarget(nsIWidget  * aWindow)
+{
+  printf("nsDropTarget::nsDropTarget\n");
+    m_refs        = 0;
+    m_pWin = aWindow; 
+    NS_ADDREF(aWindow);
+}
+
+//Destructor for nsDropTarget
+//Doesn't do a whole lot!
+//
+nsDropTarget::~nsDropTarget()
+{
+  printf("nsDropTarget::Drop\n");
+    ;    
+}
+
+//QueryInterface for IDropTarget
+//Notice that this QueryInterface does not refer to another object's QueryInterface,
+//this is a totally stand-alone separate object
+//
+STDMETHODIMP nsDropTarget::QueryInterface(REFIID riid, LPVOID FAR* ppv)
+{
+  printf("nsDropTarget::QueryInterface\n");
+    if (riid == IID_IUnknown)
+        *ppv = this;                     
+    else if (riid == IID_IDropTarget)
+     *ppv = this;
+    else{ 
+        *ppv = NULL;
+         }
+    if (*ppv != NULL){
+     ((LPUNKNOWN)(*ppv))->AddRef();
+     return NOERROR;
+    }
+
+//If for some reason our constructor did not create the requested interface
+//don't pass the NULL interface without telling the caller that we don't support
+//the requested interface.
+   return ResultFromScode(E_NOINTERFACE);    
+}
+
+//A private AddRef for IDropTarget
+//
+STDMETHODIMP_(ULONG) nsDropTarget::AddRef(void)
+{
+  printf("nsDropTarget::AddRef\n");
+	return ++m_refs;
+}
+
+//A private Release for IDropTarget
+//
+STDMETHODIMP_(ULONG) nsDropTarget::Release(void)
+{
+  printf("nsDropTarget::Release\n");
+   if(--m_refs == 0){
+   //And now we can delete this object 
+    delete this;
+   }
+
+   return m_refs;
+}
+
+//
+//This helper function tells us what the drag/drop effect would be at
+//the point pointl.  Since our object accepts being a drop target anywhere
+//in the window, we will ignore pointl
+//
+DWORD   nsDropTarget::FindDragDropEffect(DWORD grfKeyState, POINTL /* pointl */)
+{
+  printf("nsDropTarget::FindDragDropEffect\n");
+    DWORD   dwRet;
+    
+	//          no modifier -- DROPEFFECT_MOVE or source default
+	//          SHIFT       -- DROPEFFECT_MOVE
+	//          CTRL        -- DROPEFFECT_COPY
+	//          CTRL-SHIFT  -- DROPEFFECT_LINK
+
+	dwRet = 0;//OleStdGetDropEffect(grfKeyState);
+    if (dwRet == 0)
+        dwRet = DROPEFFECT_COPY;
+    
+    return dwRet;    
+}
+
+
+//Notification that a DropSource is over the current DropTarget
+//
+STDMETHODIMP nsDropTarget::DragEnter (LPDATAOBJECT pDataObj, 
+                                      DWORD grfKeyState, 
+                                      POINTL pointl, 
+                                      LPDWORD pdwEffect)
+{
+  printf("nsDropTarget::DragEnter\n");
+    *pdwEffect = FindDragDropEffect(grfKeyState, pointl);
+    return NOERROR;
+}
+
+//Provides user feedback when a DropSource is over a DropTarget
+//
+STDMETHODIMP nsDropTarget::DragOver  (DWORD grfKeyState, 
+                                      POINTL pointl, 
+                                      LPDWORD pdwEffect)
+{
+  printf("nsDropTarget::DragOver\n");
+    *pdwEffect = FindDragDropEffect(grfKeyState, pointl);
+    return NOERROR;
+}
+
+
+//The DropSource is leaving our target window
+//so its cleanup time!!!
+//
+STDMETHODIMP nsDropTarget::DragLeave (void)
+{
+  printf("nsDropTarget::DragLeave\n");
+    return NOERROR;
+}
+
+//Drops the DropSource
+//
+STDMETHODIMP nsDropTarget::Drop (LPDATAOBJECT pIDataObject, 
+                                 DWORD grfKeyState, 
+                                 POINTL pointl, 
+                                 LPDWORD pdwEffect)
+{
+  printf("nsDropTarget::Drop\n");
+  printf("pIDataObject 0x%x\n", pIDataObject);
+    pIDataObject->AddRef();
+    if (nsnull != m_pWin) {
+      nsEventStatus status;
+      nsDragDropEvent event;
+      ((nsWindow *)m_pWin)->InitEvent(event, NS_DRAGDROP_EVENT);
+      event.mType      = nsDragDropEventStatus_eDrop;
+      event.mIsFileURL = PR_FALSE;
+      event.mURL       = nsnull;           
+      m_pWin->DispatchEvent(&event, status);
+    }
+
+   //pdwEffect = FindDragDropEffect(grfKeyState, pointl);
+
+
+   if (pIDataObject != NULL) {
+     IDataObject * presistStorage;
+     //printf("QueryInterface for persist\n");
+     pIDataObject->QueryInterface(IID_IDataObject,(LPVOID *)&presistStorage);
+     //printf("Done QueryInterface for persist\n");
+     if (presistStorage != NULL) {
+       printf("$$$$$$$$$$$$$$$ Got it!\n");
+       FORMATETC pFE;
+       presistStorage->QueryGetData(&pFE);
+
+       pFE.tymed = TYMED_FILE;
+
+       STGMEDIUM pSTM;
+       HRESULT st = presistStorage->GetDataHere(&pFE, &pSTM);
+          printf("st 0x%X\n", st);
+	        if (NOERROR != st) {
+		        return FALSE;
+	        }
+//TYMED_STORAGE, TYMED_STREAM, TYMED_HGLOBAL, or TYMED_FILE
+       //printf("%s\n", pSTM.lpszFileName);
+       {
+
+	        //HRESULT hr = pIDataObject->GetData(&pFE, &pSTM);
+          //printf("hr 0x%X\n", hr);
+	        //if (NOERROR != hr) {
+		      //  return FALSE;
+	        //}
+
+	        const CLIPFORMAT format = pFE.cfFormat;
+	        switch(format) {
+		        case CF_BITMAP:
+			        //hr = SetBitmap(*pFE, stm);
+			        break;
+		        case CF_DIB:
+			        //hr = SetDib(*pFE, stm);
+			        break;
+		        case CF_TEXT:
+			        //hr = SetText(*pFE, stm);
+			        break;
+		        case CF_METAFILEPICT:
+			        //hr = SetMetafilePict(*pFE, stm);
+			        break;
+		        default:
+			        //if (format == GetRcfFormat()) {
+				      //  hr = SetRcf(*pFE, stm);
+			        //}
+			        break;
+	        }
+
+	        //return (SUCCEEDED(hr));
+
+       }
+
+
+     } else {
+       printf("^^^^^^^^^^^^^^^^^ Didn't!\n");
+     }
+   }
+
+
+/*    if (m_pContainDoc->m_pOleSiteObject)
+        delete m_pContainDoc->m_pOleSiteObject;
+    m_pContainDoc->m_pOleSiteObject = new COleSiteObject(m_pContainDoc);
+	FORMATETC fmtetc;
+	fmtetc.cfFormat = NULL;            
+	fmtetc.ptd = NULL;
+	fmtetc.lindex = -1;
+	fmtetc.dwAspect = DVASPECT_CONTENT; 
+    fmtetc.tymed = TYMED_NULL;
+    m_pContainDoc->m_pOleSiteObject->AddSiteFromData(m_pContainDoc,
+                                                     pIDataObject,
+                                                     &fmtetc); 
+*/
+    pIDataObject->Release();
+    
+    DragLeave();
+
+    return NOERROR;
+}

mozilla/widget/src/beos/nsFileWidget.cpp

@@ -0,0 +1,277 @@
+/* -*- Mode: c++; tab-width: 2; indent-tabs-mode: nil; -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+// Define so header files for openfilename are included
+#ifdef WIN32_LEAN_AND_MEAN
+#undef WIN32_LEAN_AND_MEAN
+#endif
+
+#include "nsFileWidget.h"
+
+//NS_IMPL_ISUPPORTS(nsFileWidget, NS_IFILEWIDGET_IID)
+NS_DEFINE_IID(kIFileWidgetIID, NS_IFILEWIDGET_IID);
+NS_IMPL_ISUPPORTS(nsFileWidget, kIFileWidgetIID);
+
+//-------------------------------------------------------------------------
+//
+// nsFileWidget constructor
+//
+//-------------------------------------------------------------------------
+nsFileWidget::nsFileWidget() : nsIFileWidget()
+{
+  NS_INIT_REFCNT();
+//  mWnd = NULL;
+  mNumberOfFilters = 0;
+}
+
+//-------------------------------------------------------------------------
+//
+// Show - Display the file dialog
+//
+//-------------------------------------------------------------------------
+
+PRBool nsFileWidget::Show()
+{
+printf("nsFileWidget::Show not implemented\n");
+#if 0
+  char fileBuffer[MAX_PATH+1] = "";
+  mDefault.ToCString(fileBuffer,MAX_PATH);
+
+  OPENFILENAME ofn;
+  memset(&ofn, 0, sizeof(ofn));
+
+  ofn.lStructSize = sizeof(ofn);
+
+  nsString filterList;
+  GetFilterListArray(filterList);
+  char *filterBuffer = filterList.ToNewCString();
+  char *title = mTitle.ToNewCString();
+  char *initialDir = mDisplayDirectory.ToNewCString();
+  if (mDisplayDirectory.Length() > 0) {
+     ofn.lpstrInitialDir = initialDir;
+  }
+
+  ofn.lpstrTitle = title;
+  ofn.lpstrFilter = filterBuffer;
+  ofn.nFilterIndex = 1;
+  ofn.hwndOwner = mWnd;
+  ofn.lpstrFile = fileBuffer;
+  ofn.nMaxFile = MAX_PATH;
+  ofn.Flags = OFN_SHAREAWARE | OFN_LONGNAMES | OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY;
+  
+  PRBool result;
+
+    // Save current directory, so we can reset if it changes.
+  char* currentDirectory = new char[MAX_PATH+1];
+  VERIFY(::GetCurrentDirectory(MAX_PATH, currentDirectory) > 0);
+
+  if (mMode == eMode_load) {
+    result = GetOpenFileName(&ofn);
+  }
+  else if (mMode == eMode_save) {
+    result = GetSaveFileName(&ofn);
+  }
+  else {
+    NS_ASSERTION(0, "Only load and save are supported modes"); 
+  }
+
+   // Store the current directory in mDisplayDirectory
+  char* newCurrentDirectory = new char[MAX_PATH+1];
+  VERIFY(::GetCurrentDirectory(MAX_PATH, newCurrentDirectory) > 0);
+  mDisplayDirectory.SetLength(0);
+  mDisplayDirectory.Append(newCurrentDirectory);
+  delete newCurrentDirectory;
+
+
+  VERIFY(::SetCurrentDirectory(currentDirectory));
+  delete currentDirectory;
+  
+   // Clean up filter buffers
+  delete filterBuffer;
+  delete title;
+  delete initialDir;
+
+   // Set user-selected location of file or directory
+  mFile.SetLength(0);
+  if (result == PR_TRUE) {
+    mFile.Append(fileBuffer);
+  }
+  
+  return((PRBool)result);
+#endif
+	return PR_TRUE;
+}
+
+//-------------------------------------------------------------------------
+//
+// Convert filter titles + filters into a Windows filter string
+//
+//-------------------------------------------------------------------------
+
+void nsFileWidget::GetFilterListArray(nsString& aFilterList)
+{
+  aFilterList.SetLength(0);
+  for (PRUint32 i = 0; i < mNumberOfFilters; i++) {
+    const nsString& title = mTitles[i];
+    const nsString& filter = mFilters[i];
+    
+    aFilterList.Append(title);
+    aFilterList.Append('\0');
+    aFilterList.Append(filter);
+    aFilterList.Append('\0');
+  }
+  aFilterList.Append('\0'); 
+}
+
+//-------------------------------------------------------------------------
+//
+// Set the list of filters
+//
+//-------------------------------------------------------------------------
+
+NS_METHOD nsFileWidget::SetFilterList(PRUint32 aNumberOfFilters,const nsString aTitles[],const nsString aFilters[])
+{
+  mNumberOfFilters  = aNumberOfFilters;
+  mTitles           = aTitles;
+  mFilters          = aFilters;
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+// Get the file + path
+//
+//-------------------------------------------------------------------------
+
+NS_METHOD  nsFileWidget::GetFile(nsFileSpec& aFile)
+{
+  aFile = mFile;
+  return NS_OK;
+}
+
+
+//-------------------------------------------------------------------------
+//
+// Get the file + path
+//
+//-------------------------------------------------------------------------
+NS_METHOD  nsFileWidget::SetDefaultString(const nsString& aString)
+{
+  mDefault = aString;
+  return NS_OK;
+}
+
+
+//-------------------------------------------------------------------------
+//
+// Set the display directory
+//
+//-------------------------------------------------------------------------
+NS_METHOD  nsFileWidget::SetDisplayDirectory(const nsFileSpec& aDirectory)
+{
+  mDisplayDirectory = aDirectory;
+  return NS_OK;
+}
+
+
+//-------------------------------------------------------------------------
+//
+// Get the display directory
+//
+//-------------------------------------------------------------------------
+NS_METHOD  nsFileWidget::GetDisplayDirectory(nsFileSpec& aDirectory)
+{
+  aDirectory = mDisplayDirectory;
+  return NS_OK;
+}
+
+
+//-------------------------------------------------------------------------
+NS_METHOD nsFileWidget::Create(nsIWidget *aParent,
+                       const nsString& aTitle,
+                       nsFileDlgMode aMode,
+                       nsIDeviceContext *aContext = nsnull,
+                       nsIAppShell *aAppShell = nsnull,
+                       nsIToolkit *aToolkit = nsnull,
+                       void *aInitData = nsnull)
+{
+//  mWnd = (HWND) ((aParent) ? aParent->GetNativeData(NS_NATIVE_WINDOW) : 0); 
+  mTitle.SetLength(0);
+  mTitle.Append(aTitle);
+  mMode = aMode;
+  return NS_OK;
+}
+
+
+//-------------------------------------------------------------------------
+//
+// nsFileWidget destructor
+//
+//-------------------------------------------------------------------------
+nsFileWidget::~nsFileWidget()
+{
+}
+
+
+nsFileDlgResults nsFileWidget::GetFile(nsIWidget *aParent,
+                                       const nsString &promptString,
+                                       nsFileSpec &theFileSpec)
+{
+	Create(aParent, promptString, eMode_load, nsnull, nsnull);
+	if (Show() == PR_TRUE)
+	{
+		GetFile(theFileSpec);
+		return nsFileDlgResults_OK;
+	}
+
+  return nsFileDlgResults_Cancel;
+}
+
+nsFileDlgResults nsFileWidget::GetFolder(nsIWidget *aParent,
+                                         const nsString &promptString,
+                                         nsFileSpec &theFileSpec)
+{
+	Create(aParent, promptString, eMode_getfolder, nsnull, nsnull);
+	if (Show() == PR_TRUE)
+	{
+		GetFile(theFileSpec);
+		return nsFileDlgResults_OK;
+	}
+
+  return nsFileDlgResults_Cancel;
+}
+
+nsFileDlgResults nsFileWidget::PutFile(nsIWidget *aParent,
+                                       const nsString &promptString,
+                                       nsFileSpec &theFileSpec)
+{ 
+	Create(aParent, promptString, eMode_save, nsnull, nsnull);
+	if (Show() == PR_TRUE)
+	{
+		GetFile(theFileSpec);
+		return nsFileDlgResults_OK;
+	}
+  return nsFileDlgResults_Cancel; 
+}
+
+NS_METHOD  nsFileWidget::GetSelectedType(PRInt16& theType)
+{
+  theType = mSelectedType;
+  return NS_OK;
+}
+

mozilla/widget/src/beos/nsFileWidget.h

@@ -0,0 +1,94 @@
+/* -*- Mode: c++; tab-width: 2; indent-tabs-mode: nil; -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsFileWidget_h__
+#define nsFileWidget_h__
+
+#include "nsObject.h"
+#include "nsToolkit.h"
+#include "nsIWidget.h"
+#include "nsIFileWidget.h"
+
+/**
+ * Native Win32 FileSelector wrapper
+ */
+
+class nsFileWidget : public nsIFileWidget 
+{
+  public:
+                            nsFileWidget(); 
+    virtual                 ~nsFileWidget();
+
+    NS_DECL_ISUPPORTS
+
+    PRBool                  OnPaint(nsRect &r);
+
+    // nsIWidget interface
+  
+  NS_IMETHOD		Create(nsIWidget *aParent,
+                       const nsString& aTitle,
+                       nsFileDlgMode aMode,
+                       nsIDeviceContext *aContext = nsnull,
+                       nsIAppShell *aAppShell = nsnull,
+                       nsIToolkit *aToolkit = nsnull,
+                       void *aInitData = nsnull);
+
+  // nsIFileWidget part
+  virtual PRBool	Show();
+  NS_IMETHOD GetFile(nsFileSpec& aFile);
+  NS_IMETHOD SetDefaultString(const nsString& aFile);
+  NS_IMETHOD SetFilterList(PRUint32 aNumberOfFilters,
+                           const nsString aTitles[],
+                           const nsString aFilters[]);
+
+  NS_IMETHOD GetDisplayDirectory(nsFileSpec& aDirectory);
+  NS_IMETHOD SetDisplayDirectory(const nsFileSpec& aDirectory);
+  
+  virtual nsFileDlgResults GetFile(nsIWidget *aParent,
+                                   const nsString &promptString,
+                                   nsFileSpec &theFileSpec);
+  
+  virtual nsFileDlgResults GetFolder(nsIWidget *aParent,
+                                     const nsString &promptString,
+                                     nsFileSpec &theFileSpec);
+
+  virtual nsFileDlgResults PutFile(nsIWidget *aParent,
+                                   const nsString &promptString,
+                                   nsFileSpec &theFileSpec);
+
+
+  NS_IMETHOD            GetSelectedType(PRInt16& theType);
+
+  protected:
+
+//     HWND                   mWnd;
+     nsString               mTitle;
+     nsFileDlgMode          mMode;
+     nsString               mFile;
+     PRUint32               mNumberOfFilters;  
+     const nsString*        mTitles;
+     const nsString*        mFilters;
+     nsString               mDefault;
+  nsFileSpec    mDisplayDirectory;
+  PRInt16       mSelectedType;
+
+
+     void GetFilterListArray(nsString& aFilterList);
+};
+
+#endif // nsFileWidget_h__

mozilla/widget/src/beos/nsFontRetrieverService.cpp

@@ -0,0 +1,418 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsFontRetrieverService.h"
+#include "nsIWidget.h"
+#include <ctype.h>
+ 
+#include "nsFont.h"
+#include "nsVoidArray.h"
+#include "nsFontSizeIterator.h"
+ 
+NS_IMPL_ADDREF(nsFontRetrieverService)
+NS_IMPL_RELEASE(nsFontRetrieverService)
+
+
+//----------------------------------------------------------
+nsFontRetrieverService::nsFontRetrieverService()
+{
+  NS_INIT_REFCNT();
+
+  mFontList     = nsnull;
+  mSizeIter     = nsnull;
+  mNameIterInx  = 0;
+
+}
+
+//----------------------------------------------------------
+nsFontRetrieverService::~nsFontRetrieverService()
+{
+  if (nsnull != mFontList) {
+    for (PRInt32 i=0;i<mFontList->Count();i++) {
+      FontInfo * font = (FontInfo *)mFontList->ElementAt(i);
+      if (font->mSizes) {
+        delete font->mSizes;
+      }
+      delete font;
+    }
+    delete mFontList;
+  }
+  NS_IF_RELEASE(mSizeIter);
+}
+
+/**
+ * @param aIID The name of the class implementing the method
+ * @param _classiiddef The name of the #define symbol that defines the IID
+ * for the class (e.g. NS_ISUPPORTS_IID)
+ * 
+*/ 
+nsresult nsFontRetrieverService::QueryInterface(const nsIID& aIID, void** aInstancePtr)
+{
+
+  if (NULL == aInstancePtr) {
+    return NS_ERROR_NULL_POINTER;
+  }
+
+  nsresult rv = NS_NOINTERFACE;
+
+  if (aIID.Equals(nsIFontRetrieverService::GetIID())) {
+    *aInstancePtr = (void*) ((nsIFontRetrieverService*)this);
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+
+  if (aIID.Equals(nsIFontNameIterator::GetIID())) {
+    *aInstancePtr = (void*) ((nsIFontNameIterator*)this);
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+
+  return rv;
+}
+
+
+//----------------------------------------------------------
+//-- nsIFontRetrieverService
+//----------------------------------------------------------
+NS_IMETHODIMP nsFontRetrieverService::CreateFontNameIterator( nsIFontNameIterator** aIterator )
+{
+  if (nsnull == aIterator) {
+    return NS_ERROR_FAILURE;
+  }
+
+  if (nsnull == mFontList) {
+    LoadFontList();
+  }
+  *aIterator = this;
+  NS_ADDREF_THIS();
+  return NS_OK;
+}
+
+//----------------------------------------------------------
+NS_IMETHODIMP nsFontRetrieverService::CreateFontSizeIterator( const nsString & aFontName, 
+                                                              nsIFontSizeIterator** aIterator )
+{
+  // save value in case someone externally is using it
+  PRInt32 saveIterInx = mNameIterInx;
+
+  PRBool found = PR_FALSE;
+  Reset();
+  do {
+    nsAutoString name;
+    Get(&name);
+    if (name.Equals(aFontName)) {
+      found = PR_TRUE;
+      break;
+    }
+  } while (Advance() == NS_OK);
+
+  if (found) {
+    if (nsnull == mSizeIter) {
+      mSizeIter = new nsFontSizeIterator();
+    }
+    NS_ASSERTION( nsnull != mSizeIter, "nsFontSizeIterator instance pointer is null");
+
+    *aIterator = (nsIFontSizeIterator *)mSizeIter;
+    NS_ADDREF(mSizeIter);
+
+    FontInfo * fontInfo = (FontInfo *)mFontList->ElementAt(mNameIterInx);
+    mSizeIter->SetFontInfo(fontInfo);
+    mNameIterInx = saveIterInx;
+    return NS_OK;
+  }
+  mNameIterInx = saveIterInx;
+  return NS_ERROR_FAILURE;
+}
+
+//----------------------------------------------------------
+//-- nsIFontNameIterator
+//----------------------------------------------------------
+NS_IMETHODIMP nsFontRetrieverService::Reset()
+{
+  mNameIterInx = 0;
+  return NS_OK;
+}
+
+//----------------------------------------------------------
+NS_IMETHODIMP nsFontRetrieverService::Get( nsString* aFontName )
+{
+  if (mNameIterInx < mFontList->Count()) {
+    FontInfo * fontInfo = (FontInfo *)mFontList->ElementAt(mNameIterInx);
+    *aFontName = fontInfo->mName;
+    return NS_OK;
+  }
+  return NS_ERROR_FAILURE;
+}
+
+//----------------------------------------------------------
+NS_IMETHODIMP nsFontRetrieverService::Advance()
+{
+  if (mNameIterInx < mFontList->Count()-1) {
+    mNameIterInx++;
+    return NS_OK;
+  }
+  return NS_ERROR_FAILURE;
+}
+
+//------------------------------
+static FontInfo * GetFontInfo(nsVoidArray * aFontList, char * aName)
+{
+  nsAutoString name(aName);
+  PRInt32 i;
+  PRInt32 cnt = aFontList->Count();
+  for (i=0;i<cnt;i++) {
+    FontInfo * fontInfo = (FontInfo *)aFontList->ElementAt(i);
+    if (fontInfo->mName.Equals(name)) {
+      return fontInfo;
+    }
+  }
+
+  FontInfo * fontInfo   = new FontInfo();
+  fontInfo->mName       = aName;
+  //printf("Adding [%s]\n", aName);fflush(stdout); 
+  fontInfo->mIsScalable = PR_FALSE; // X fonts aren't scalable right??
+  fontInfo->mSizes      = nsnull;
+  aFontList->AppendElement(fontInfo);
+  return fontInfo;
+}
+
+//------------------------------
+static void AddSizeToFontInfo(FontInfo * aFontInfo, PRInt32 aSize)
+{
+  nsVoidArray * sizes;
+  if (nsnull == aFontInfo->mSizes) {
+    sizes = new nsVoidArray();
+    aFontInfo->mSizes = sizes;
+  } else {
+    sizes = aFontInfo->mSizes;
+  }
+  PRInt32 i;
+  PRInt32 cnt = sizes->Count();
+  for (i=0;i<cnt;i++) {
+    PRInt32 size = (int)sizes->ElementAt(i);
+    if (size == aSize) {
+      return;
+    }
+  }
+  sizes->AppendElement((void *)aSize);
+}
+
+//---------------------------------------------------
+// XXX - Hack - Parts of this will need to be reworked
+//
+// This method does brute force parcing for 4 different formats:
+//
+// 1) The format -*-*-*-*-*-* etc.
+//    -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-8
+//
+// 2) Name-size format 
+//    lucidasans-10
+//
+// 3) Name-style-size
+//    lucidasans-bold-10
+//
+// 4) Name only (implicit size)
+//    6x13
+//
+//--------------------------------------------------
+NS_IMETHODIMP nsFontRetrieverService::LoadFontList()
+{
+//  char    * pattern = "*";
+//  int nnames = 1024;
+//
+//  int available = nnames+1;
+//  int i;
+//  char **fonts;
+//  XFontStruct *info;
+//
+//  if (nsnull == mFontList) { 
+//    mFontList = new nsVoidArray(); 
+//    if (nsnull == mFontList) { 
+//      return NS_ERROR_FAILURE; 
+//    } 
+//  } 
+//
+//  /* Get list of fonts matching pattern */
+//  for (;;) {
+//    // the following line is VERY slow to return
+//    fonts = XListFontsWithInfo(GDK_DISPLAY(), pattern, nnames, 
+//                               &available, &info);
+//    if (fonts == NULL || available < nnames)
+//      break;
+//
+//    XFreeFontInfo(fonts, info, available);
+//    nnames = available * 2;
+//  }
+//
+//  if (fonts == NULL) {
+//    fprintf(stderr, "pattern \"%s\" unmatched\n", pattern);
+//    return NS_ERROR_FAILURE;
+//  }
+//
+//#if 0 // debug
+//  // print out all the retrieved fonts
+//  printf("-----------------------------\n");
+//  for (i=0; i<available; i++) {
+//    printf("[%s]i\n", fonts[i]);
+//  }
+//  printf("-----------------------------\n");
+//#endif
+//
+//  // this code assumes all like fonts are grouped together
+//  // currentName is the current name of the font we are gathering
+//  // sizes for, when the name changes we create a new FontInfo object
+//  // but it also takes into account fonts of similar names when it 
+//  // goes to add then and disregards duplicates
+//  char buffer[1024];
+//  char currentName[1024];
+//  FontInfo * font = nsnull;
+//
+//  currentName[0]  = 0;
+//  for (i=0; i<available; i++) {
+//
+//    // This is kind of lame, but it will have to do for now
+//    strcpy(buffer, fonts[i]);
+//
+//    // Start by checking to see if the name begins with a dash
+//    char * ptr  = buffer;
+//    if (buffer[0] == '-') { //Format #1
+//      
+//      PRInt32 cnt = 0;
+//      // skip first two '-'
+//      do {
+//        if (*ptr == '-') cnt++;
+//        ptr++;
+//      } while (cnt < 2);
+//      
+//      // find the dash at the end of the name
+//      char * end = strchr(ptr, '-');
+//      if (end) {
+//        *end = 0;
+//        
+//        // Check to see if we need to create a new FontInfo obj
+//        // and set the currentName var to this guys font name
+//        if (strcmp(currentName, ptr) || NULL == font) {
+//          font = GetFontInfo(mFontList, ptr);
+//          strcpy(currentName, ptr);
+//        }
+//        if (nsnull == font->mSizes) {
+//          font->mSizes = new nsVoidArray();
+//        }
+//        ptr = end+1; // skip past the dash that was set to zero
+//        
+//        cnt = 0;
+//        // now skip ahead 4 dashes
+//        do {
+//          if (*ptr == '-') cnt++;
+//          ptr++;
+//        } while (cnt < 4);
+//        
+//        // find the dash after the size
+//        end = strchr(ptr, '-');
+//        
+//        if (end) {
+//	  *end = 0;
+//          PRInt32 size;
+//          sscanf(ptr, "%d", &size);
+//	  AddSizeToFontInfo(font, size);
+//        }
+//      }
+//    } else { // formats 2,3,4
+//      
+//      // no leading dash means the start of the 
+//      // buffer is the start of the name
+//      // this checks for a dash at the end of the font name
+//      // which means there is a size at the end
+//      char * end = strchr(buffer, '-');
+//      if (end) { // Format 2,3
+//        *end = 0;
+//        // Check to see if we need to create a new FontInfo obj
+//        // and set the currentName var to this guys font name
+//        if (strcmp(currentName, buffer) || NULL == font) { 
+//          font = GetFontInfo(mFontList, buffer);
+//          strcpy(currentName, buffer);
+//        }
+//        end++; // advance past the dash
+//	// check to see if we have a number
+//	ptr = end;
+//	if (isalpha(*ptr)) {  // Format 3
+//	  // skip until next dash
+//	  end = strchr(ptr, '-');
+//	  if (end) {
+//            *end = 0;
+//	    ptr = end+1;
+//	  }
+//	}
+//        PRInt32 size;
+//        // yes, it has a dash at the end so it must have the size
+//        // check to see if the size is terminated by a dash
+//        // it shouldn't be
+//        char * end2 = strchr(ptr, '-');
+//        if (end2) *end2 = 0; // put terminator at the dash
+//        sscanf(end, "%d", &size);
+//	AddSizeToFontInfo(font, size);
+//
+//      } else { // Format #4
+//        // The font has an implicit size, 
+//        // so there is nothing to parse for size
+//        // so we can't really do much here
+//        // Check to see if we need to create a new FontInfo obj
+//        // and set the currentName var to this guys font name
+//        if (strcmp(currentName, buffer) || NULL == font) {
+//          font = GetFontInfo(mFontList, buffer);
+//          strcpy(currentName, buffer);
+//        }
+//      } 
+//    }
+//
+//  }
+//
+//  XFreeFontInfo(fonts, info, available);
+
+  return NS_OK;
+}
+
+
+//---------------------------------------------------------- 
+NS_IMETHODIMP nsFontRetrieverService::IsFontScalable(const nsString & aFontName,
+                                                     PRBool* aResult ) 
+{ 
+  // save value in case someone externally is using it
+  PRInt32 saveIterInx = mNameIterInx;
+   
+  PRBool found = PR_FALSE; 
+  Reset(); 
+  do { 
+    nsAutoString name; 
+    Get(&name); 
+    if (name.Equals(aFontName)) { 
+      found = PR_TRUE; 
+      break; 
+    } 
+  } while (Advance() == NS_OK); 
+
+  if (found) { 
+    FontInfo * fontInfo = (FontInfo *)mFontList->ElementAt(mNameIterInx); 
+    *aResult = fontInfo->mIsScalable; 
+    mNameIterInx = saveIterInx;
+    return NS_OK; 
+  } 
+
+  mNameIterInx = saveIterInx;
+  return NS_ERROR_FAILURE; 
+} 

mozilla/widget/src/beos/nsFontRetrieverService.h

@@ -0,0 +1,60 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef __nsFontRetrieverService
+#define __nsFontRetrieverService
+
+#include "nsIFontRetrieverService.h"
+#include "nsIFontNameIterator.h"
+
+class nsVoidArray;
+class nsFontSizeIterator;
+
+class nsFontRetrieverService: public nsIFontRetrieverService, 
+                              public nsIFontNameIterator {
+public:
+  nsFontRetrieverService();
+  virtual ~nsFontRetrieverService();
+
+  NS_DECL_ISUPPORTS
+
+  // nsIFontRetrieverService
+	NS_IMETHOD CreateFontNameIterator( nsIFontNameIterator** aIterator );
+
+	NS_IMETHOD CreateFontSizeIterator( const nsString & aFontName, nsIFontSizeIterator** aIterator );
+	NS_IMETHOD IsFontScalable( const nsString & aFontName, PRBool* aResult );
+
+  // nsIFontNameIterator
+
+	NS_IMETHOD Reset();
+	NS_IMETHOD Get( nsString* aFontName );
+	NS_IMETHOD Advance();
+
+
+
+protected:
+  NS_IMETHOD LoadFontList();
+
+  nsVoidArray * mFontList;
+
+  PRInt32 mNameIterInx;
+
+  nsFontSizeIterator * mSizeIter;
+};
+
+#endif