generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-16 18:56:52 +02:00
Code Issues Projects Releases Wiki Activity

Linux fixes

Browse Source
This commit is contained in:
Peter Schojer
2008-06-12 08:48:40 +00:00
parent ecefa6121c
commit d9c505331d
12 changed files with 42 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
WebWidgets/ExtJS/Makefile
View File

@@ -8,10 +8,24 @@
include $(POCO_BASE)/build/rules/global
objects = <SourceFilesHere>
objects = AbstractTableCellHandler ArrayTableSerializer \
ButtonCellRenderer CellInitializer CellRenderer \
CheckButtonCellRenderer CollapsibleRenderer \
ComboBoxCellRenderer DateFieldCellRenderer \
FormRenderer FrameRenderer GridLayoutRenderer \
HorizontalLayoutRenderer HTMLRenderer \
ImageButtonCellRenderer ImageRenderer \
LabelRenderer LayoutRenderer ListBoxCellRenderer \
NumberFieldCellRenderer PageRenderer PanelRenderer \
PasswordFieldCellRenderer ProgressIndicatorRenderer \
RadioButtonCellRenderer SubmitButtonCellRenderer \
TableCellHandlerFactory TableRenderer TabViewRenderer \
TextEditCellRenderer TextFieldCellRenderer \
TimeFieldCellRenderer ToggleButtonCellRenderer \
Utility VerticalLayoutRenderer
target = PocoExtJS
target_version = $(LIBVERSION)
target_libs = PocoFoundation
target_libs = PocoWebWidgets PocoNet PocoUtil PocoXML PocoFoundation
include $(POCO_BASE)/build/rules/lib

6
WebWidgets/ExtJS/include/Poco/WebWidgets/ExtJS/TableCellHandler.h
View File

@@ -97,7 +97,7 @@ public:
write<Ret>((pObj->*_func)(), out);
}
AbstractFunction* clone() const
AbstractFunction<Class>* clone() const
{
return new Function(_func);
}
@@ -122,7 +122,7 @@ public:
write<Ret>((pObj->*_func)(), out);
}
AbstractFunction* clone() const
AbstractFunction<Class>* clone() const
{
return new Function(_func);
}
@@ -145,7 +145,7 @@ public:
out << _str;
}
AbstractFunction* clone() const
AbstractFunction<Class>* clone() const
{
return new StaticContentFunction(_str);
}

12
WebWidgets/ExtJS/src/TableCellHandlerFactory.cpp
View File

@@ -53,32 +53,32 @@ TableCellHandlerFactory::TableCellHandlerFactory()
{
{
TableCellHandler<CheckButtonCell>::Ptr pHandle(new TableCellHandler<CheckButtonCell>("Ext.form.Checkbox", true, true));
pHandle->addDynamic("checked", &CheckButtonCell::getBool);
pHandle->addDynamic<bool>("checked", &CheckButtonCell::getBool);
registerFactory(typeid(CheckButtonCell), pHandle);
}
{
TableCellHandler<TextEditCell>::Ptr pHandle(new TableCellHandler<TextEditCell>("Ext.form.TextArea", true, true));
pHandle->addDynamic("value", &TextEditCell::getString);
pHandle->addDynamic<std::string>("value", &TextEditCell::getString);
registerFactory(typeid(TextEditCell), pHandle);
}
{
TableCellHandler<TextFieldCell>::Ptr pHandle(new TableCellHandler<TextFieldCell>("Ext.form.TextField", true, false));
pHandle->addDynamic("value", &TextFieldCell::getString);
pHandle->addDynamic<std::string>("value", &TextFieldCell::getString);
registerFactory(typeid(TextFieldCell), pHandle);
}
{
TableCellHandler<NumberFieldCell>::Ptr pHandle(new TableCellHandler<NumberFieldCell>("Ext.form.NumberField", true, false));
pHandle->addDynamic("value", &NumberFieldCell::getString);
pHandle->addDynamic<std::string>("value", &NumberFieldCell::getString);
registerFactory(typeid(NumberFieldCell), pHandle);
}
{
TableCellHandler<ComboBoxCell>::Ptr pHandle(new TableCellHandler<ComboBoxCell>("Ext.form.ComboBox", true, false));
pHandle->addDynamic("value", &ComboBoxCell::getString);
pHandle->addDynamic<std::string>("value", &ComboBoxCell::getString);
registerFactory(typeid(ComboBoxCell), pHandle);
}
{
TableCellHandler<ButtonCell>::Ptr pHandle(new TableCellHandler<ButtonCell>("Ext.Button", false, true));
pHandle->addDynamic("text", &ButtonCell::getString);
pHandle->addDynamic<std::string>("text", &ButtonCell::getString);
registerFactory(typeid(ButtonCell), pHandle);
}
{

4
WebWidgets/ExtJS/src/Utility.cpp
View File

@@ -312,7 +312,7 @@ void Utility::convertPocoDateToPHPDate(char in, std::string& result)
'`', 'a', 'M', 'u', 'd', 'j', 'f', 'g', 'h', 'u', 'j', 'k', 'l', 'm', 'n', 'm',
'p', 'q', 'r', 's', 't', 'u', 'v', 'D', 'x', 'y', 'P', '{', '|', '}', '~', '\x7F'};
//sometimes char is signed: keep this warning
if (in < 0 || in > 127)
{
result.append(1, in);
@@ -336,6 +336,7 @@ void Utility::escapeCharForPHP(char in, std::string& result)
'0', '1', '0', '1', '1', '0', '0', '1', '1', '1', '1', '0', '1', '1', '1', '1',
'0', '0', '0', '1', '1', '1', '0', '1', '0', '1', '1', '0', '0', '0', '0', '0'};
//sometimes char is signed: keep this warning
if (in < 0 || in > 127)
{
result.append(1, in);
@@ -362,6 +363,7 @@ void Utility::convertPHPDateToPocoDate(char in, std::string& result)
'`', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '{', '|', '}', '~', '\x7F'};
//sometimes char is signed: keep this warning
if (in < 0 || in > 127)
{
result.append(1, in);

4
WebWidgets/ExtJS/testsuite/Makefile
View File

@@ -9,10 +9,10 @@
include $(POCO_BASE)/build/rules/global
objects = ExtJSTestSuite Driver \
<SourceFilesHere>
ExtJSTest
target = testrunner
target_version = 1
target_libs = PocoExtJS PocoFoundation CppUnit
target_libs = PocoExtJS PocoWebWidgets PocoNet PocoXML PocoFoundation CppUnit
include $(POCO_BASE)/build/rules/exec

2
WebWidgets/ExtJS/testsuite/src/ExtJSTest.cpp
View File

@@ -1153,7 +1153,7 @@ void ExtJSTest::testFunction()
ptrBut2->setToolTip("click here to disable");
ptrFrm->add(ptrBut2);
TableCellHandler<CheckButtonCell>::Ptr pHandle(new TableCellHandler<CheckButtonCell>("Ext.form.Checkbox", false, true));
pHandle->addDynamic("checked", &CheckButtonCell::getBool);
pHandle->addDynamic<bool>("checked", &CheckButtonCell::getBool);
pHandle->addFixed("dummy", "dummy");
std::ostringstream str;
pHandle->writeData(ptrBut->cell<CheckButtonCell>(), str);