From 5a0aae6de3d4cfba1fcc283725631b8d6338e58c Mon Sep 17 00:00:00 2001 From: "roc+%cs.cmu.edu" Date: Sun, 9 Apr 2006 23:14:25 +0000 Subject: [PATCH] Bug 29856. Support SetWindowClass in GTK2, checking in additional files git-svn-id: svn://10.0.0.236/trunk@193975 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/widget/public/nsIWidget.h | 11 ++--------- mozilla/widget/src/xpwidgets/nsBaseWidget.cpp | 8 ++------ mozilla/widget/src/xpwidgets/nsBaseWidget.h | 4 ++-- 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/mozilla/widget/public/nsIWidget.h b/mozilla/widget/public/nsIWidget.h index 8d2c70c9e0d..182cad6ae20 100644 --- a/mozilla/widget/public/nsIWidget.h +++ b/mozilla/widget/public/nsIWidget.h @@ -980,16 +980,9 @@ class nsIWidget : public nsISupports { NS_IMETHOD CaptureMouse(PRBool aCapture) = 0; /** - * Gets the window class - * implemented in gtk + * Classify the window for the window manager. Mostly for X11. */ - NS_IMETHOD GetWindowClass(char *aClass) = 0; - - /** - * Sets the window class - * implemented in gtk - */ - NS_IMETHOD SetWindowClass(char *aClass) = 0; + NS_IMETHOD SetWindowClass(const nsAString& aName, const nsAString& xulWinType) = 0; /** * Enables/Disables system capture of any and all events that would cause a diff --git a/mozilla/widget/src/xpwidgets/nsBaseWidget.cpp b/mozilla/widget/src/xpwidgets/nsBaseWidget.cpp index 86551f9b3aa..95a81864582 100644 --- a/mozilla/widget/src/xpwidgets/nsBaseWidget.cpp +++ b/mozilla/widget/src/xpwidgets/nsBaseWidget.cpp @@ -702,12 +702,8 @@ void nsBaseWidget::OnDestroy() mAppShell = nsnull; // clear out nsCOMPtr } -NS_METHOD nsBaseWidget::GetWindowClass(char *aClass) -{ - return NS_ERROR_NOT_IMPLEMENTED; -} - -NS_METHOD nsBaseWidget::SetWindowClass(char *aClass) +NS_METHOD nsBaseWidget::SetWindowClass(const nsAString& aName, + const nsAString& xulWinType) { return NS_ERROR_NOT_IMPLEMENTED; } diff --git a/mozilla/widget/src/xpwidgets/nsBaseWidget.h b/mozilla/widget/src/xpwidgets/nsBaseWidget.h index 7f4eaf8b4c0..abf69cc4823 100644 --- a/mozilla/widget/src/xpwidgets/nsBaseWidget.h +++ b/mozilla/widget/src/xpwidgets/nsBaseWidget.h @@ -116,8 +116,8 @@ public: NS_IMETHOD SetModal(PRBool aModal); NS_IMETHOD ModalEventFilter(PRBool aRealEvent, void *aEvent, PRBool *aForWindow); - NS_IMETHOD GetWindowClass(char *aClass); - NS_IMETHOD SetWindowClass(char *aClass); + NS_IMETHOD SetWindowClass(const nsAString& aName, + const nsAString& xulWinType); NS_IMETHOD SetBorderStyle(nsBorderStyle aBorderStyle); NS_IMETHOD AddMouseListener(nsIMouseListener * aListener); NS_IMETHOD AddEventListener(nsIEventListener * aListener);