Bug 627956 - Fold widget/build into widget/windows. r=roc
authorBrian R. Bondy <netzen@gmail.com>
Tue, 03 Jan 2012 22:10:06 -0500
changeset 86169 d26fad81f51a9f840d93b13742486e28325b0d92
parent 86168 e57e271bf32838bd8c9d7b96d96409e445970fee
child 86170 52d9d7bbfad1d3d29a972ec92ebc3cf035e4c3b9
push idunknown
push userunknown
push dateunknown
reviewersroc
bugs627956
milestone12.0a1
Bug 627956 - Fold widget/build into widget/windows. r=roc
toolkit/library/Makefile.in
toolkit/toolkit-makefiles.sh
widget/Makefile.in
widget/build/Makefile.in
widget/build/nsWinWidgetFactory.cpp
widget/build/res/aliasb.cur
widget/build/res/cell.cur
widget/build/res/col_resize.cur
widget/build/res/copy.cur
widget/build/res/grab.cur
widget/build/res/grabbing.cur
widget/build/res/none.cur
widget/build/res/row_resize.cur
widget/build/res/select.cur
widget/build/res/vertical_text.cur
widget/build/res/zoom_in.cur
widget/build/res/zoom_out.cur
widget/build/widget.rc
widget/windows/Makefile.in
widget/windows/nsWidgetFactory.cpp
widget/windows/nsWindow.cpp
widget/windows/res/aliasb.cur
widget/windows/res/cell.cur
widget/windows/res/col_resize.cur
widget/windows/res/copy.cur
widget/windows/res/grab.cur
widget/windows/res/grabbing.cur
widget/windows/res/none.cur
widget/windows/res/row_resize.cur
widget/windows/res/select.cur
widget/windows/res/vertical_text.cur
widget/windows/res/zoom_in.cur
widget/windows/res/zoom_out.cur
widget/windows/widget.rc
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -313,17 +313,17 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),gonk)
 COMPONENT_LIBS += widget_gonk
 endif
 
 STATIC_LIBS += thebes gl ycbcr
 
 COMPONENT_LIBS += profiler
 
 ifeq (windows,$(MOZ_WIDGET_TOOLKIT))
-COMPONENT_LIBS += gkwidget
+COMPONENT_LIBS += widget_windows
 endif
 ifeq (os2,$(MOZ_WIDGET_TOOLKIT))
 COMPONENT_LIBS += wdgtos2
 endif
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 COMPONENT_LIBS += widget_mac
 endif
 ifeq (qt,$(MOZ_WIDGET_TOOLKIT))
@@ -576,17 +576,16 @@ include $(topsrcdir)/config/rules.mk
 
 export:: $(RDF_UTIL_SRC_CPPSRCS) $(INTL_UNICHARUTIL_UTIL_CPPSRCS)
 	$(INSTALL) $^ .
 
 # need widget/windows for resource.h (included from widget.rc)
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/config \
   -I$(topsrcdir)/widget/windows \
-  -I$(topsrcdir)/widget/build \
   $(NULL)
 
 OS_LIBS += $(LIBICONV)
 
 DEFINES += \
   -D_IMPL_NS_COM \
   -D_IMPL_NS_STRINGAPI \
   -DEXPORT_XPT_API \
--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -590,17 +590,16 @@ add_makefiles "
 if [ "$MOZ_WIDGET_TOOLKIT" = "windows" ]; then
   add_makefiles "
     content/xbl/builtin/win/Makefile
     dom/system/windows/Makefile
     image/decoders/icon/win/Makefile
     intl/locale/src/windows/Makefile
     netwerk/system/win32/Makefile
     toolkit/system/windowsproxy/Makefile
-    widget/build/Makefile
     widget/windows/Makefile
     xpcom/reflect/xptcall/src/md/win32/Makefile
   "
 elif [ "$MOZ_WIDGET_TOOLKIT" = "cocoa" ]; then
   add_makefiles "
     content/xbl/builtin/mac/Makefile
     dom/plugins/ipc/interpose/Makefile
     dom/system/cocoa/Makefile
--- a/widget/Makefile.in
+++ b/widget/Makefile.in
@@ -48,17 +48,17 @@ include $(DEPTH)/config/autoconf.mk
 
 DIRS = shared xpwidgets
 
 ifneq (,$(filter os2 cocoa qt android gonk,$(MOZ_WIDGET_TOOLKIT)))
 DIRS += $(MOZ_WIDGET_TOOLKIT)
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
-DIRS += windows build
+DIRS += windows
 endif
 
 ifdef ENABLE_TESTS
 TOOL_DIRS += tests
 endif
 
 #
 # Don't build the DSO under the 'build' directory as windows does.
deleted file mode 100644
--- a/widget/build/Makefile.in
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# 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.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= widget
-LIBRARY_NAME	= gkwidget
-EXPORT_LIBRARY	= 1
-IS_COMPONENT	= 1
-RESFILE		= widget.res
-MODULE_NAME	= nsWidgetModule
-LIBXUL_LIBRARY = 1
-
-
-CPPSRCS		= nsWinWidgetFactory.cpp
-
-LOCAL_INCLUDES	= \
-		-I$(srcdir) \
-		-I$(srcdir)/../xpwidgets \
-		-I$(srcdir)/../windows \
-		$(NULL)
-
-SHARED_LIBRARY_LIBS = \
-		../windows/$(LIB_PREFIX)widget_windows.$(LIB_SUFFIX) \
-		../xpwidgets/$(LIB_PREFIX)xpwidgets_s.$(LIB_SUFFIX) \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
-DEFINES		+= -D_IMPL_NS_WIDGET -DMOZ_UNICODE
-
-CXXFLAGS += $(MOZ_CAIRO_CFLAGS)
--- a/widget/windows/Makefile.in
+++ b/widget/windows/Makefile.in
@@ -39,19 +39,22 @@ DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= widget
 LIBRARY_NAME	= widget_windows
