From 258ae5e444efe534968ca3eaef10464bd0dff87d Mon Sep 17 00:00:00 2001 From: "waterson%netscape.com" Date: Wed, 19 May 1999 03:56:19 +0000 Subject: [PATCH] Re-arrange to fix win32 bustage. git-svn-id: svn://10.0.0.236/trunk@32255 18797224-902f-48f8-a5cc-f745e15eee43 --- .../xpfe/appshell/src/nsWindowMediator.cpp | 46 ++++++++++--------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/mozilla/xpfe/appshell/src/nsWindowMediator.cpp b/mozilla/xpfe/appshell/src/nsWindowMediator.cpp index 1d38f0b9944..81fb45bc03d 100644 --- a/mozilla/xpfe/appshell/src/nsWindowMediator.cpp +++ b/mozilla/xpfe/appshell/src/nsWindowMediator.cpp @@ -117,27 +117,7 @@ struct nsWindowInfo }; -class nsWindowEnumerator : public nsISimpleEnumerator -{ - -public: - nsWindowEnumerator ( nsString* inTypeString, nsWindowMediator& inMediator ); - virtual ~nsWindowEnumerator(); - NS_IMETHOD HasMoreElements(PRBool *retval); - NS_IMETHOD GetNext(nsISupports **retval); - - NS_DECL_ISUPPORTS -private: - friend nsWindowMediator; - - PRInt32 FindNext(); - void WindowRemoved( PRInt32 inIndex); - - nsCOMPtr mWindowMediator; - nsString mType; - PRInt32 mCurrentPosition; -}; - +class nsWindowEnumerator; class nsWindowMediator : public nsIWindowMediator { @@ -273,6 +253,30 @@ private: static nsIRDFDataSource* mInner; }; + +class nsWindowEnumerator : public nsISimpleEnumerator +{ + +public: + nsWindowEnumerator ( nsString* inTypeString, nsWindowMediator& inMediator ); + virtual ~nsWindowEnumerator(); + NS_IMETHOD HasMoreElements(PRBool *retval); + NS_IMETHOD GetNext(nsISupports **retval); + + NS_DECL_ISUPPORTS +private: + friend nsWindowMediator; + + PRInt32 FindNext(); + void WindowRemoved( PRInt32 inIndex); + + nsCOMPtr mWindowMediator; + nsString mType; + PRInt32 mCurrentPosition; +}; + + + nsIRDFResource *nsWindowMediator::kNC_WindowMediatorRoot = NULL; nsIRDFResource *nsWindowMediator::kNC_Name = NULL; nsIRDFResource *nsWindowMediator::kNC_URL = NULL;