fixed library order (important for static linking under Unix

[wxWidgets.git] / include / wx / init.h

diff --git a/include/wx/init.h b/include/wx/init.h
index 72c93e471ee9cf0ef2f680f7f5ddfbb49449b184..7cdcda57f8b49014ca14f98f351375f24e0ef971 100644 (file)
--- a/include/wx/init.h
+++ b/include/wx/init.h
@@ -1,11 +1,11 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        wx/init.h
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        wx/init.h

-// Purpose:     wxWindows initialization and finalization functions
+// Purpose:     wxWidgets initialization and finalization functions

 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     29.06.2003
 // RCS-ID:      $Id$
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     29.06.2003
 // RCS-ID:      $Id$

-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -19,7 +19,7 @@
 // ----------------------------------------------------------------------------
 
 // do common initialization, return true if ok (in this case wxEntryCleanup
 // ----------------------------------------------------------------------------
 
 // do common initialization, return true if ok (in this case wxEntryCleanup

-// must be called later), otherwise the program can't use wxWindows at all
+// must be called later), otherwise the program can't use wxWidgets at all

 //
 // this function also creates wxTheApp as a side effect, if IMPLEMENT_APP
 // hadn't been used a dummy default application object is created
 //
 // this function also creates wxTheApp as a side effect, if IMPLEMENT_APP
 // hadn't been used a dummy default application object is created


@@ -47,8 +47,8 @@ extern int WXDLLIMPEXP_BASE wxEntry(int& argc, wxChar **argv);
 // we overload wxEntry[Start]() to take "char **" pointers too
 #if wxUSE_UNICODE
 
 // we overload wxEntry[Start]() to take "char **" pointers too
 #if wxUSE_UNICODE
 

-extern bool wxEntryStart(int& argc, char **argv);
-extern int wxEntry(int& argc, char **argv);
+extern bool WXDLLIMPEXP_BASE wxEntryStart(int& argc, char **argv);
+extern int WXDLLIMPEXP_BASE wxEntry(int& argc, char **argv);

 
 #endif// wxUSE_UNICODE
 
 
 #endif// wxUSE_UNICODE
 


@@ -72,7 +72,10 @@ class WXDLLIMPEXP_BASE wxInitializer
 {
 public:
     // initialize the library
 {
 public:
     // initialize the library

-    wxInitializer() { m_ok = wxInitialize(); }
+    wxInitializer(int argc = 0, wxChar **argv = NULL)
+    {
+        m_ok = wxInitialize(argc, argv);
+    }

 
     // has the initialization been successful? (explicit test)
     bool IsOk() const { return m_ok; }
 
     // has the initialization been successful? (explicit test)
     bool IsOk() const { return m_ok; }