400605 - Remove remaining XP_MAC code from /xpfe

Status: RESOLVED WORKSFORME

(SeaMonkey :: General, defect)

Description

[Serge Gautherie (:sgautherie)]

Moving bug 281889 attachment 188836 [details] [diff] [review] to here:


*****


Serge Gautherie   2005-07-10 05:30:49 PDT
Comment #28

Created an attachment (id=188836) [details]
(Dv1a) <xpfe/*> (Updated/Moved from bug 281889)

I have no compiler: Could you compile/test/(super-)review/check in this patch ?

Thanks.

{{
Index: mozilla/xpfe/components/autocomplete/src/nsLDAPAutoCompleteSession.cpp
-// build system.  The MOZ_LDAP_XPCOM preprocessor symbol is only 
-// defined on Mac because noone else needs this weirdness; thus 
}}
I wonder if |MOZ_LDAP_XPCOM| could be removed too (other bug) then ?

{{ (from bug 196105)
 ------- Additional Comment #21 From Serge GAUTHERIE  2005-02-06 14:21 PDT 
[reply] -------

(In reply to comment #20)
> (From update of attachment 173538 [details] [diff] [review] [edit] [edit])
> Why is there no XP_MACOSX code in showOSAlert.cpp?

I would have no idea: I'm not a Mac user, and I assume that the current code
works as it is/was.
Should these XP_MAC be replaced by XP_MACOSX, instead of removed ?
Any hint are/will welcomed: "helpwanted".
}}


***


Simon Fraser   2005-07-20 13:48:03 PDT
Comment #29

(From update of attachment 188836 [details] [diff] [review])
Index: mozilla/xpfe/bootstrap/nsAppRunner.cpp
===================================================================
RCS file: /cvsroot/mozilla/xpfe/bootstrap/nsAppRunner.cpp,v
retrieving revision 1.441
diff -u -p -r1.441 nsAppRunner.cpp
--- mozilla/xpfe/bootstrap/nsAppRunner.cpp	30 Apr 2005 12:39:25 -0000     
1.441
+++ mozilla/xpfe/bootstrap/nsAppRunner.cpp	10 Jul 2005 11:42:18 -0000

 //	  nsISplashScreen will be removed.
 //

-#if !defined(XP_WIN) && !defined(XP_OS2)&& !defined( XP_BEOS ) &&
!defined(MOZ_WIDGET_GTK) && !defined(MOZ_WIDGET_GTK2) && !defined(XP_MAC) &&
(!defined(XP_MACOSX) || defined(MOZ_WIDGET_COCOA))
+#if !defined(XP_WIN) && !defined(XP_OS2) && !defined(XP_BEOS) &&
!defined(MOZ_WIDGET_GTK) && !defined(MOZ_WIDGET_GTK2) && (!defined(XP_MACOSX)
|| defined(MOZ_WIDGET_COCOA))

Can we turn this #ifdef around, and test for platforms that DO want this?

 nsresult NS_CreateNativeAppSupport(nsINativeAppSupport **aResult)
 {
@@ -395,10 +362,6 @@ static int TranslateReturnValue(nsresult
   return 1;
 }

Index: mozilla/xpfe/bootstrap/showOSAlert.cpp
===================================================================
RCS file: /cvsroot/mozilla/xpfe/bootstrap/showOSAlert.cpp,v
retrieving revision 1.10
diff -u -p -r1.10 showOSAlert.cpp
--- mozilla/xpfe/bootstrap/showOSAlert.cpp	20 Aug 2004 15:01:40 -0000     
1.10
+++ mozilla/xpfe/bootstrap/showOSAlert.cpp	10 Jul 2005 11:42:18 -0000
@@ -43,9 +43,6 @@
 //defines and includes for previous installation cleanup process
 #if defined (XP_WIN)
 #include <windows.h>
-#elif defined (XP_MAC)
-#include <Dialogs.h>
-#include <TextUtils.h>
 #elif defined (MOZ_WIDGET_GTK)
 #include <gtk/gtk.h>
 #elif defined (XP_OS2)
@@ -195,9 +192,6 @@ printf("\n****Inside ShowOSAlert ***\n")

 #if defined (XP_WIN)
     MessageBox(NULL, message_copy, NULL, MB_OK | MB_ICONERROR |
MB_SETFOREGROUND );
-#elif (XP_MAC)
-    short buttonClicked;
-    StandardAlert(kAlertStopAlert, c2pstr(message_copy), nil, nil,
&buttonClicked);
 #elif defined (MOZ_WIDGET_GTK)
     NS_gtk_alert(message_copy, NULL, "OK");
 #elif defined (XP_OS2)

Is there a Mac OS X block here at all? Not sure if this is used, but we might
want it.

Index: mozilla/xpfe/components/bookmarks/src/nsBookmarksService.h
===================================================================
RCS file: /cvsroot/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.h,v
retrieving revision 1.39
diff -u -p -r1.39 nsBookmarksService.h
--- mozilla/xpfe/components/bookmarks/src/nsBookmarksService.h	17 Apr 2004
16:51:21 -0000	    1.39
+++ mozilla/xpfe/components/bookmarks/src/nsBookmarksService.h	10 Jul 2005
11:42:20 -0000
@@ -63,7 +63,7 @@
 class nsIOutputStream;

 #ifdef DEBUG
-#if defined(XP_MAC) || defined(XP_MACOSX)
+#if defined(XP_MACOSX)
 #include <Timer.h>
 #endif
 #endif

Probably don't need Timer.h any more.


***


Serge Gautherie   2005-07-20 14:08:55 PDT
Comment #30

(In reply to comment #29)
> (From update of attachment 188836 [details] [diff] [review] [edit])

Thanks for your comments.

Helpwanted: looking for someone with a MacOSX compiler to answer/test...

Comment 1

[Mark Banner (:standard8)]

(In reply to comment #0)
> Helpwanted: looking for someone with a MacOSX compiler to answer/test...

There is no point in even attempting to test that patch. Half of the code has been moved elsewhere, some of it has already been fixed. The only file that still needs fixing in that original patch is probably /xpfe/bootstrap/showOSAlert.cpp.

Comment 2

[Stefan [:stefanh]]

All XP_MAC code have been removed in m-c:s /xpfe, so I'm resolving this as wfm.