зеркало из https://github.com/mozilla/pjs.git
lets try this again
This commit is contained in:
Родитель
bceadfb79a
Коммит
b2749e6a85
|
@ -45,6 +45,7 @@ CPPSRCS = \
|
||||||
nsMenuBar.cpp \
|
nsMenuBar.cpp \
|
||||||
nsMenuItem.cpp \
|
nsMenuItem.cpp \
|
||||||
nsPopUpMenu.cpp \
|
nsPopUpMenu.cpp \
|
||||||
|
nsContextMenu.cpp \
|
||||||
nsRadioButton.cpp \
|
nsRadioButton.cpp \
|
||||||
nsScrollbar.cpp \
|
nsScrollbar.cpp \
|
||||||
nsSound.cpp \
|
nsSound.cpp \
|
||||||
|
|
|
@ -437,7 +437,7 @@ nsEventStatus nsContextMenu::MenuItemSelected(const nsMenuEvent & aMenuEvent)
|
||||||
return nsEventStatus_eIgnore;
|
return nsEventStatus_eIgnore;
|
||||||
}
|
}
|
||||||
|
|
||||||
void nsContextMenu::MenuPosFunc(GtkMenu *menu,
|
void menu_popup_position(GtkMenu *menu,
|
||||||
gint *x,
|
gint *x,
|
||||||
gint *y,
|
gint *y,
|
||||||
gpointer data)
|
gpointer data)
|
||||||
|
@ -452,7 +452,7 @@ nsEventStatus nsContextMenu::MenuSelected(const nsMenuEvent & aMenuEvent)
|
||||||
GtkWidget *parent = GTK_WIDGET(mParent->GetNativeData(NS_NATIVE_WIDGET));
|
GtkWidget *parent = GTK_WIDGET(mParent->GetNativeData(NS_NATIVE_WIDGET));
|
||||||
gtk_menu_popup (GTK_MENU(mMenu),
|
gtk_menu_popup (GTK_MENU(mMenu),
|
||||||
parent, NULL,
|
parent, NULL,
|
||||||
nsContextMenu::MenuPosFunc,
|
menu_popup_position,
|
||||||
this, 1, GDK_CURRENT_TIME);
|
this, 1, GDK_CURRENT_TIME);
|
||||||
|
|
||||||
if (nsnull != mListener) {
|
if (nsnull != mListener) {
|
||||||
|
|
|
@ -89,11 +89,6 @@ protected:
|
||||||
nsIWidget * GetParentWidget();
|
nsIWidget * GetParentWidget();
|
||||||
char* GetACPString(nsString& aStr);
|
char* GetACPString(nsString& aStr);
|
||||||
|
|
||||||
void MenuPosFunc(GtkMenu *menu,
|
|
||||||
gint *x,
|
|
||||||
gint *y,
|
|
||||||
gpointer data);
|
|
||||||
|
|
||||||
void LoadMenuItem(nsIMenu * pParentMenu,
|
void LoadMenuItem(nsIMenu * pParentMenu,
|
||||||
nsIDOMElement * menuitemElement,
|
nsIDOMElement * menuitemElement,
|
||||||
nsIDOMNode * menuitemNode,
|
nsIDOMNode * menuitemNode,
|
||||||
|
|
|
@ -41,9 +41,7 @@
|
||||||
#include "nsMenu.h"
|
#include "nsMenu.h"
|
||||||
#include "nsMenuItem.h"
|
#include "nsMenuItem.h"
|
||||||
#include "nsPopUpMenu.h"
|
#include "nsPopUpMenu.h"
|
||||||
#if 0
|
|
||||||
#include "nsContextMenu.h"
|
#include "nsContextMenu.h"
|
||||||
#endif
|
|
||||||
#include "nsTabWidget.h"
|
#include "nsTabWidget.h"
|
||||||
#include "nsFontRetrieverService.h"
|
#include "nsFontRetrieverService.h"
|
||||||
|
|
||||||
|
@ -236,11 +234,9 @@ nsresult nsWidgetFactory::CreateInstance(nsISupports *aOuter,
|
||||||
else if (mClassID.Equals(kCPopUpMenu)) {
|
else if (mClassID.Equals(kCPopUpMenu)) {
|
||||||
inst = (nsISupports*)new nsPopUpMenu();
|
inst = (nsISupports*)new nsPopUpMenu();
|
||||||
}
|
}
|
||||||
#if 0
|
|
||||||
else if (mClassID.Equals(kCContextMenu)) {
|
else if (mClassID.Equals(kCContextMenu)) {
|
||||||
inst = (nsISupports*)(nsIContextMenu*)new nsContextMenu();
|
inst = (nsISupports*)(nsIContextMenu*)new nsContextMenu();
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
else if (mClassID.Equals(kCSound)) {
|
else if (mClassID.Equals(kCSound)) {
|
||||||
nsISound* aSound = nsnull;
|
nsISound* aSound = nsnull;
|
||||||
NS_NewSound(&aSound);
|
NS_NewSound(&aSound);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче