[yast-commit] r50770 - in /branches/tmp/dmacvicar/yast-xmlui/libyui: ./ examples/ package/ src/

Author: dmacvicar Date: Sun Sep 7 01:00:39 2008 New Revision: 50770 URL: http://svn.opensuse.org/viewcvs/yast?rev=50770&view=rev Log: fix build and merge from trunk Added: branches/tmp/dmacvicar/yast-xmlui/libyui/src/YButtonBox.cc - copied unchanged from r50769, trunk/libyui/src/YButtonBox.cc branches/tmp/dmacvicar/yast-xmlui/libyui/src/YButtonBox.h - copied unchanged from r50769, trunk/libyui/src/YButtonBox.h branches/tmp/dmacvicar/yast-xmlui/libyui/src/YEnvVar.cc - copied unchanged from r50769, trunk/libyui/src/YEnvVar.cc branches/tmp/dmacvicar/yast-xmlui/libyui/src/YEnvVar.h - copied unchanged from r50769, trunk/libyui/src/YEnvVar.h Modified: branches/tmp/dmacvicar/yast-xmlui/libyui/ (props changed) branches/tmp/dmacvicar/yast-xmlui/libyui/VERSION branches/tmp/dmacvicar/yast-xmlui/libyui/examples/Makefile.am branches/tmp/dmacvicar/yast-xmlui/libyui/package/yast2-libyui.changes branches/tmp/dmacvicar/yast-xmlui/libyui/src/Makefile.am branches/tmp/dmacvicar/yast-xmlui/libyui/src/YColor.h branches/tmp/dmacvicar/yast-xmlui/libyui/src/YPushButton.cc branches/tmp/dmacvicar/yast-xmlui/libyui/src/YPushButton.h branches/tmp/dmacvicar/yast-xmlui/libyui/src/YTypes.h branches/tmp/dmacvicar/yast-xmlui/libyui/src/YUI.cc branches/tmp/dmacvicar/yast-xmlui/libyui/src/YUI.h branches/tmp/dmacvicar/yast-xmlui/libyui/src/YUIException.h branches/tmp/dmacvicar/yast-xmlui/libyui/src/YUISymbols.h branches/tmp/dmacvicar/yast-xmlui/libyui/src/YUIXMLReader.cc branches/tmp/dmacvicar/yast-xmlui/libyui/src/YWidgetFactory.h Modified: branches/tmp/dmacvicar/yast-xmlui/libyui/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/yast-xmlui/libyui/VERSION?rev=50770&r1=50769&r2=50770&view=diff ============================================================================== --- branches/tmp/dmacvicar/yast-xmlui/libyui/VERSION (original) +++ branches/tmp/dmacvicar/yast-xmlui/libyui/VERSION Sun Sep 7 01:00:39 2008 @@ -1 +1 @@ -2.17.5 +2.17.7 Modified: branches/tmp/dmacvicar/yast-xmlui/libyui/examples/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/yast-xmlui/libyui/examples/Makefile.am?rev=50770&r1=50769&r2=50770&view=diff ============================================================================== --- branches/tmp/dmacvicar/yast-xmlui/libyui/examples/Makefile.am (original) +++ branches/tmp/dmacvicar/yast-xmlui/libyui/examples/Makefile.am Sun Sep 7 01:00:39 2008 @@ -6,7 +6,6 @@ noinst_PROGRAMS = \ HelloWorld \ - XULLoad \ XMLLoad \ ComboBox1 \ ComboBox1-editable \ @@ -18,9 +17,6 @@ HelloWorld_SOURCES = HelloWorld.cc HelloWorld_LDADD = -L$(top_srcdir)/src -lyui -XULLoad_SOURCES = XULLoad.cc -XULLoad_LDADD = -L$(top_srcdir)/src -lyui - XMLLoad_SOURCES = XMLLoad.cc XMLLoad_LDADD = -L$(top_srcdir)/src -lyui Modified: branches/tmp/dmacvicar/yast-xmlui/libyui/package/yast2-libyui.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/yast-xmlui/libyui/package/yast2-libyui.changes?rev=50770&r1=50769&r2=50770&view=diff ============================================================================== --- branches/tmp/dmacvicar/yast-xmlui/libyui/package/yast2-libyui.changes (original) +++ branches/tmp/dmacvicar/yast-xmlui/libyui/package/yast2-libyui.changes Sun Sep 7 01:00:39 2008 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Thu Sep 4 14:47:46 CEST 2008 - sh@suse.de + +- Allow ButtonBox sanity check to be relaxed (bnc #422612) +- V 2.17.7 + +------------------------------------------------------------------- +Thu Aug 21 15:28:14 CEST 2008 - sh@suse.de + +- Added YButtonBox widget (fate #303446) +- V 2.17.6 + +------------------------------------------------------------------- Tue Jul 15 19:12:22 CEST 2008 - sh@suse.de - Implemented fate #303492: Multi selection for table widget Modified: branches/tmp/dmacvicar/yast-xmlui/libyui/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/yast-xmlui/libyui/src/Makefile.am?rev=50770&r1=50769&r2=50770&view=diff ============================================================================== --- branches/tmp/dmacvicar/yast-xmlui/libyui/src/Makefile.am (original) +++ branches/tmp/dmacvicar/yast-xmlui/libyui/src/Makefile.am Sun Sep 7 01:00:39 2008 @@ -26,6 +26,7 @@ YCommandLine.cc \ YEvent.cc \ YEventFilter.cc \ + YEnvVar.cc \ YItem.cc \ YMacro.cc \ YProperty.cc \ @@ -48,6 +49,7 @@ YAlignment.cc \ YBarGraph.cc \ YBusyIndicator.cc \ + YButtonBox.cc \ YCheckBox.cc \ YCheckBoxFrame.cc \ YComboBox.cc \ @@ -109,6 +111,7 @@ YCommandLine.h \ YEvent.h \ YEventFilter.h \ + YEnvVar.h \ YItem.h \ YMenuItem.h \ YMacro.h \ @@ -138,6 +141,7 @@ YAlignment.h \ YBarGraph.h \ YBusyIndicator.h \ + YButtonBox.h \ YCheckBoxFrame.h \ YCheckBox.h \ YComboBox.h \ Modified: branches/tmp/dmacvicar/yast-xmlui/libyui/src/YColor.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/yast-xmlui/libyui/src/YColor.h?rev=50770&r1=50769&r2=50770&view=diff ============================================================================== --- branches/tmp/dmacvicar/yast-xmlui/libyui/src/YColor.h (original) +++ branches/tmp/dmacvicar/yast-xmlui/libyui/src/YColor.h Sun Sep 7 01:00:39 2008 @@ -17,6 +17,7 @@ /-*/ #ifndef YColor_h +#define YColor_h typedef unsigned char uchar; @@ -80,6 +81,4 @@ }; -#define YColor_h - #endif // YColor_h Modified: branches/tmp/dmacvicar/yast-xmlui/libyui/src/YPushButton.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/yast-xmlui/libyui/src/YPushButton.cc?rev=50770&r1=50769&r2=50770&view=diff ============================================================================== --- branches/tmp/dmacvicar/yast-xmlui/libyui/src/YPushButton.cc (original) +++ branches/tmp/dmacvicar/yast-xmlui/libyui/src/YPushButton.cc Sun Sep 7 01:00:39 2008 @@ -37,12 +37,14 @@ , isDefaultButton( false ) , setDefaultButtonRecursive( false ) , isHelpButton( false ) + , role( YCustomButton ) {} string label; bool isDefaultButton; bool setDefaultButtonRecursive; bool isHelpButton; + YButtonRole role; }; @@ -124,9 +126,44 @@ void YPushButton::setHelpButton( bool helpButton ) { priv->isHelpButton = helpButton; + priv->role = YHelpButton; } +void YPushButton::setRole( YButtonRole role ) +{ + priv->role = role; +} + + +YButtonRole YPushButton::role() const +{ + return priv->role; +} + + +void YPushButton::setFunctionKey( int fkey_no ) +{ + YWidget::setFunctionKey( fkey_no ); + YButtonRole oldRole = priv->role; + + switch ( functionKey() ) // base class method might have changed it + { + case 10: priv->role = YOKButton; break; + case 9: priv->role = YCancelButton; break; + case 1: priv->role = YHelpButton; break; + default: break; + } + + if ( priv->role != oldRole ) + { + yuiMilestone() << "Guessing button role " << priv->role + << " for " << this + << " from function key F" << functionKey() + << endl; + } +} + const YPropertySet & YPushButton::propertySet() @@ -174,3 +211,20 @@ } +std::ostream & operator<<( std::ostream & stream, YButtonRole role ) +{ + switch ( role ) + { + case YCustomButton: stream << "YCustomButton"; break; + case YOKButton: stream << "YOKButton"; break; + case YApplyButton: stream << "YApplyButton"; break; + case YCancelButton: stream << "YCancelButton"; break; + case YHelpButton: stream << "YHelpButton"; break; + + default: + stream << ""; + break; + } + + return stream; +} Modified: branches/tmp/dmacvicar/yast-xmlui/libyui/src/YPushButton.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/yast-xmlui/libyui/src/YPushButton.h?rev=50770&r1=50769&r2=50770&view=diff ============================================================================== --- branches/tmp/dmacvicar/yast-xmlui/libyui/src/YPushButton.h (original) +++ branches/tmp/dmacvicar/yast-xmlui/libyui/src/YPushButton.h Sun Sep 7 01:00:39 2008 @@ -84,6 +84,44 @@ virtual void setDefaultButton( bool def = true ); /** + * Set a predefined role for this button. + * + * This is important when the button is a child of a YButtonBox so the + * layout can be arranged according to the conventions of the current UI or + * desktop environment. + * + * See YButtonBox.h for more details. YButtonRole is defined in YTypes.h + * + * The default is YCustomButton, i.e., no predefined role. + * setFunctionKey() uses some heuristics to map function keys to buttons: + * + * F10 -> YOkButton + * F9 -> YCancelButton + * F1 -> YHelpButton + * + * Derived classes are free to reimplement this, but they should call this + * base class function in the overwritten function. + **/ + virtual void setRole( YButtonRole role ); + + /** + * Return the role of this button. + **/ + YButtonRole role() const; + + /** + * Assign a function key to this widget + * (1 for F1, 2 for F2, etc.; 0 for none) + * + * Reimplemented from YWidget to map function keys to button roles. + * + * Derived classes may want to overwrite this function, but they should + * call this base class function in the new function. + **/ + virtual void setFunctionKey( int fkey_no ); + + + /** * Returns 'true' if this is a "Help" button. * * When activated, a help button will traverse up its widget hierarchy and @@ -157,6 +195,9 @@ }; +std::ostream & operator<<( std::ostream & stream, YButtonRole role ); + + typedef YPushButton YIconButton; Modified: branches/tmp/dmacvicar/yast-xmlui/libyui/src/YTypes.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/yast-xmlui/libyui/src/YTypes.h?rev=50770&r1=50769&r2=50770&view=diff ============================================================================== --- branches/tmp/dmacvicar/yast-xmlui/libyui/src/YTypes.h (original) +++ branches/tmp/dmacvicar/yast-xmlui/libyui/src/YTypes.h Sun Sep 7 01:00:39 2008 @@ -71,5 +71,29 @@ }; +enum YButtonRole +{ + YCustomButton = 0, // No predefined role + YOKButton, // [OK], [Continue], [Yes], [Accept], [Next] + YApplyButton, // [Apply] + YCancelButton, // [Cancel] + YHelpButton, // [Help] + + YMaxButtonRole // For use as array size +}; + + +enum YButtonOrder +{ + YKDEButtonOrder, // [OK] [Apply] [Cancel] [Custom1] [Custom2] [Help] + // [Yes] [No] + // [Continue] [Cancel] + + YGnomeButtonOrder // [Help] [Custom1] [Custom2] [Apply] [Cancel] [OK] + // [No] [Yes] + // [Cancel] [Continue] +}; + + #endif // YTypes_h Modified: branches/tmp/dmacvicar/yast-xmlui/libyui/src/YUI.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/yast-xmlui/libyui/src/YUI.cc?rev=50770&r1=50769&r2=50770&view=diff ============================================================================== --- branches/tmp/dmacvicar/yast-xmlui/libyui/src/YUI.cc (original) +++ branches/tmp/dmacvicar/yast-xmlui/libyui/src/YUI.cc Sun Sep 7 01:00:39 2008 @@ -25,6 +25,7 @@ #include // fcntl() #include #include +#include // getenv() #define YUILogComponent "ui" #include "YUILog.h" @@ -35,8 +36,14 @@ #include "YDialog.h" #include "YApplication.h" #include "YMacro.h" +#include "YButtonBox.h" +#include "YEnvVar.h" #include "YBuiltinCaller.h" +// Environment variable to determine button order +// (set to "KDE" or "GNOME" - case insensitive) +#define ENV_BUTTON_ORDER "Y2_BUTTON_ORDER" + YUI * YUI::_ui = 0; @@ -359,6 +366,100 @@ } +void YUI::setButtonOrderFromEnvironment() +{ + YButtonOrder buttonOrder = YButtonBox::layoutPolicy().buttonOrder; + YButtonOrder oldButtonOrder = buttonOrder; + + YEnvVar lastEnv; + + // + // $DESKTOP_SESSION + // + + YEnvVar env( "DESKTOP_SESSION" ); + yuiDebug() << env << endl; + + if ( env == "kde" || + env == "xfce" ) + { + buttonOrder = YKDEButtonOrder; + lastEnv = env; + } + else if ( env == "gnome" ) + { + buttonOrder = YGnomeButtonOrder; + lastEnv = env; + } + + // + // $WINDOWMANAGER + // + + env = YEnvVar( "WINDOWMANAGER" ); + yuiDebug() << env << endl; + + if ( env.contains( "gnome" ) ) + { + buttonOrder = YGnomeButtonOrder; + lastEnv = env; + } + else if ( env.contains( "kde" ) ) + { + buttonOrder = YKDEButtonOrder; + lastEnv = env; + } + + + // + // $Y2_BUTTON_ORDER + // + + env = YEnvVar( ENV_BUTTON_ORDER ); + yuiDebug() << env << endl; + + if ( env == "gnome" ) + { + buttonOrder = YGnomeButtonOrder; + lastEnv = env; + } + else if ( env == "kde" ) + { + buttonOrder = YKDEButtonOrder; + lastEnv = env; + } + else if ( ! env.value().empty() ) + { + yuiWarning() << "Ignoring unknown value of " << env << endl; + } + + + if ( buttonOrder != oldButtonOrder ) + { + string buttonOrderStr; + + switch ( buttonOrder ) + { + case YKDEButtonOrder: + buttonOrderStr = "KDE"; + YButtonBox::setLayoutPolicy( YButtonBox::kdeLayoutPolicy() ); + break; + + case YGnomeButtonOrder: + buttonOrderStr = "GNOME"; + YButtonBox::setLayoutPolicy( YButtonBox::gnomeLayoutPolicy() ); + break; + + // Intentionally omitting "default" branch so GCC can catch unhandled enums + } + + yuiMilestone() << "Switching to " << buttonOrderStr + << " button order because of " << lastEnv + << endl; + } +} + + // // ---------------------------------------------------------------------- // Modified: branches/tmp/dmacvicar/yast-xmlui/libyui/src/YUI.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/yast-xmlui/libyui/src/YUI.h?rev=50770&r1=50769&r2=50770&view=diff ============================================================================== --- branches/tmp/dmacvicar/yast-xmlui/libyui/src/YUI.h (original) +++ branches/tmp/dmacvicar/yast-xmlui/libyui/src/YUI.h Sun Sep 7 01:00:39 2008 @@ -280,6 +280,17 @@ **/ bool waitForYCPThread(); + /** + * Set the button order (in YButtonBox widgets) from environment + * variables: + * + * $Y2_BUTTON_ORDER="KDE" + * $Y2_BUTTON_ORDER="Gnome" + * + * (all case insensitive) + **/ + void setButtonOrderFromEnvironment(); + // // Data members Modified: branches/tmp/dmacvicar/yast-xmlui/libyui/src/YUIException.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/yast-xmlui/libyui/src/YUIException.h?rev=50770&r1=50769&r2=50770&view=diff ============================================================================== --- branches/tmp/dmacvicar/yast-xmlui/libyui/src/YUIException.h (original) +++ branches/tmp/dmacvicar/yast-xmlui/libyui/src/YUIException.h Sun Sep 7 01:00:39 2008 @@ -682,9 +682,13 @@ /** - * Exception class for "invalid child": - * Attempt to remove a child from a children manager that is not in that - * manager's children list. + * Exception class for "invalid child". One of: + * + * - Attempt to remove a child from a children manager that is not in that + * manager's children list. + * + * - Child widget of wrong type added to a container widget, e.g., anything + * other than a YPushButton added to a YButtonBox. **/ template<class YWidget> class YUIInvalidChildException: public YUIException { @@ -868,7 +872,7 @@ { public: YUICantLoadAnyUIException() - : YUIException("No $DISPLAY and stdout is not a tty" ) + : YUIException( "No $DISPLAY and stdout is not a tty" ) {} virtual ~YUICantLoadAnyUIException() throw() @@ -876,6 +880,22 @@ }; +/** + * Exception class for "wrong button roles in YButtonBox" + **/ +class YUIButtonRoleMismatchException: public YUIException +{ +public: + + YUIButtonRoleMismatchException( const string & msg ) + : YUIException( msg ) + {} + + virtual ~YUIButtonRoleMismatchException() throw() + {} +}; + + // // Helper templates // Modified: branches/tmp/dmacvicar/yast-xmlui/libyui/src/YUISymbols.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/yast-xmlui/libyui/src/YUISymbols.h?rev=50770&r1=50769&r2=50770&view=diff ============================================================================== --- branches/tmp/dmacvicar/yast-xmlui/libyui/src/YUISymbols.h (original) +++ branches/tmp/dmacvicar/yast-xmlui/libyui/src/YUISymbols.h Sun Sep 7 01:00:39 2008 @@ -73,6 +73,8 @@ // Mandatory widgets #define YUIWidget_Bottom "Bottom" +#define YUIWidget_BusyIndicator "BusyIndicator" +#define YUIWidget_ButtonBox "ButtonBox" #define YUIWidget_CheckBox "CheckBox" #define YUIWidget_CheckBoxFrame "CheckBoxFrame" #define YUIWidget_ComboBox "ComboBox" @@ -88,14 +90,14 @@ #define YUIWidget_HWeight "HWeight" #define YUIWidget_Heading "Heading" #define YUIWidget_IconButton "IconButton" -#define YUIWidget_InputField "InputField" #define YUIWidget_Image "Image" +#define YUIWidget_InputField "InputField" #define YUIWidget_IntField "IntField" #define YUIWidget_Label "Label" #define YUIWidget_Left "Left" #define YUIWidget_LogView "LogView" -#define YUIWidget_MenuButton "MenuButton" #define YUIWidget_MarginBox "MarginBox" +#define YUIWidget_MenuButton "MenuButton" #define YUIWidget_MinHeight "MinHeight" #define YUIWidget_MinSize "MinSize" #define YUIWidget_MinWidth "MinWidth" @@ -103,6 +105,7 @@ #define YUIWidget_MultiSelectionBox "MultiSelectionBox" #define YUIWidget_PackageSelector "PackageSelector" #define YUIWidget_Password "Password" +#define YUIWidget_PkgSpecial "PkgSpecial" #define YUIWidget_ProgressBar "ProgressBar" #define YUIWidget_PushButton "PushButton" #define YUIWidget_RadioButton "RadioButton" @@ -121,8 +124,6 @@ #define YUIWidget_VSquash "VSquash" #define YUIWidget_VStretch "VStretch" #define YUIWidget_VWeight "VWeight" -#define YUIWidget_PkgSpecial "PkgSpecial" -#define YUIWidget_BusyIndicator "BusyIndicator" // Special (optional) widgets @@ -147,11 +148,12 @@ // Widget properties +#define YUIProperty_Alive "Alive" #define YUIProperty_Cell "Cell" #define YUIProperty_CurrentBranch "CurrentBranch" #define YUIProperty_CurrentButton "CurrentButton" -#define YUIProperty_CurrentSize "CurrentSize" #define YUIProperty_CurrentItem "CurrentItem" +#define YUIProperty_CurrentSize "CurrentSize" #define YUIProperty_DebugLabel "DebugLabel" #define YUIProperty_EasterEgg "EasterEgg" #define YUIProperty_Enabled "Enabled" @@ -173,23 +175,25 @@ #define YUIProperty_OpenItems "OpenItems" #define YUIProperty_SelectedItems "SelectedItems" #define YUIProperty_Text "Text" +#define YUIProperty_Timeout "Timeout" #define YUIProperty_ValidChars "ValidChars" #define YUIProperty_Value "Value" #define YUIProperty_Values "Values" #define YUIProperty_VisibleLines "VisibleLines" #define YUIProperty_WidgetClass "WidgetClass" #define YUIProperty_WidgetName "WidgetName" -#define YUIProperty_Timeout "Timeout" -#define YUIProperty_Alive "Alive" // Widget and dialog options #define YUIOpt_animated "animated" +#define YUIOpt_applyButton "applyButton" #define YUIOpt_autoScrollDown "autoScrollDown" #define YUIOpt_autoShortcut "autoShortcut" #define YUIOpt_boldFont "boldFont" +#define YUIOpt_cancelButton "cancelButton" #define YUIOpt_centered "centered" +#define YUIOpt_customButton "customButton" #define YUIOpt_debugLayout "debugLayout" #define YUIOpt_decorated "decorated" #define YUIOpt_default "default" @@ -209,10 +213,12 @@ #define YUIOpt_multiSelection "multiSelection" #define YUIOpt_noAutoEnable "noAutoEnable" #define YUIOpt_notify "notify" +#define YUIOpt_okButton "okButton" #define YUIOpt_outputField "outputField" #define YUIOpt_plainText "plainText" -#define YUIOpt_repoMode "repoMode" +#define YUIOpt_relaxSanityCheck "relaxSanityCheck" #define YUIOpt_repoMgr "repoMgr" +#define YUIOpt_repoMode "repoMode" #define YUIOpt_scaleToFit "scaleToFit" #define YUIOpt_searchMode "searchMode" #define YUIOpt_shrinkable "shrinkable" Modified: branches/tmp/dmacvicar/yast-xmlui/libyui/src/YUIXMLReader.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/yast-xmlui/libyui/src/YUIXMLReader.cc?rev=50770&r1=50769&r2=50770&view=diff ============================================================================== --- branches/tmp/dmacvicar/yast-xmlui/libyui/src/YUIXMLReader.cc (original) +++ branches/tmp/dmacvicar/yast-xmlui/libyui/src/YUIXMLReader.cc Sun Sep 7 01:00:39 2008 @@ -7,7 +7,7 @@ #include "YUI.h" -#define YUILogComponent "YUIXULReader" +#define YUILogComponent "YUIXMLReader" #include "YUILog.h" #include "YUISymbols.h" Modified: branches/tmp/dmacvicar/yast-xmlui/libyui/src/YWidgetFactory.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/yast-xmlui/libyui/src/YWidgetFactory.h?rev=50770&r1=50769&r2=50770&view=diff ============================================================================== --- branches/tmp/dmacvicar/yast-xmlui/libyui/src/YWidgetFactory.h (original) +++ branches/tmp/dmacvicar/yast-xmlui/libyui/src/YWidgetFactory.h Sun Sep 7 01:00:39 2008 @@ -27,6 +27,7 @@ class YWidget; class YAlignment; +class YButtonBox; class YCheckBox; class YCheckBoxFrame; class YComboBox; @@ -85,7 +86,8 @@ YLayoutBox * createVBox ( YWidget * parent ); YLayoutBox * createHBox ( YWidget * parent ); - virtual YLayoutBox * createLayoutBox ( YWidget * parent, YUIDimension dimension ) = 0; + virtual YLayoutBox * createLayoutBox ( YWidget * parent, YUIDimension dimension ) = 0; + virtual YButtonBox * createButtonBox ( YWidget * parent ) = 0; // // Common Leaf Widgets @@ -150,7 +152,7 @@ YAlignment * createMinWidth ( YWidget * parent, YLayoutSize_t minWidth ); YAlignment * createMinHeight ( YWidget * parent, YLayoutSize_t minHeight ); YAlignment * createMinSize ( YWidget * parent, YLayoutSize_t minWidth, YLayoutSize_t minHeight ); - + virtual YAlignment * createAlignment ( YWidget * parent, YAlignmentType horAlignment, YAlignmentType vertAlignment ) = 0; YSquash * createHSquash ( YWidget * parent ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org