wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 497858: Clean up Qt's nsWindow, r=mfinkle

Browse Source
This commit is contained in:
Tobias Hunger 2009-07-15 08:20:21 -04:00
parent 3b16d55bd2
commit 5c677c629b
2 changed files with 166 additions and 370 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

521
widget/src/qt/nsWindow.cpp
View File

File diff suppressed because it is too large Load Diff

15
widget/src/qt/nsWindow.h
View File

@ -49,15 +49,8 @@
#include "nsWeakReference.h" #include "nsWeakReference.h"
#include "nsIDragService.h"
#include "nsITimer.h"
#include "nsWidgetAtoms.h" #include "nsWidgetAtoms.h"
#ifdef Q_WS_X11
#include <QX11Info>
#endif
#ifdef MOZ_LOGGING #ifdef MOZ_LOGGING
// make sure that logging is enabled before including prlog.h // make sure that logging is enabled before including prlog.h
@ -209,7 +202,6 @@ public:
void QWidgetDestroyed(); void QWidgetDestroyed();
/***** from CommonWidget *****/ /***** from CommonWidget *****/
// event handling code // event handling code
@ -256,7 +248,7 @@ protected:
* Event handlers (proxied from the actual qwidget). * Event handlers (proxied from the actual qwidget).
* They follow normal Qt widget semantics. * They follow normal Qt widget semantics.
*/ */
void Initialize(QWidget *widget); void Initialize(MozQWidget *widget);
friend class nsQtEventDispatcher; friend class nsQtEventDispatcher;
friend class InterceptContainer; friend class InterceptContainer;
friend class MozQWidget; friend class MozQWidget;
@ -333,10 +325,9 @@ private:
void SetDefaultIcon(void); void SetDefaultIcon(void);
void InitButtonEvent(nsMouseEvent &event, QMouseEvent *aEvent, int aClickCount = 1); void InitButtonEvent(nsMouseEvent &event, QMouseEvent *aEvent, int aClickCount = 1);
PRBool DispatchCommandEvent(nsIAtom* aCommand); PRBool DispatchCommandEvent(nsIAtom* aCommand);
QWidget *createQWidget(QWidget *parent, nsWidgetInitData *aInitData); MozQWidget *createQWidget(QWidget *parent, nsWidgetInitData *aInitData);
QWidget *mDrawingArea; MozQWidget * mWidget;
MozQWidget *mMozQWidget;
PRUint32 mIsVisible : 1, PRUint32 mIsVisible : 1,
mActivatePending : 1; mActivatePending : 1;