Author: rpmcruz Date: Thu Sep 10 16:51:01 2009 New Revision: 58614 URL: http://svn.opensuse.org/viewcvs/yast?rev=58614&view=rev Log: * src/YGUI.h, src/YGMenuButton.cc & src/YGTable.cc: make compilable with latest libyui. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGMenuButton.cc trunk/gtk/src/YGPackageSelector.cc trunk/gtk/src/YGTable.cc trunk/gtk/src/YGUI.h Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=58614&r1=58613&r2=58614&view=diff ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Thu Sep 10 16:51:01 2009 @@ -3,6 +3,9 @@ * src/ygtkcellrendererbutton.c: look more like a button when pressed. + * src/YGUI.h, src/YGMenuButton.cc & src/YGTable.cc: make + compilable with latest libyui. + 2009-09-10 Ricardo Cruz * src/ygtkcellrendererbutton.h/c: a push-button for lists. Modified: trunk/gtk/src/YGMenuButton.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGMenuButton.cc?rev=58614&r1=58613&r2=58614&view=diff ============================================================================== --- trunk/gtk/src/YGMenuButton.cc (original) +++ trunk/gtk/src/YGMenuButton.cc Thu Sep 10 16:51:01 2009 @@ -86,7 +86,7 @@ public: YGContextMenu() : YContextMenu(), - YGWidget (this, parent, GTK_TYPE_MENU, NULL) + YGWidget (this, NULL, GTK_TYPE_MENU, NULL) { connect (getWidget(), "cancel", G_CALLBACK (cancel_cb), this); } @@ -104,12 +104,12 @@ static void cancel_cb (GtkMenuShell *menu, YGContextMenu *pThis) { YGUI::ui()->sendEvent (new YCancelEvent()); } - YGWIDGET_IMPL_COMMON (YMenuButton) + YGWIDGET_IMPL_COMMON (YContextMenu) }; bool YGApplication::openContextMenu (const YItemCollection &itemCollection) { - YQContextMenu *menu = new YGContextMenu(); + YGContextMenu *menu = new YGContextMenu(); menu->addItems (itemCollection); return true; } Modified: trunk/gtk/src/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPackageSelector.cc?rev=58614&r1=58613&r2=58614&view=diff ============================================================================== --- trunk/gtk/src/YGPackageSelector.cc (original) +++ trunk/gtk/src/YGPackageSelector.cc Thu Sep 10 16:51:01 2009 @@ -1336,6 +1336,7 @@ } YGtkPackageView *view = ygtk_package_view_new (FALSE); if (use_buttons) { + //view->appendIconColumn (NULL, ZyppModel::ICON_COLUMN); view->appendTextColumn (NULL, ZyppModel::NAME_SUMMARY_COLUMN, 350); view->appendButtonColumn (NULL, col); } Modified: trunk/gtk/src/YGTable.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGTable.cc?rev=58614&r1=58613&r2=58614&view=diff ============================================================================== --- trunk/gtk/src/YGTable.cc (original) +++ trunk/gtk/src/YGTable.cc Thu Sep 10 16:51:01 2009 @@ -222,7 +222,7 @@ #if YAST2_VERSION > 2018003 static void right_click_cb (YGtkTreeView *view, gboolean outreach, YGTableView *pThis) { - emitEvent (YEvent::ContextMenuActivated); + pThis->emitEvent (YEvent::ContextMenuActivated); } #endif }; @@ -366,7 +366,7 @@ { #if YAST2_VERSION > 2018003 if (pThis->notifyContextMenu()) - return YGTableview::hack_right_click_cb (view, outreach, pThis); + return YGTableView::right_click_cb (view, outreach, pThis); #endif if (!YGDialog::currentDialog()->getFunctionWidget (5) || // undetermined case -- more than one table exists Modified: trunk/gtk/src/YGUI.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUI.h?rev=58614&r1=58613&r2=58614&view=diff ============================================================================== --- trunk/gtk/src/YGUI.h (original) +++ trunk/gtk/src/YGUI.h Thu Sep 10 16:51:01 2009 @@ -47,9 +47,6 @@ YEvent *waitInput (unsigned long timeout_ms, bool block); virtual YEvent *runPkgSelection (YWidget *packageSelector); -#if YAST2_VERSION > 2018003 - virtual bool openContextMenu (const YItemCollection &itemCollection); -#endif // used internally: for public use, see YApplication void busyCursor(); @@ -242,6 +239,10 @@ virtual bool richTextSupportsTable() IMPL_RET (false) #endif +#if YAST2_VERSION > 2018003 + virtual bool openContextMenu (const YItemCollection &itemCollection); +#endif + private: // for screenshots: std::map screenShotNb; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org