+EXPORT_LIBRARY	= 1
+IS_COMPONENT	= 1
+RESFILE		= widget.res
+MODULE_NAME	= nsWidgetWinModule
 LIBXUL_LIBRARY = 1
 
-
 CPPSRCS = \
   nsWindow.cpp \
   nsWindowGfx.cpp \
   nsWindowDbg.cpp \
   nsAppShell.cpp \
   nsToolkit.cpp \
   nsFilePicker.cpp \
   nsScreenWin.cpp  \
@@ -69,16 +72,17 @@ CPPSRCS = \
   TaskbarTabPreview.cpp \
   TaskbarWindowPreview.cpp \
   TaskbarPreviewButton.cpp \
   JumpListBuilder.cpp \
   JumpListItem.cpp \
   GfxInfo.cpp \
   WidgetTraceEvent.cpp \
   AudioSession.cpp \
+  nsWidgetFactory.cpp \
   $(NULL)
 
 ifdef MOZ_CRASHREPORTER
 CPPSRCS += LSPAnnotator.cpp
 endif
 
 ifdef NS_PRINTING
 CPPSRCS		+= \
@@ -99,27 +103,29 @@ CPPSRCS += \
 	nsClipboard.cpp      \
 	nsImageClipboard.cpp \
 	nsBidiKeyboard.cpp   \
 	$(NULL)
 ifdef NS_ENABLE_TSF
 CPPSRCS		+= nsTextStore.cpp
 endif
 
-
 DEFINES		+= -D_IMPL_NS_WIDGET -DMOZ_UNICODE 
 
 ifdef MOZ_ENABLE_D3D9_LAYER
 DEFINES		+= -DMOZ_ENABLE_D3D9_LAYER
 endif
 
 ifdef MOZ_ENABLE_D3D10_LAYER
 DEFINES		+= -DMOZ_ENABLE_D3D10_LAYER
 endif
 
+SHARED_LIBRARY_LIBS = \
+  ../xpwidgets/$(LIB_PREFIX)xpwidgets_s.$(LIB_SUFFIX) \
+  $(NULL)
 
 EXPORTS		= nsdefs.h WindowHook.h
 EXPORTS_NAMESPACES = mozilla/widget
 EXPORTS_mozilla/widget = AudioSession.h
 
 LOCAL_INCLUDES	= \
 		-I. \
 		-I$(srcdir)/../xpwidgets \
rename from widget/build/nsWinWidgetFactory.cpp
rename to widget/windows/nsWidgetFactory.cpp
--- a/widget/windows/nsWindow.cpp
+++ b/widget/windows/nsWindow.cpp
@@ -8521,18 +8521,16 @@ LRESULT CALLBACK nsWindow::MozSpecialWnd
 // Register the special "hooks" for dropdown processing.
 void nsWindow::RegisterSpecialDropdownHooks()
 {
   NS_ASSERTION(!sMsgFilterHook, "sMsgFilterHook must be NULL!");
   NS_ASSERTION(!sCallProcHook,  "sCallProcHook must be NULL!");
 
   DISPLAY_NMM_PRT("***************** Installing Msg Hooks ***************\n");
 
-  //HMODULE hMod = GetModuleHandle("gkwidget.dll");
-
   // Install msg hook for moving the window and resizing
   if (!sMsgFilterHook) {
     DISPLAY_NMM_PRT("***** Hooking sMsgFilterHook!\n");
     sMsgFilterHook = SetWindowsHookEx(WH_MSGFILTER, MozSpecialMsgFilter, NULL, GetCurrentThreadId());
 #ifdef POPUP_ROLLUP_DEBUG_OUTPUT
     if (!sMsgFilterHook) {
       PR_LOG(gWindowsLog, PR_LOG_ALWAYS, 
              ("***** SetWindowsHookEx is NOT installed for WH_MSGFILTER!\n"));
rename from widget/build/res/aliasb.cur
rename to widget/windows/res/aliasb.cur
rename from widget/build/res/cell.cur
rename to widget/windows/res/cell.cur
rename from widget/build/res/col_resize.cur
rename to widget/windows/res/col_resize.cur
rename from widget/build/res/copy.cur
rename to widget/windows/res/copy.cur
rename from widget/build/res/grab.cur
rename to widget/windows/res/grab.cur
rename from widget/build/res/grabbing.cur
rename to widget/windows/res/grabbing.cur
rename from widget/build/res/none.cur
rename to widget/windows/res/none.cur
rename from widget/build/res/row_resize.cur
rename to widget/windows/res/row_resize.cur
rename from widget/build/res/select.cur
rename to widget/windows/res/select.cur
rename from widget/build/res/vertical_text.cur
rename to widget/windows/res/vertical_text.cur
rename from widget/build/res/zoom_in.cur
rename to widget/windows/res/zoom_in.cur
rename from widget/build/res/zoom_out.cur
rename to widget/windows/res/zoom_out.cur
rename from widget/build/widget.rc
rename to widget/windows/widget.rc