Rename of OS/2 RC header so static builds work better

widget/src/os2/Makefile.in

@@ -46,6 +46,10 @@ REQUIRES	= gfx \
 		  webbrowserpersist \
 		  $(NULL)
 
+ifdef BUILD_STATIC_LIBS
+EXPORTS		= wdgtos2rc.h
+endif
+
 CPPSRCS		= \
 		nsAppShell.cpp \
 		nsBidiKeyboard.cpp \

widget/src/os2/nsDragService.cpp

@@ -51,7 +51,7 @@
 #include "nsNetUtil.h"
 #include "nsOS2Uni.h"
 #include "nsdefs.h"
-#include "resource.h"
+#include "wdgtos2rc.h"
 
 NS_IMPL_ADDREF_INHERITED(nsDragService, nsBaseDragService)
 NS_IMPL_RELEASE_INHERITED(nsDragService, nsBaseDragService)

widget/src/os2/nsWindow.cpp

@@ -72,7 +72,7 @@
 #include <ctype.h>
 
 #include "nsdefs.h"
-#include "resource.h"
+#include "wdgtos2rc.h"
 
 #ifdef DEBUG_sobotka
 static int WINDOWCOUNT = 0;

widget/src/os2/wdgtos2rc.h

@@ -0,0 +1,55 @@
+/*
+ * 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 OS/2 libraries.
+ *
+ * The Initial Developer of the Original Code is John Fairhurst,
+ * <john_fairhurst@iname.com>.  Portions created by John Fairhurst are
+ * Copyright (C) 1999 John Fairhurst. All Rights Reserved.
+ *
+ * Contributor(s): 
+ *   IBM Corp.
+ *
+ */
+
+#define IDC_BASE                        4100
+
+#define IDC_SELECTANCHOR                4100
+#define IDC_ARROWSOUTH                  4101
+#define IDC_ARROWNORTH                  4102
+#define IDC_ARROWEAST                   4103
+#define IDC_ARROWWEST                   4104
+#define IDC_ARROWSOUTHPLUS              4105
+#define IDC_ARROWNORTHPLUS              4106
+#define IDC_ARROWEASTPLUS               4107
+#define IDC_ARROWWESTPLUS               4108
+#define IDC_GRAB                        4109
+#define IDC_GRABBING                    4110
+#define IDC_CELL                        4111
+#define IDC_COPY                        4112
+#define IDC_ALIAS                       4113
+#define IDC_ZOOMIN                      4114
+#define IDC_ZOOMOUT                     4115
+
+/* OS/2 specific */
+#define IDC_ARROWWAIT                   4116
+#define IDC_CROSS                       4117
+#define IDC_HELP                        4118
+
+#define IDC_COUNT IDC_HELP-IDC_BASE+1
+
+/* drag & drop icons */
+#define IDC_DNDBASE                     4150
+#define IDC_DNDURL                      4150
+#define IDC_DNDTEXT                     4151
+
+#define IDC_DNDCOUNT IDC_DNDTEXT-IDC_DNDBASE+1
+

widget/src/os2/widget.rc

@@ -20,7 +20,7 @@
  */
 
 #include <os2.h>
-#include "resource.h"
+#include "wdgtos2rc.h"
 
 POINTER IDC_SELECTANCHOR   res\select.ptr
 POINTER IDC_ARROWNORTH     res\arrow_north.ptr