Author: rpmcruz
Date: Thu Dec 3 21:25:28 2009
New Revision: 59945
URL: http://svn.opensuse.org/viewcvs/yast?rev=59945&view=rev
Log:
* src/YGTable.cc & src/YGMenuButton.cc: setLabel()
not being implemented by a few widgets.
bug fix: shortcut conflicts were not being revolved.
Modified:
trunk/gtk/ChangeLog
trunk/gtk/src/YGComboBox.cc
trunk/gtk/src/YGMenuButton.cc
trunk/gtk/src/YGPushButton.cc
trunk/gtk/src/YGTable.cc
Modified: trunk/gtk/ChangeLog
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=59945&r1=59944&r2=59945&view=diff
==============================================================================
--- trunk/gtk/ChangeLog (original)
+++ trunk/gtk/ChangeLog Thu Dec 3 21:25:28 2009
@@ -5,6 +5,10 @@
How yast2-qt renders HTML is by ignoring white-space
after a tag has been open (and only on open).
+ * src/YGTable.cc & src/YGMenuButton.cc: setLabel()
+ not being implemented by a few widgets.
+ bug fix: shortcut conflicts were not being revolved.
+
2009-12-02 Ricardo Cruz
* src/YGUtils.cc: bug fix 549943: HTML to XHTML
Modified: trunk/gtk/src/YGComboBox.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGComboBox.cc?rev=59945&r1=59944&r2=59945&view=diff
==============================================================================
--- trunk/gtk/src/YGComboBox.cc (original)
+++ trunk/gtk/src/YGComboBox.cc Thu Dec 3 21:25:28 2009
@@ -126,15 +126,10 @@
YGUtils::setFilter (getEntry(), validChars);
}
- // Events notifications
+ // callbacks
static void selected_changed_cb (GtkComboBox *widget, YGComboBox *pThis)
{ pThis->emitEvent (YEvent::ValueChanged); }
- YGLABEL_WIDGET_IMPL (YComboBox)
- YGSELECTION_WIDGET_IMPL (YComboBox)
-
- // callbacks
-
static gboolean realize_cb (GtkWidget *widget, GdkEventExpose *event,
YGComboBox *pThis)
{
@@ -147,6 +142,9 @@
g_signal_handlers_disconnect_by_func (widget, (gpointer) realize_cb, pThis);
return FALSE;
}
+
+ YGLABEL_WIDGET_IMPL (YComboBox)
+ YGSELECTION_WIDGET_IMPL (YComboBox)
};
YComboBox *YGWidgetFactory::createComboBox (YWidget *parent, const string &label, bool editable)
Modified: trunk/gtk/src/YGMenuButton.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGMenuButton.cc?rev=59945&r1=59944&r2=59945&view=diff
==============================================================================
--- trunk/gtk/src/YGMenuButton.cc (original)
+++ trunk/gtk/src/YGMenuButton.cc Thu Dec 3 21:25:28 2009
@@ -55,12 +55,16 @@
YGMenuButton (YWidget *parent, const string &label)
: YMenuButton (NULL, label),
YGWidget (this, parent, YGTK_TYPE_MENU_BUTTON, NULL)
+ { setLabel (label); }
+
+ // YMenuButton
+ virtual void setLabel (const std::string &label)
{
string str = YGUtils::mapKBAccel (label.c_str());
ygtk_menu_button_set_label (YGTK_MENU_BUTTON (getWidget()), str.c_str());
+ YMenuButton::setLabel (label);
}
- // YMenuButton
virtual void rebuildMenuTree()
{
GtkWidget *menu = gtk_menu_new();
Modified: trunk/gtk/src/YGPushButton.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPushButton.cc?rev=59945&r1=59944&r2=59945&view=diff
==============================================================================
--- trunk/gtk/src/YGPushButton.cc (original)
+++ trunk/gtk/src/YGPushButton.cc Thu Dec 3 21:25:28 2009
@@ -57,7 +57,7 @@
}
// YPushButton
- virtual void setLabel (const string &label)
+ virtual void setLabel (const std::string &label)
{
YPushButton::setLabel (label);
string str = YGUtils::mapKBAccel (label);
Modified: trunk/gtk/src/YGTable.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGTable.cc?rev=59945&r1=59944&r2=59945&view=diff
==============================================================================
--- trunk/gtk/src/YGTable.cc (original)
+++ trunk/gtk/src/YGTable.cc Thu Dec 3 21:25:28 2009
@@ -341,8 +341,6 @@
virtual unsigned int getMinSize (YUIDimension dim)
{ return 30; }
- YGWIDGET_IMPL_COMMON (YTable)
-
// YGSelectionModel
virtual void doAddItem (YItem *_item)
@@ -358,8 +356,6 @@
yuiError() << "Can only add YTableItems to a YTable.\n";
}
- YGSELECTION_WIDGET_IMPL (YTable)
-
// callbacks
// hack up a popup menu and honor the delete key as suggested at:
@@ -434,6 +430,9 @@
g_free (str_b);
return ret;
}
+
+ YGLABEL_WIDGET_IMPL (YTable)
+ YGSELECTION_WIDGET_IMPL (YTable)
};
#if YAST2_VERSION >= 2017005
@@ -467,7 +466,7 @@
virtual bool isShrinkable() { return shrinkable(); }
- YGWIDGET_IMPL_COMMON (YSelectionBox)
+ YGLABEL_WIDGET_IMPL (YSelectionBox)
YGSELECTION_WIDGET_IMPL (YSelectionBox)
};
@@ -548,7 +547,8 @@
// YGWidget
virtual bool isShrinkable() { return shrinkable(); }
- YGWIDGET_IMPL_COMMON (YMultiSelectionBox)
+
+ YGLABEL_WIDGET_IMPL (YMultiSelectionBox)
YGSELECTION_WIDGET_IMPL (YMultiSelectionBox)
};
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
