Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix build problem reported by avogel@bdm.com (Andy Vogel). The PopupCommand

Browse Source 
class defined in 2 different *.cpp files and was confusing thr dgux linker.
Add {Rdf,Editor} prefix to PopupCommand class to avoid ambiguity.
This commit is contained in:
ramiro 1998-05-06 17:49:57 +00:00
parent 18be686676
commit 2bebc6d333
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/xfe/src/EditorView.cpp
View File

@ -2570,16 +2570,16 @@ fe_editor_selection_contains_point(MWContext* context, int32 x, int32 y)
return FALSE;
}
class PopupCommand : public XFE_EditorViewCommand
class EditorPopupCommand : public XFE_EditorViewCommand
{
public:
PopupCommand() : XFE_EditorViewCommand(xfeCmdShowPopup) {};
EditorPopupCommand() : XFE_EditorViewCommand(xfeCmdShowPopup) {};
void reallyDoCommand(XFE_View* view, XFE_CommandInfo* info);
};
void
PopupCommand::reallyDoCommand(XFE_View* v_view, XFE_CommandInfo* info)
EditorPopupCommand::reallyDoCommand(XFE_View* v_view, XFE_CommandInfo* info)
{
XFE_EditorView* view = (XFE_EditorView*)v_view;
@ -2772,7 +2772,7 @@ XFE_EditorView::XFE_EditorView(XFE_Component *toplevel_component,
registerCommand(my_commands, new EditLinkCommand);
registerCommand(my_commands, new BookmarkLinkCommand);
registerCommand(my_commands, new CopyLinkCommand);
registerCommand(my_commands, new PopupCommand);
registerCommand(my_commands, new EditorPopupCommand);
registerCommand(my_commands, new UndoCommand);
registerCommand(my_commands, new RedoCommand);
registerCommand(my_commands, new CutCommand);

6
cmd/xfe/src/RDFView.cpp
View File

@ -127,10 +127,10 @@ public:
};
};
class PopupCommand : public XFE_RDFViewAlwaysEnabledCommand
class RdfPopupCommand : public XFE_RDFViewAlwaysEnabledCommand
{
public:
PopupCommand() : XFE_RDFViewAlwaysEnabledCommand(xfeCmdShowPopup) {};
RdfPopupCommand() : XFE_RDFViewAlwaysEnabledCommand(xfeCmdShowPopup) {};
virtual XP_Bool isSlow() {
return FALSE;
@ -153,7 +153,7 @@ XFE_RDFView::XFE_RDFView(XFE_Component *toplevel, Widget parent,
if (my_commands != 0)
return;
registerCommand(my_commands, new PopupCommand);
registerCommand(my_commands, new RdfPopupCommand);
Widget tree =
XtVaCreateManagedWidget(TREE_NAME,