Store hInstance in Application class on win32

[libs/core.git] / source / core / application.cpp

diff --git a/source/core/application.cpp b/source/core/application.cpp
index c93475fea972e84985f82acfb08fb030018407bd..5acae82242b0a6d4106c7d647460934fd6acae12 100644 (file)
--- a/source/core/application.cpp
+++ b/source/core/application.cpp
@@ -24,7 +24,7 @@ application throws a UsageError, the static usage() function is called.
 This function can only be called once.  The global main() function provided by
 the library normally does it automatically at program startup.
 */
 This function can only be called once.  The global main() function provided by
 the library normally does it automatically at program startup.
 */

-int Application::run(int argc, char **argv)
+int Application::run(int argc, char **argv, void *data)

 {
        static bool called=false;
        if(called)
 {
        static bool called=false;
        if(called)


@@ -40,6 +40,8 @@ int Application::run(int argc, char **argv)
                return 126;
        }
 
                return 126;
        }
 

+       data_=data;
+

        try
        {
                try
        try
        {
                try


@@ -201,5 +203,6 @@ Application::RegBase::RegBase()
 
 Application *Application::app_=0;
 Application::RegBase *Application::reg_app_=0;
 
 Application *Application::app_=0;
 Application::RegBase *Application::reg_app_=0;

+void *Application::data_=0;

 
 } // namespace Msp
 
 } // namespace Msp