From 45a6717998c476ad96e8b944f793b57dc4b7503c Mon Sep 17 00:00:00 2001 From: dmacvicar Date: Mon, 12 Nov 2007 15:36:39 +0000 Subject: [PATCH] fixes YUIComponent.cc(createUI):93 createUI() called before setServerOptions() git-svn-id: http://svn.opensuse.org/svn/yast/branches/tmp/sh/mod-ui/web-wt@41980 e0cc52ee-31ee-0310-8b87-e83c4596d67c --- src/Makefile.am | 3 ++- src/YWebApplication.cc | 15 +++++++++++++++ src/YWebApplication.h | 27 +++++++++++++++++++++++++++ src/YWebUI_core.cc | 9 ++++----- 4 files changed, 48 insertions(+), 6 deletions(-) create mode 100644 src/YWebApplication.cc create mode 100644 src/YWebApplication.h diff --git a/src/Makefile.am b/src/Makefile.am index 1fdcf84..e03555b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -29,7 +29,8 @@ libpy2web_la_SOURCES = \ YWebUI_widgets.cc \ YWebUI_builtins.cc \ YWebWidgetFactory.cc \ - YWebDialog.cc + YWebDialog.cc \ + YWebApplication.cc # YQPackageSelectorPlugin.cc \ diff --git a/src/YWebApplication.cc b/src/YWebApplication.cc new file mode 100644 index 0000000..233fbb5 --- /dev/null +++ b/src/YWebApplication.cc @@ -0,0 +1,15 @@ + +#include "YWebApplication.h" + + +YWebApplication::YWebApplication() +{ + +} + + +YWebApplication::~YWebApplication() +{ + +} + diff --git a/src/YWebApplication.h b/src/YWebApplication.h new file mode 100644 index 0000000..8807523 --- /dev/null +++ b/src/YWebApplication.h @@ -0,0 +1,27 @@ + +#ifndef YWebApplication_h +#define YWebApplication_h + +#include "YApplication.h" + + +class YWebApplication: public YApplication +{ +protected: + + friend class YWebUI; + + /** + * Constructor. + * + * Use YUI::app() to get the singleton for this class. + **/ + YWebApplication(); + + /** + * Destructor. + **/ + virtual ~YWebApplication(); +}; + +#endif // YWebApplication_h diff --git a/src/YWebUI_core.cc b/src/YWebUI_core.cc index 8ed20a1..9eb0662 100644 --- a/src/YWebUI_core.cc +++ b/src/YWebUI_core.cc @@ -26,10 +26,10 @@ #define y2log_component "web-ui" #include -#include #include #include "YWebUI.h" +#include "YWebApplication.h" #include "YWebWidgetFactory.h" #include "YWebOptionalWidgetFactory.h" #include "YEvent.h" @@ -103,10 +103,9 @@ YWebUI::createOptionalWidgetFactory() YApplication * YWebUI::createApplication() { -// YApplication * app = new YApplication(); -// YUI_CHECK_NEW( app ); -// FIXME - return 0L; + YWebApplication * app = new YWebApplication(); + YUI_CHECK_NEW( app ); + return app; } -- 2.39.2