Bug 627956 - Fold widget/build into widget/windows. r=roc

--HG--
rename : widget/build/nsWinWidgetFactory.cpp => widget/windows/nsWidgetFactory.cpp
rename : widget/build/res/aliasb.cur => widget/windows/res/aliasb.cur
rename : widget/build/res/cell.cur => widget/windows/res/cell.cur
rename : widget/build/res/col_resize.cur => widget/windows/res/col_resize.cur
rename : widget/build/res/copy.cur => widget/windows/res/copy.cur
rename : widget/build/res/grab.cur => widget/windows/res/grab.cur
rename : widget/build/res/grabbing.cur => widget/windows/res/grabbing.cur
rename : widget/build/res/none.cur => widget/windows/res/none.cur
rename : widget/build/res/row_resize.cur => widget/windows/res/row_resize.cur
rename : widget/build/res/select.cur => widget/windows/res/select.cur
rename : widget/build/res/vertical_text.cur => widget/windows/res/vertical_text.cur
rename : widget/build/res/zoom_in.cur => widget/windows/res/zoom_in.cur
rename : widget/build/res/zoom_out.cur => widget/windows/res/zoom_out.cur
rename : widget/build/widget.rc => widget/windows/widget.rc

toolkit/library/Makefile.in

@@ -318,7 +318,7 @@ 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
@@ -581,7 +581,6 @@ export:: $(RDF_UTIL_SRC_CPPSRCS) $(INTL_UNICHARUTIL_UTIL_CPPSRCS)
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/config \
   -I$(topsrcdir)/widget/windows \
-  -I$(topsrcdir)/widget/build \
   $(NULL)
 
 OS_LIBS += $(LIBICONV)

toolkit/toolkit-makefiles.sh

@@ -595,7 +595,6 @@ if [ "$MOZ_WIDGET_TOOLKIT" = "windows" ]; then
     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
   "

widget/Makefile.in

@@ -53,7 +53,7 @@ DIRS += $(MOZ_WIDGET_TOOLKIT)
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
-DIRS += windows build
+DIRS += windows
 endif
 
 ifdef ENABLE_TESTS

widget/build/Makefile.in

@@ -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)

widget/windows/Makefile.in

@@ -44,9 +44,12 @@ 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 \
@@ -74,6 +77,7 @@ CPPSRCS = \
   GfxInfo.cpp \
   WidgetTraceEvent.cpp \
   AudioSession.cpp \
+  nsWidgetFactory.cpp \
   $(NULL)
 
 ifdef MOZ_CRASHREPORTER
@@ -104,7 +108,6 @@ ifdef NS_ENABLE_TSF
 CPPSRCS		+= nsTextStore.cpp
 endif
 
-
 DEFINES		+= -D_IMPL_NS_WIDGET -DMOZ_UNICODE 
 
 ifdef MOZ_ENABLE_D3D9_LAYER
@@ -115,6 +118,9 @@ 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

widget/windows/nsWindow.cpp

@@ -8526,8 +8526,6 @@ void nsWindow::RegisterSpecialDropdownHooks()
 
   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");