mirror of
https://github.com/pocoproject/poco.git
synced 2025-02-21 06:37:42 +01:00
Linux fixes
This commit is contained in:
parent
ecefa6121c
commit
d9c505331d
@ -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
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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);
|
||||
}
|
||||
{
|
||||
|
@ -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);
|
||||
|
@ -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
|
||||
|
@ -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);
|
||||
|
@ -8,7 +8,7 @@
|
||||
|
||||
include $(POCO_BASE)/build/rules/global
|
||||
|
||||
objects = Renderable Renderer RenderContext LookAndFeel Type Event Delegate \
|
||||
objects = Renderable Renderer RenderContext LookAndFeel Type Delegate \
|
||||
Formatter IntFormatter DoubleFormatter \
|
||||
View ContainerView Control Cell Button ButtonCell TextField TextFieldCell \
|
||||
Label Form Table Page BoolFormatter DataRetriever \
|
||||
@ -22,7 +22,8 @@ objects = Renderable Renderer RenderContext LookAndFeel Type Event Delegate \
|
||||
TableModel TableColumn SimpleTableModel \
|
||||
PasswordField PasswordFieldCell TimeField TimeFieldCell \
|
||||
WebApplication RequestProcessor RequestHandler \
|
||||
SubmitButton SubmitButtonCell ResourceManager
|
||||
SubmitButton SubmitButtonCell ResourceManager \
|
||||
StringFormatter WebWidgetsException JSDelegate
|
||||
|
||||
target = PocoWebWidgets
|
||||
target_version = $(LIBVERSION)
|
||||
|
@ -53,7 +53,7 @@ class Event
|
||||
/// This class holds arguments for events.
|
||||
{
|
||||
public:
|
||||
Event(typename V* pView):
|
||||
Event(V* pView):
|
||||
/// Creates an Event for the given View.
|
||||
_pView(pView)
|
||||
{
|
||||
@ -86,7 +86,7 @@ public:
|
||||
return *_pView;
|
||||
}
|
||||
|
||||
typename V* viewPtr() const
|
||||
V* viewPtr() const
|
||||
/// Returns the View that was the source of the event.
|
||||
{
|
||||
return _pView;
|
||||
@ -96,7 +96,7 @@ public:
|
||||
private:
|
||||
Event();
|
||||
|
||||
typename V* _pView;
|
||||
V* _pView;
|
||||
};
|
||||
|
||||
|
||||
|
@ -37,7 +37,7 @@
|
||||
#include "Poco/WebWidgets/TabView.h"
|
||||
|
||||
|
||||
#define NO_VIEW_SELECTED -1
|
||||
#define NO_VIEW_SELECTED 0xffffffffu
|
||||
|
||||
|
||||
namespace Poco {
|
||||
|
@ -35,7 +35,7 @@
|
||||
|
||||
|
||||
#include "Poco/WebWidgets/WebWidgetsException.h"
|
||||
|
||||
#include <typeinfo>
|
||||
|
||||
namespace Poco {
|
||||
namespace WebWidgets {
|
||||
|
@ -65,7 +65,7 @@ RELEASEOPT_LINK = -O2
|
||||
#
|
||||
# System Specific Flags
|
||||
#
|
||||
SYSFLAGS = -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_REENTRANT -D_THREAD_SAFE -DPOCO_NO_FPENVIRONMENT -DPOCO_NO_WSTRING
|
||||
SYSFLAGS = -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_REENTRANT -D_THREAD_SAFE -DPOCO_NO_FPENVIRONMENT -DPOCO_NO_WSTRING -DPOCO_NO_SHAREDMEMORY
|
||||
|
||||
#
|
||||
# System Specific Libraries
|
||||
|
@ -8,3 +8,5 @@ Data/SQLite
|
||||
Data/ODBC
|
||||
ApacheConnector
|
||||
CppUnit
|
||||
WebWidgets
|
||||
WebWidgets/ExtJS
|
||||
|
Loading…
x
Reference in New Issue
Block a user