From 5d2ddafb0808d8a16e20576c20e4854c29636a67 Mon Sep 17 00:00:00 2001 From: "ramiro%netscape.com" Date: Sat, 21 Aug 1999 12:13:17 +0000 Subject: [PATCH] No longer needed. --- widget/src/qt/Makefile.in | 2 - widget/src/qt/nsTabWidget.cpp | 164 ---------------------------- widget/src/qt/nsTabWidget.h | 71 ------------ widget/src/qt/nsWidgetFactory.cpp | 12 -- widget/src/xlib/nsTabWidget.cpp | 60 ---------- widget/src/xlib/nsTabWidget.h | 44 -------- widget/src/xlib/nsTooltipWidget.cpp | 58 ---------- widget/src/xlib/nsTooltipWidget.h | 48 -------- 8 files changed, 459 deletions(-) delete mode 100644 widget/src/qt/nsTabWidget.cpp delete mode 100644 widget/src/qt/nsTabWidget.h delete mode 100644 widget/src/xlib/nsTabWidget.cpp delete mode 100644 widget/src/xlib/nsTabWidget.h delete mode 100644 widget/src/xlib/nsTooltipWidget.cpp delete mode 100644 widget/src/xlib/nsTooltipWidget.h diff --git a/widget/src/qt/Makefile.in b/widget/src/qt/Makefile.in index 5f1e89c6ad29..88324512b5a2 100644 --- a/widget/src/qt/Makefile.in +++ b/widget/src/qt/Makefile.in @@ -36,7 +36,6 @@ MOCSRCS = \ moc_nsTextAreaWidget.cpp \ moc_nsCheckButton.cpp \ moc_nsTextWidget.cpp \ - moc_nsTabWidget.cpp \ moc_nsQEventHandler.cpp \ moc_nsRadioButton.cpp \ moc_nsWindow.cpp \ @@ -60,7 +59,6 @@ CPPSRCS = \ nsTextWidget.cpp \ nsFileWidget.cpp \ nsMenuItem.cpp \ - nsTabWidget.cpp \ nsToolkit.cpp \ nsQEventHandler.cpp \ nsRadioButton.cpp \ diff --git a/widget/src/qt/nsTabWidget.cpp b/widget/src/qt/nsTabWidget.cpp deleted file mode 100644 index 717d993fffa8..000000000000 --- a/widget/src/qt/nsTabWidget.cpp +++ /dev/null @@ -1,164 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- - * - * The contents of this file are subject to the Netscape Public License - * Version 1.0 (the "NPL"); you may not use this file except in - * compliance with the NPL. You may obtain a copy of the NPL at - * http://www.mozilla.org/NPL/ - * - * Software distributed under the NPL is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL - * for the specific language governing rights and limitations under the - * NPL. - * - * The Initial Developer of this code under the NPL is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 1998 Netscape Communications Corporation. All Rights - * Reserved. - */ - -#include "nsTabWidget.h" -#include "nsToolkit.h" -#include "nsColor.h" -#include "nsGUIEvent.h" -#include "nsString.h" -#include "nsStringUtil.h" - - -//============================================================================= -// -// nsQTabBar class -// -//============================================================================= -nsQTabBar::nsQTabBar(nsWidget * widget, - QWidget * parent, - const char * name) - : QTabBar(parent, name), nsQBaseWidget(widget) -{ -} - -nsQTabBar::~nsQTabBar() -{ -} - -NS_IMPL_ADDREF(nsTabWidget) -NS_IMPL_RELEASE(nsTabWidget) - -//------------------------------------------------------------------------- -// -// nsTabWidget constructor -// -//------------------------------------------------------------------------- -nsTabWidget::nsTabWidget() : nsWidget() -{ - PR_LOG(QtWidgetsLM, PR_LOG_DEBUG, ("nsTabWidget::nsTabWidget()\n")); - NS_INIT_REFCNT(); -} - -//------------------------------------------------------------------------- -// -// nsTabWidget destructor -// -//------------------------------------------------------------------------- -nsTabWidget::~nsTabWidget() -{ - PR_LOG(QtWidgetsLM, PR_LOG_DEBUG, ("nsTabWidget::~nsTabWidget()\n")); -} - -//------------------------------------------------------------------------- -// -// Query interface implementation -// -//------------------------------------------------------------------------- -nsresult nsTabWidget::QueryInterface(const nsIID& aIID, void** aInstancePtr) -{ - PR_LOG(QtWidgetsLM, PR_LOG_DEBUG, ("nsTabWidget::QueryInterface()\n")); - nsresult result = nsWidget::QueryInterface(aIID, aInstancePtr); - - static NS_DEFINE_IID(kInsTabWidgetIID, NS_ITABWIDGET_IID); - if (result == NS_NOINTERFACE && aIID.Equals(kInsTabWidgetIID)) - { - *aInstancePtr = (void*) ((nsITabWidget*)this); - NS_ADDREF_THIS(); - result = NS_OK; - } - - return result; -} - -//------------------------------------------------------------------------- -// -// Set the tab labels -// -//------------------------------------------------------------------------- - -NS_METHOD nsTabWidget::SetTabs(PRUint32 aNumberOfTabs, - const nsString aTabLabels[]) -{ - PR_LOG(QtWidgetsLM, PR_LOG_DEBUG, ("nsTabWidget::SetTabs()\n")); - - if (mWidget) - { - for (PRUint32 i = 0; i < aNumberOfTabs; i++) - { - QTab * qTab = new QTab(); - - if (qTab) - { - char * label = aTabLabels[i].ToNewCString(); - qTab->label = label; - ((QTabBar *)mWidget)->addTab(qTab); - delete [] label; - } - } - } - -/* - TC_ITEM tie; - char labelTemp[256]; - - for (PRUint32 i = 0; i < aNumberOfTabs; i++) { - tie.mask = TCIF_TEXT; - aTabLabels[i].ToCString(labelTemp, 256); - tie.pszText = labelTemp; - TabCtrl_InsertItem(mWnd, i, &tie); - } -*/ - return NS_OK; -} - -//------------------------------------------------------------------------- -// -// Get the currently selected tab -// -//------------------------------------------------------------------------- - - -PRUint32 nsTabWidget::GetSelectedTab(PRUint32& aTabNumber) -{ - PR_LOG(QtWidgetsLM, PR_LOG_DEBUG, ("nsTabWidget::GetSelectedTab()\n")); -/* - aTabNumber = TabCtrl_GetCurSel(mWnd); -*/ - return NS_OK; -} - -//------------------------------------------------------------------------- -// -// paint message. Don't send the paint out -// -//------------------------------------------------------------------------- - -NS_METHOD nsTabWidget::GetBounds(nsRect &aRect) -{ - PR_LOG(QtWidgetsLM, PR_LOG_DEBUG, ("nsTabWidget::GetBounds()\n")); - return nsWidget::GetBounds(aRect); -} - -NS_METHOD nsTabWidget::CreateNative(QWidget * parentWidget) -{ - PR_LOG(QtWidgetsLM, PR_LOG_DEBUG, ("nsTabWidget::CreateNative()\n")); - - mWidget = new nsQTabBar(this, parentWidget, QTabBar::tr("nsTabWidget")); - - return nsWidget::CreateNative(parentWidget); -} diff --git a/widget/src/qt/nsTabWidget.h b/widget/src/qt/nsTabWidget.h deleted file mode 100644 index 4cb9300ac9bc..000000000000 --- a/widget/src/qt/nsTabWidget.h +++ /dev/null @@ -1,71 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- - * - * The contents of this file are subject to the Netscape Public License - * Version 1.0 (the "NPL"); you may not use this file except in - * compliance with the NPL. You may obtain a copy of the NPL at - * http://www.mozilla.org/NPL/ - * - * Software distributed under the NPL is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL - * for the specific language governing rights and limitations under the - * NPL. - * - * The Initial Developer of this code under the NPL is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 1998 Netscape Communications Corporation. All Rights - * Reserved. - */ - -#ifndef nsTabWidget_h__ -#define nsTabWidget_h__ - -#include "nsWidget.h" -#include "nsITabWidget.h" -#include - -//============================================================================= -// -// nsQTabBar class -// -//============================================================================= -class nsQTabBar : public QTabBar, public nsQBaseWidget -{ - Q_OBJECT -public: - nsQTabBar(nsWidget * widget, - QWidget * parent = 0, - const char * name = 0); - ~nsQTabBar(); -}; - - -/** - * Native QT tab control wrapper - */ - -class nsTabWidget : public nsWidget, - public nsITabWidget -{ - -public: - nsTabWidget(); - virtual ~nsTabWidget(); - - NS_DECL_ISUPPORTS - - // nsITabWidget part - NS_IMETHOD SetTabs(PRUint32 aNumberOfTabs, const nsString aTabLabels[]); - NS_IMETHOD GetSelectedTab(PRUint32& aTabNumber); - - // nsIWidget overrides - virtual PRBool OnMove(PRInt32 aX, PRInt32 aY) { return PR_FALSE; } - virtual PRBool OnPaint(nsPaintEvent & aEvent) { return PR_FALSE; } - virtual PRBool OnResize(nsRect &aRect) { return PR_FALSE; } - - NS_IMETHOD GetBounds(nsRect &aRect); - -protected: - NS_IMETHOD CreateNative(QWidget * parentWidget); -}; - -#endif // nsTabWidget_h__ diff --git a/widget/src/qt/nsWidgetFactory.cpp b/widget/src/qt/nsWidgetFactory.cpp index 0b078647a47a..fc31107c5db4 100644 --- a/widget/src/qt/nsWidgetFactory.cpp +++ b/widget/src/qt/nsWidgetFactory.cpp @@ -40,7 +40,6 @@ #include "nsMenu.h" #include "nsMenuItem.h" #include "nsPopUpMenu.h" -#include "nsTabWidget.h" #include "nsFontRetrieverService.h" // Drag & Drop, Clipboard @@ -65,8 +64,6 @@ static NS_DEFINE_IID(kCHorzScrollbar, NS_HORZSCROLLBAR_CID); static NS_DEFINE_IID(kCVertScrollbar, NS_VERTSCROLLBAR_CID); static NS_DEFINE_IID(kCTextArea, NS_TEXTAREA_CID); static NS_DEFINE_IID(kCTextField, NS_TEXTFIELD_CID); -static NS_DEFINE_IID(kCTabWidget, NS_TABWIDGET_CID); -static NS_DEFINE_IID(kCTooltipWidget, NS_TOOLTIPWIDGET_CID); static NS_DEFINE_IID(kCAppShell, NS_APPSHELL_CID); static NS_DEFINE_IID(kCToolkit, NS_TOOLKIT_CID); static NS_DEFINE_IID(kCLookAndFeel, NS_LOOKANDFEEL_CID); @@ -221,15 +218,6 @@ nsresult nsWidgetFactory::CreateInstance(nsISupports *aOuter, { inst = (nsISupports*)(nsWidget *)new nsTextWidget(); } - else if (mClassID.Equals(kCTabWidget)) - { - inst = (nsISupports*)(nsWidget *)new nsTabWidget(); - } - else if (mClassID.Equals(kCTooltipWidget)) - { - // no tooltips?? - // inst = (nsISupports*)(nsWidget *)new nsTooltipWidget(); - } else if (mClassID.Equals(kCAppShell)) { inst = (nsISupports*)new nsAppShell(); diff --git a/widget/src/xlib/nsTabWidget.cpp b/widget/src/xlib/nsTabWidget.cpp deleted file mode 100644 index bcfa0fb2b6b1..000000000000 --- a/widget/src/xlib/nsTabWidget.cpp +++ /dev/null @@ -1,60 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- - * - * The contents of this file are subject to the Netscape Public License - * Version 1.0 (the "NPL"); you may not use this file except in - * compliance with the NPL. You may obtain a copy of the NPL at - * http://www.mozilla.org/NPL/ - * - * Software distributed under the NPL is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL - * for the specific language governing rights and limitations under the - * NPL. - * - * The Initial Developer of this code under the NPL is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 1998 Netscape Communications Corporation. All Rights - * Reserved. - */ - -#include "nsTabWidget.h" - -NS_IMPL_ADDREF(nsTabWidget) -NS_IMPL_RELEASE(nsTabWidget) - -nsTabWidget::nsTabWidget() : nsWidget() -{ - NS_INIT_REFCNT(); -} - -nsTabWidget::~nsTabWidget() -{ -} - -nsresult nsTabWidget::QueryInterface(const nsIID& aIID, void** aInstancePtr) -{ - nsresult result = nsWidget::QueryInterface(aIID, aInstancePtr); - - static NS_DEFINE_IID(kInsTabWidgetIID, NS_ITABWIDGET_IID); - if (result == NS_NOINTERFACE && aIID.Equals(kInsTabWidgetIID)) { - *aInstancePtr = (void*) ((nsITabWidget*)this); - NS_ADDREF_THIS(); - result = NS_OK; - } - - return result; -} - -NS_METHOD nsTabWidget::SetTabs(PRUint32 aNumberOfTabs, const nsString aTabLabels[]) -{ - return NS_OK; -} - -PRUint32 nsTabWidget::GetSelectedTab(PRUint32& aTabNumber) -{ - return 0; -} - - - - - diff --git a/widget/src/xlib/nsTabWidget.h b/widget/src/xlib/nsTabWidget.h deleted file mode 100644 index bf9d68cc1b59..000000000000 --- a/widget/src/xlib/nsTabWidget.h +++ /dev/null @@ -1,44 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- - * - * The contents of this file are subject to the Netscape Public License - * Version 1.0 (the "NPL"); you may not use this file except in - * compliance with the NPL. You may obtain a copy of the NPL at - * http://www.mozilla.org/NPL/ - * - * Software distributed under the NPL is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL - * for the specific language governing rights and limitations under the - * NPL. - * - * The Initial Developer of this code under the NPL is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 1998 Netscape Communications Corporation. All Rights - * Reserved. - */ - -#ifndef nsTabWidget_h__ -#define nsTabWidget_h__ - -#include "nsWidget.h" -#include "nsITabWidget.h" - -class nsTabWidget : public nsWidget, - public nsITabWidget -{ - -public: - nsTabWidget(); - virtual ~nsTabWidget(); - - // nsISupports - NS_IMETHOD_(nsrefcnt) Release(void); - NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr); - NS_IMETHOD_(nsrefcnt) AddRef(void); - - // nsITabWidget part - NS_IMETHOD SetTabs(PRUint32 aNumberOfTabs, const nsString aTabLabels[]); - NS_IMETHOD GetSelectedTab(PRUint32& aTabNumber); - -}; - -#endif // nsTabWidget_h__ diff --git a/widget/src/xlib/nsTooltipWidget.cpp b/widget/src/xlib/nsTooltipWidget.cpp deleted file mode 100644 index ba52f52ac18a..000000000000 --- a/widget/src/xlib/nsTooltipWidget.cpp +++ /dev/null @@ -1,58 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- - * - * The contents of this file are subject to the Netscape Public License - * Version 1.0 (the "NPL"); you may not use this file except in - * compliance with the NPL. You may obtain a copy of the NPL at - * http://www.mozilla.org/NPL/ - * - * Software distributed under the NPL is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL - * for the specific language governing rights and limitations under the - * NPL. - * - * The Initial Developer of this code under the NPL is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 1998 Netscape Communications Corporation. All Rights - * Reserved. - */ - -#include "nsTooltipWidget.h" - -NS_IMPL_ADDREF(nsTooltipWidget) -NS_IMPL_RELEASE(nsTooltipWidget) - - -nsTooltipWidget::nsTooltipWidget() -{ - NS_INIT_REFCNT(); -} - -nsTooltipWidget::~nsTooltipWidget() -{ -} - -nsresult nsTooltipWidget::QueryInterface(const nsIID& aIID, void** aInstancePtr) -{ - nsresult result = nsWidget::QueryInterface(aIID, aInstancePtr); - - static NS_DEFINE_IID(kInsTooltipWidgetIID, NS_ITOOLTIPWIDGET_IID); - if (result == NS_NOINTERFACE && aIID.Equals(kInsTooltipWidgetIID)) { - *aInstancePtr = (void*) ((nsITooltipWidget*)this); - NS_ADDREF_THIS(); - result = NS_OK; - } - - return result; -} - -PRBool nsTooltipWidget::OnPaint() -{ - return PR_FALSE; -} - -PRBool nsTooltipWidget::AutoErase() -{ - return(PR_TRUE); -} - - diff --git a/widget/src/xlib/nsTooltipWidget.h b/widget/src/xlib/nsTooltipWidget.h deleted file mode 100644 index c9e9a1f0b3bf..000000000000 --- a/widget/src/xlib/nsTooltipWidget.h +++ /dev/null @@ -1,48 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- - * - * The contents of this file are subject to the Netscape Public License - * Version 1.0 (the "NPL"); you may not use this file except in - * compliance with the NPL. You may obtain a copy of the NPL at - * http://www.mozilla.org/NPL/ - * - * Software distributed under the NPL is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL - * for the specific language governing rights and limitations under the - * NPL. - * - * The Initial Developer of this code under the NPL is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 1998 Netscape Communications Corporation. All Rights - * Reserved. - */ - -#ifndef nsTooltipWidget_h__ -#define nsTooltipWidget_h__ - -#include "nsWidget.h" -#include "nsITooltipWidget.h" - -/** - * Native Win32 tooltip window wrapper - */ - -class nsTooltipWidget : public nsWidget, - public nsITooltipWidget -{ - -public: - nsTooltipWidget(); - virtual ~nsTooltipWidget(); - - // nsISupports - NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr); - NS_IMETHOD_(nsrefcnt) AddRef(void); - NS_IMETHOD_(nsrefcnt) Release(void); - - virtual PRBool OnPaint(); - virtual PRBool AutoErase(); - - -}; - -#endif // nsTooltipWidget_h__