зеркало из https://github.com/mozilla/pjs.git
Adding static SetTopLevelWidget() call to nsClipboard.
This commit is contained in:
Родитель
263aec2570
Коммит
74a63c90ca
|
@ -43,7 +43,7 @@ public:
|
|||
// nsIClipboard
|
||||
NS_IMETHOD ForceDataToClipboard();
|
||||
|
||||
void SetTopLevelWidget(GtkWidget* w);
|
||||
static void SetTopLevelWidget(GtkWidget* w);
|
||||
|
||||
|
||||
protected:
|
||||
|
@ -52,12 +52,9 @@ protected:
|
|||
|
||||
PRBool mIgnoreEmptyNotification;
|
||||
|
||||
nsIClipboardOwner *mClipboardOwner;
|
||||
nsITransferable *mTransferable;
|
||||
nsIWidget *mWindow;
|
||||
GtkWidget *mWidget;
|
||||
static GtkWidget *sWidget;
|
||||
|
||||
private:
|
||||
static void SelectionRequestCB( GtkWidget *widget,
|
||||
GtkSelectionData *selection_data,
|
||||
guint info,
|
||||
|
@ -69,7 +66,6 @@ private:
|
|||
static void SelectionReceivedCB(GtkWidget *aWidget,
|
||||
GtkSelectionData *aSelectionData,
|
||||
gpointer aData);
|
||||
|
||||
};
|
||||
|
||||
#endif // nsClipboard_h__
|
||||
|
|
|
@ -253,7 +253,7 @@ NS_METHOD nsWindow::CreateNative(GtkWidget *parentWidget)
|
|||
this);
|
||||
|
||||
#ifdef NEW_CLIPBOARD_SUPPORT
|
||||
// Call SetTopLevelWidget here?
|
||||
nsClipboard::SetTopLevelWidget(mShell);
|
||||
#else
|
||||
nsSelectionMgr::SetTopLevelWidget(mShell);
|
||||
#endif
|
||||
|
|
Загрузка…
Ссылка в новой задаче