Hello community,
here is the log from the commit of package libyui-ncurses-pkg for
openSUSE:Factory checked in at 2012-10-05 13:46:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libyui-ncurses-pkg (Old)
and /work/SRC/openSUSE:Factory/.libyui-ncurses-pkg.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libyui-ncurses-pkg", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/libyui-ncurses-pkg/libyui-ncurses-pkg.changes
2012-09-11 09:12:12.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.libyui-ncurses-pkg.new/libyui-ncurses-pkg.changes
2012-10-06 18:39:05.000000000 +0200
@@ -1,0 +2,8 @@
+Thu Oct 4 11:29:12 CEST 2012 - [email protected]
+
+- NCPkgTable: bug-fix for sorting the list of packages
+- Show function keys in bottom line correctly
+
+- Version 2.43.0
+
+-------------------------------------------------------------------
Old:
----
libyui-ncurses-pkg-2.42.2.tar.bz2
New:
----
libyui-ncurses-pkg-2.43.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libyui-ncurses-pkg-doc.spec ++++++
--- /var/tmp/diff_new_pack.wg0wgy/_old 2012-10-06 18:39:07.000000000 +0200
+++ /var/tmp/diff_new_pack.wg0wgy/_new 2012-10-06 18:39:07.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package libyui-ncurses-pkg (Version 2.42.2)
+# spec file for package libyui-ncurses-pkg (Version 2.43.0)
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -16,7 +16,7 @@
#
Name: libyui-ncurses-pkg-doc
-Version: 2.42.2
+Version: 2.43.0
Release: 0
License: LGPL-2.1 or LGPL-3.0
Source: libyui-ncurses-pkg-%{version}.tar.bz2
++++++ libyui-ncurses-pkg.spec ++++++
--- /var/tmp/diff_new_pack.wg0wgy/_old 2012-10-06 18:39:07.000000000 +0200
+++ /var/tmp/diff_new_pack.wg0wgy/_new 2012-10-06 18:39:07.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package libyui-ncurses-pkg (Version 2.42.2)
+# spec file for package libyui-ncurses-pkg (Version 2.43.0)
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -18,7 +18,7 @@
# norootforbuild
Name: libyui-ncurses-pkg
-Version: 2.42.2
+Version: 2.43.0
Release: 0
License: LGPL-2.1 or LGPL-3.0
Source: libyui-ncurses-pkg-%{version}.tar.bz2
@@ -29,7 +29,7 @@
BuildRequires: gcc-c++
BuildRequires: pkg-config
-%define libyui_ncurses_devel_version libyui-ncurses-devel >= 2.42.0
+%define libyui_ncurses_devel_version libyui-ncurses-devel >= 2.43.0
BuildRequires: %{libyui_ncurses_devel_version}
%define libzypp_devel_version libzypp-devel >= 11.4.0
BuildRequires: %{libzypp_devel_version}
++++++ libyui-ncurses-pkg-2.42.2.tar.bz2 -> libyui-ncurses-pkg-2.43.0.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-pkg-2.42.2/ChangeLog
new/libyui-ncurses-pkg-2.43.0/ChangeLog
--- old/libyui-ncurses-pkg-2.42.2/ChangeLog 2012-09-07 14:21:18.000000000
+0200
+++ new/libyui-ncurses-pkg-2.43.0/ChangeLog 2012-10-04 11:58:31.000000000
+0200
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Thu Oct 4 11:29:12 CEST 2012 - [email protected]
+
+- NCPkgTable: bug-fix for sorting the list of packages
+- Show function keys in bottom line correctly
+
+- Version 2.43.0
+
+-------------------------------------------------------------------
Fri Sep 7 13:51:19 CEST 2012 - [email protected]
- Version 2.42.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-pkg-2.42.2/VERSION.cmake
new/libyui-ncurses-pkg-2.43.0/VERSION.cmake
--- old/libyui-ncurses-pkg-2.42.2/VERSION.cmake 2012-09-07 14:21:18.000000000
+0200
+++ new/libyui-ncurses-pkg-2.43.0/VERSION.cmake 2012-10-04 11:58:31.000000000
+0200
@@ -1,6 +1,6 @@
SET( VERSION_MAJOR "2" )
-SET( VERSION_MINOR "42" )
-SET( VERSION_PATCH "2" )
+SET( VERSION_MINOR "43" )
+SET( VERSION_PATCH "0" )
SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" )
##### This is need for the libyui core, ONLY.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-pkg-2.42.2/libyui-ncurses-pkg.spec.in
new/libyui-ncurses-pkg-2.43.0/libyui-ncurses-pkg.spec.in
--- old/libyui-ncurses-pkg-2.42.2/libyui-ncurses-pkg.spec.in 2012-09-07
14:21:18.000000000 +0200
+++ new/libyui-ncurses-pkg-2.43.0/libyui-ncurses-pkg.spec.in 2012-10-04
11:58:31.000000000 +0200
@@ -29,7 +29,7 @@
BuildRequires: gcc-c++
BuildRequires: pkg-config
-%define libyui_ncurses_devel_version libyui-ncurses-devel >= 2.42.0
+%define libyui_ncurses_devel_version libyui-ncurses-devel >= 2.43.0
BuildRequires: %{libyui_ncurses_devel_version}
%define libzypp_devel_version libzypp-devel >= 11.4.0
BuildRequires: %{libzypp_devel_version}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-pkg-2.42.2/src/NCPackageSelector.cc
new/libyui-ncurses-pkg-2.43.0/src/NCPackageSelector.cc
--- old/libyui-ncurses-pkg-2.42.2/src/NCPackageSelector.cc 2012-09-07
14:21:18.000000000 +0200
+++ new/libyui-ncurses-pkg-2.43.0/src/NCPackageSelector.cc 2012-10-04
11:58:31.000000000 +0200
@@ -136,7 +136,10 @@
readSysconfig();
saveState ();
diskspacePopup = new NCPkgDiskspace( testMode );
-
+
+ setIgnoreAlreadyRecommended( isIgnoreAlreadyRecommended() );
+ setAutoCheck( isAutoCheck() );
+ setVerifySystem( isVerifySystem() );
}
@@ -146,8 +149,8 @@
//
NCPackageSelector::~NCPackageSelector()
{
- // Changed because of new libyui: don't call delete for the popups;
- // call YDialog::deleteTopmostDialog() instead at the end of
+ // Don't call delete for the popups in destructor but call
+ // YDialog::deleteTopmostDialog() instead at the end of
// NCPackageSelectorPlugin::runPkgSelection
}
@@ -168,7 +171,7 @@
void NCPackageSelector::readSysconfig()
{
- std::map <std::string, std::string> sysconfig =
zypp::base::sysconfig::read( PATH_TO_YAST_SYSCONFIG );
+ sysconfig = zypp::base::sysconfig::read( PATH_TO_YAST_SYSCONFIG );
std::map <std::string,std::string>::const_iterator it =
sysconfig.find("PKGMGR_ACTION_AT_EXIT");
if (it != sysconfig.end())
@@ -195,6 +198,9 @@
yuiMilestone() << "Executing system cmd " << cmd << " returned " << ret
<< endl;
}
+ //
+ // FIXME/TODO: use zypp::base::syconfig::write (as soon as available) to
write
+ // actionAtExit, autoCheck, verifySystem, ignoreRecommended
}
bool NCPackageSelector::checkNow( bool *ok )
@@ -207,7 +213,7 @@
return ret;
}
-bool NCPackageSelector::verifySystem( bool *ok )
+bool NCPackageSelector::systemVerification( bool *ok )
{
bool ret = false;
@@ -217,6 +223,10 @@
return ret;
}
+//
+// 'Clean dependencies on remove' option' is NOT saved and cannot be set in
/etc/sysconfig/yast2.
+// The package selector starts with setting from /etc/zypp/zypp.conf (default
is false).
+//
bool NCPackageSelector::isCleanDepsOnRemove()
{
return zypp::getZYpp()->resolver()->cleandepsOnRemove();
@@ -224,29 +234,101 @@
void NCPackageSelector::setCleanDepsOnRemove( bool on )
{
- return zypp::getZYpp()->resolver()->setCleandepsOnRemove( on );
+ zypp::getZYpp()->resolver()->setCleandepsOnRemove( on );
+ zypp::getZYpp()->resolver()->resolvePool();
+ updatePackageList();
}
+//
+// 'Ignore recommended for already installed packages' option can be set and
is saved
+// in /etc/sysconfig/yast2
+//
bool NCPackageSelector::isIgnoreAlreadyRecommended()
{
- return zypp::getZYpp()->resolver()->ignoreAlreadyRecommended();
+ std::map <std::string,std::string>::const_iterator it =
sysconfig.find("PKGMGR_IGNORE_RECOMMENDED");
+
+ if ( it != sysconfig.end() )
+ {
+ yuiMilestone() << "PKGMGR_IGNORE_RECOMMENDED: " << it->second << endl;
+ if ( it->second == "true" )
+ ignoreRecommended = true;
+ else if ( it->second == "false")
+ ignoreRecommended = false;
+ else
+ ignoreRecommended =
zypp::getZYpp()->resolver()->ignoreAlreadyRecommended();
+ }
+ else
+ {
+ ignoreRecommended =
zypp::getZYpp()->resolver()->ignoreAlreadyRecommended();
+ }
+ yuiMilestone() << "ignoreRecommended: " <<
(ignoreRecommended?"true":"false") << endl;
+
+ return ignoreRecommended;
}
void NCPackageSelector::setIgnoreAlreadyRecommended( bool on )
{
- return zypp::getZYpp()->resolver()->setIgnoreAlreadyRecommended( on );
+ ignoreRecommended = on;
+ zypp::getZYpp()->resolver()->setIgnoreAlreadyRecommended( on );
+ // solve after changing the solver settings
+ zypp::getZYpp()->resolver()->resolvePool();
+ updatePackageList();
+}
+
+
+bool NCPackageSelector::isAutoCheck()
+{
+ // automatic dependency check is on by default (check on every click)
+
+ std::map <std::string,std::string>::const_iterator it =
sysconfig.find("PKGMGR_AUTO_CHECK");
+
+ if ( it != sysconfig.end() )
+ {
+ yuiMilestone() << "PKGMGR_AUTO_CHECK: " << it->second << endl;
+ if ( it->second == "false" )
+ autoCheck = false;
+ }
+ yuiMilestone() << "autoCheck " << (autoCheck?"true":"false") << endl;
+
+ return autoCheck;
}
bool NCPackageSelector::isVerifySystem( )
{
- return zypp::getZYpp()->resolver()->systemVerification();
+ std::map <std::string,std::string>::const_iterator it =
sysconfig.find("PKGMGR_VERIFY_SYSTEM");
+
+ if ( it != sysconfig.end() )
+ {
+ yuiMilestone() << "PKGMGR_VERIFY_SYSTEM: " << it->second << endl;
+ if ( it->second == "true" )
+ verifySystem = true;
+ else if ( it->second == "false")
+ verifySystem = false;
+ else
+ verifySystem = zypp::getZYpp()->resolver()->systemVerification();
+ }
+ else
+ {
+ verifySystem = zypp::getZYpp()->resolver()->systemVerification();
+ }
+ yuiMilestone() << "verifySystem: " << (verifySystem?"true":"false") <<
endl;
+
+ return verifySystem;
}
void NCPackageSelector::setVerifySystem( bool on )
{
- return zypp::getZYpp()->resolver()->setSystemVerification( on );
+ verifySystem = on;
+ zypp::getZYpp()->resolver()->setSystemVerification( on );
+ // solve after changing the solver settings
+ zypp::getZYpp()->resolver()->resolvePool();
+ updatePackageList();
}
+//
+// 'Allow vendor change' option is NOT saved and cannot be set in
/etc/sysconfig/yast2.
+// The package selector starts with setting from /etc/zypp/zypp.conf (default
is false).
+//
bool NCPackageSelector::isAllowVendorChange()
{
zypp::Resolver_Ptr resolver = zypp::getZYpp()->resolver();
@@ -257,7 +339,9 @@
void NCPackageSelector::setAllowVendorChange( bool on )
{
- return zypp::getZYpp()->resolver()->setAllowVendorChange( on );
+ zypp::getZYpp()->resolver()->setAllowVendorChange( on );
+ zypp::getZYpp()->resolver()->resolvePool();
+ updatePackageList();
}
//////////////////////////////////////////////////////////////////
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-pkg-2.42.2/src/NCPackageSelector.h
new/libyui-ncurses-pkg-2.43.0/src/NCPackageSelector.h
--- old/libyui-ncurses-pkg-2.42.2/src/NCPackageSelector.h 2012-09-07
14:21:18.000000000 +0200
+++ new/libyui-ncurses-pkg-2.43.0/src/NCPackageSelector.h 2012-10-04
11:58:31.000000000 +0200
@@ -150,8 +150,13 @@
bool repoMgrEnabled; // Manage repositories (add menu button
"Configuration")
bool repoMode; // Start with "Repositories" filter view
bool summaryMode; // Start with "Summary" filter view
- bool autoCheck;
+ std::map <std::string, std::string> sysconfig; // sysconfig values
+
+ bool autoCheck; // dependency check on every 'click'
+ bool verifySystem; // system verification mode
+ bool ignoreRecommended; // option ignore recommended for
already installed packages
+
std::string actionAtExit;
YRpmGroupsTree * _rpmGroupsTree; // rpm groups of the found packages
@@ -265,11 +270,10 @@
NCPkgSearchSettings *SearchSettings() { return searchSet; }
bool checkNow( bool *ok );
- bool verifySystem( bool *ok );
-
- std::string ActionAtExit() { return actionAtExit; }
- void setActionAtExit( std::string action ) { actionAtExit = action; }
+ bool systemVerification( bool *ok );
+
+
/**
* Fills the package table with YOU patches matching the filter
* @param filter
@@ -305,32 +309,54 @@
*/
bool fillPatchSearchList( const std::string & expr, bool checkName, bool
checkSum );
+ /**
+ * Fills the default package table
+ */
bool fillDefaultList();
-
+
bool isYouMode() { return youMode; }
bool isUpdateMode() { return updateMode; }
bool isRepoMgrEnabled() { return repoMgrEnabled; }
- bool isAutoCheck() { return autoCheck; }
+ bool isTestMode() { return testMode; }
+
+ //
+ // Action at exit (means "summary", "restart" or "close") is written to
+ // /etc/sysconfig/yast2 and gets evaluated by the YaST packager workflow.
+ //
+ std::string ActionAtExit() { return actionAtExit; }
+ void setActionAtExit( std::string action ) { actionAtExit = action; }
+ //
+ // The solver options 'cleanup dependencies on remove' and
+ // 'is allow vendor change' can only be set in /etc/zypp/zypp.conf.
+ //
bool isCleanDepsOnRemove();
void setCleanDepsOnRemove( bool on );
- bool isIgnoreAlreadyRecommended();
- void setIgnoreAlreadyRecommended( bool on );
-
bool isAllowVendorChange();
void setAllowVendorChange( bool on );
+ //
+ // The solver options 'ignore recommended for already installed' and
+ // 'verify system' can be changed in UI and are written to
/etc/sysconfig/yast2.
+ //
+ bool isIgnoreAlreadyRecommended();
+ void setIgnoreAlreadyRecommended( bool on );
+ bool IgnoreRecommended() { return ignoreRecommended; }
+
bool isVerifySystem();
void setVerifySystem( bool on );
-
- bool isTestMode() { return testMode; }
-
- void AutoCheck( bool check) { autoCheck = check; }
-
+ bool VerifySystem() { return verifySystem; }
+ //
+ // The 'automatic dependency check' setting is also saved in
/etc/sysconfig/yast2
+ //
+ bool isAutoCheck();
+ void setAutoCheck( bool check) { autoCheck = check; }
+ bool AutoCheck() { return autoCheck; }
+
/**
* Handle the given event. For the given event (the widget-id
* is contained in the event) the corresponding handler is executed.
@@ -420,12 +446,6 @@
NCPkgMenuFilter::PatchFilter filter );
/**
- * Returns whether automatic dependency is on or off
- * @return bool
- */
- bool autoChecking() { return autoCheck; }
-
- /**
* Shows 'End User License Agreement' popup with license text
* @param pkgName the package name
* @param license the license text
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libyui-ncurses-pkg-2.42.2/src/NCPackageSelectorPluginImpl.cc
new/libyui-ncurses-pkg-2.43.0/src/NCPackageSelectorPluginImpl.cc
--- old/libyui-ncurses-pkg-2.42.2/src/NCPackageSelectorPluginImpl.cc
2012-09-07 14:21:18.000000000 +0200
+++ new/libyui-ncurses-pkg-2.43.0/src/NCPackageSelectorPluginImpl.cc
2012-10-04 11:58:31.000000000 +0200
@@ -159,17 +159,20 @@
NCursesEvent event = NCursesEvent::cancel;
NCDialog * ncd = static_cast<NCDialog *>( dialog );
- if ( ncSelector )
+ if ( ncSelector && ncd )
{
try
{
ncSelector->showDefaultList();
+ ncd->setStatusLine(); // show function keys
yuiMilestone() << "NCDialog: " << ncd << endl;
do
{
event = ncd->userInput();
result = ncSelector->handleEvent( event );
- yuiDebug() << "Result: " << (result?"true":"false") << endl;
+ // reset to function keys of the main dialog
+ ncd->setStatusLine();
+ yuiMilestone() << "Result of handleEvent: " <<
(result?"true":"false") << endl;
}
while ( event != NCursesEvent::cancel && result == true );
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-pkg-2.42.2/src/NCPkgMenuDeps.cc
new/libyui-ncurses-pkg-2.43.0/src/NCPkgMenuDeps.cc
--- old/libyui-ncurses-pkg-2.42.2/src/NCPkgMenuDeps.cc 2012-09-07
14:21:18.000000000 +0200
+++ new/libyui-ncurses-pkg-2.43.0/src/NCPkgMenuDeps.cc 2012-10-04
11:58:31.000000000 +0200
@@ -79,7 +79,7 @@
autoCheckDeps = new YMenuItem( CHECK_BOX + _( "&Automatic Dependency
Check" ) );
items.push_back( autoCheckDeps );
- setSelected( autoCheckDeps, pkg->isAutoCheck() );
+ setSelected( autoCheckDeps, pkg->AutoCheck() );
checkNow = new YMenuItem( NO_CHECK_BOX + _( "&Check Dependencies Now" ) );
items.push_back( checkNow );
@@ -89,10 +89,11 @@
ignoreAlreadyRecommendedOpt = new YMenuItem( CHECK_BOX + _( "&Ignore
Recommended Packages for Already Installed Packages" ) );
items.push_back( ignoreAlreadyRecommendedOpt );
- setSelected( ignoreAlreadyRecommendedOpt,
pkg->isIgnoreAlreadyRecommended() );
+ setSelected( ignoreAlreadyRecommendedOpt, pkg->IgnoreRecommended() );
verifySystemOpt = new YMenuItem( CHECK_BOX + _( "&System Verification
Mode" ) );
items.push_back( verifySystemOpt );
+ setSelected( verifySystemOpt, pkg->VerifySystem() );
cleanDepsOnRemove = new YMenuItem( CHECK_BOX + _( "&Cleanup when deleting
packages" ) );
items.push_back ( cleanDepsOnRemove );
@@ -186,16 +187,16 @@
bool NCPkgMenuDeps::setAutoCheck()
{
- pkg->AutoCheck( !pkg->isAutoCheck() );
- setSelected( autoCheckDeps, pkg->isAutoCheck() );
+ pkg->setAutoCheck( !pkg->AutoCheck() );
+ setSelected( autoCheckDeps, pkg->AutoCheck() );
return true;
}
bool NCPkgMenuDeps::setVerifySystem()
{
- pkg->setVerifySystem( !pkg->isVerifySystem() );
- setSelected( verifySystemOpt, pkg->isVerifySystem() );
+ pkg->setVerifySystem( !pkg->VerifySystem() );
+ setSelected( verifySystemOpt, pkg->VerifySystem() );
return true;
}
@@ -210,8 +211,8 @@
bool NCPkgMenuDeps::setIgnoreAlreadyRecommended()
{
- pkg->setIgnoreAlreadyRecommended( !pkg->isIgnoreAlreadyRecommended() );
- setSelected( ignoreAlreadyRecommendedOpt,
pkg->isIgnoreAlreadyRecommended() );
+ pkg->setIgnoreAlreadyRecommended( !pkg->IgnoreRecommended() );
+ setSelected( ignoreAlreadyRecommendedOpt, pkg->IgnoreRecommended() );
return true;
}
@@ -233,7 +234,7 @@
pkg->saveState();
//call the solver (with S_Verify it displays no popup)
- pkg->verifySystem ( &ok );
+ pkg->systemVerification( &ok );
//display the popup with automatic changes
NCPkgPopupTable * autoChangePopup = new NCPkgPopupTable( wpos( 3, 8 ), pkg
);
@@ -262,6 +263,6 @@
pkg->updatePackageList();
pkg->showDiskSpace();
// the verify call sets the option verify to true
- setSelected( verifySystemOpt, pkg->isVerifySystem() );
+ setSelected( verifySystemOpt, true );
return true;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-pkg-2.42.2/src/NCPkgTable.cc
new/libyui-ncurses-pkg-2.43.0/src/NCPkgTable.cc
--- old/libyui-ncurses-pkg-2.42.2/src/NCPkgTable.cc 2012-09-07
14:21:18.000000000 +0200
+++ new/libyui-ncurses-pkg-2.43.0/src/NCPkgTable.cc 2012-10-04
11:58:31.000000000 +0200
@@ -40,6 +40,7 @@
/-*/
#define YUILogComponent "ncurses-pkg"
#include <YUILog.h>
+#include <YDialog.h>
#include "NCurses.h"
#include "NCPkgTable.h"
@@ -822,6 +823,10 @@
}
}
+ NCDialog * currentDialog = static_cast<NCDialog
*>(YDialog::topmostDialog());
+ if ( currentDialog )
+ currentDialog->setStatusLine();
+
return NCursesEvent::handled;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-pkg-2.42.2/src/NCPkgTable.h
new/libyui-ncurses-pkg-2.43.0/src/NCPkgTable.h
--- old/libyui-ncurses-pkg-2.42.2/src/NCPkgTable.h 2012-09-07
14:21:18.000000000 +0200
+++ new/libyui-ncurses-pkg-2.43.0/src/NCPkgTable.h 2012-10-04
11:58:31.000000000 +0200
@@ -155,7 +155,7 @@
std::wstring w2 = second->GetCol( _uiCol
)->Label().getText().begin()->str();
int result = wcscoll ( w1.data(), w2.data() );
- if ( result <= 0 )
+ if ( result < 0 )
return true;
else
return false;
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
