Bug 904536 - Remove nsNativeWidget.h. r=roc
authorMarkus Stange <mstange@themasta.com>
Wed, 14 Aug 2013 13:19:08 +0200
changeset 142887 9135250734dd1418833d40a860c31450d121bc48
parent 142886 becd6422ddc78b675fb07826fc2aa87960c688eb
child 142888 7532cb4b2e4b2605a68bbff860d473b63961eebb
push id270
push userpvanderbeken@mozilla.com
push dateThu, 06 Mar 2014 09:24:21 +0000
reviewersroc
bugs904536
milestone26.0a1
Bug 904536 - Remove nsNativeWidget.h. r=roc
widget/moz.build
widget/nsIWidget.h
widget/nsNativeWidget.h
--- a/widget/moz.build
+++ b/widget/moz.build
@@ -102,17 +102,16 @@ EXPORTS += [
     'nsEvent.h',
     'nsGUIEvent.h',
     'nsIDeviceContextSpec.h',
     'nsINativeKeyBindings.h',
     'nsIPluginWidget.h',
     'nsIRollupListener.h',
     'nsIWidget.h',
     'nsIWidgetListener.h',
-    'nsNativeWidget.h',
     'nsWidgetInitData.h',
     'nsWidgetsCID.h',
 ]
 
 EXPORTS.mozilla += [
     'LookAndFeel.h',
     'WidgetUtils.h',
 ]
--- a/widget/nsIWidget.h
+++ b/widget/nsIWidget.h
@@ -9,17 +9,16 @@
 #include "nsISupports.h"
 #include "nsColor.h"
 #include "nsRect.h"
 #include "nsStringGlue.h"
 
 #include "nsEvent.h"
 #include "nsCOMPtr.h"
 #include "nsITheme.h"
-#include "nsNativeWidget.h"
 #include "nsWidgetInitData.h"
 #include "nsTArray.h"
 #include "nsXULAppAPI.h"
 #include "mozilla/layers/LayersTypes.h"
 #include "mozilla/RefPtr.h"
 
 // forward declarations
 class   nsFontMetrics;
@@ -57,16 +56,21 @@ class DrawTarget;
  * 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 (* EVENT_CALLBACK)(nsGUIEvent *event);
 
+// Hide the native window system's real window type so as to avoid
+// including native window system types and APIs. This is necessary
+// to ensure cross-platform code.
+typedef void* nsNativeWidget;
+
 /**
  * Flags for the getNativeData function.
  * See getNativeData()
  */
 #define NS_NATIVE_WINDOW      0
 #define NS_NATIVE_GRAPHIC     1
 #define NS_NATIVE_TMP_WINDOW  2
 #define NS_NATIVE_WIDGET      3
deleted file mode 100644
--- a/widget/nsNativeWidget.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* -*- Mode: C++; tab-width: 40; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef nsNativeWidget_h__
-#define nsNativeWidget_h__
-
-// Hide the native window systems real window type so as to avoid
-// including native window system types and APIs. This is necessary
-// to ensure cross-platform code.
-typedef void* nsNativeWidget;
-
-#endif // nsNativeWidget_h__