Remove the Innotek for OS/2 addition...configure now deals with this correctly on...

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

diff --git a/include/wx/init.h b/include/wx/init.h
index 5b6672c9a768b5ee079a3d1b0cacdad1aabfc9f8..5824719e262eaa3f9ccb9d84e1dfc5a8dfd9522b 100644 (file)
--- a/include/wx/init.h
+++ b/include/wx/init.h
@@ -26,11 +26,11 @@
 //
 // note that the parameters may be modified, this is why we pass them by
 // reference!
 //
 // note that the parameters may be modified, this is why we pass them by
 // reference!

-extern bool WXDLLEXPORT wxEntryStart(int& argc, wxChar **argv);
+extern bool WXDLLIMPEXP_BASE wxEntryStart(int& argc, wxChar **argv);

 
 // free the resources allocated by the library in wxEntryStart() and shut it
 // down (wxEntryStart() may be called again afterwards if necessary)
 
 // free the resources allocated by the library in wxEntryStart() and shut it
 // down (wxEntryStart() may be called again afterwards if necessary)

-extern void WXDLLEXPORT wxEntryCleanup();
+extern void WXDLLIMPEXP_BASE wxEntryCleanup();

 
 
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------


@@ -42,8 +42,15 @@ extern void WXDLLEXPORT wxEntryCleanup();
 // but this one always exists under all platforms
 //
 // returns the program exit code
 // but this one always exists under all platforms
 //
 // returns the program exit code

-extern int WXDLLEXPORT wxEntry(int& argc, wxChar **argv);
+extern int WXDLLIMPEXP_BASE wxEntry(int& argc, wxChar **argv);

 
 

+// we overload wxEntry[Start]() to take "char **" pointers too
+#if wxUSE_UNICODE
+
+extern bool WXDLLIMPEXP_BASE wxEntryStart(int& argc, char **argv);
+extern int WXDLLIMPEXP_BASE wxEntry(int& argc, char **argv);
+
+#endif// wxUSE_UNICODE

 
 // ----------------------------------------------------------------------------
 // Using the library without (explicit) application object: you may avoid using
 
 // ----------------------------------------------------------------------------
 // Using the library without (explicit) application object: you may avoid using


@@ -53,15 +60,15 @@ extern int WXDLLEXPORT wxEntry(int& argc, wxChar **argv);
 
 // initialize the library (may be called as many times as needed, but each
 // call to wxInitialize() must be matched by wxUninitialize())
 
 // initialize the library (may be called as many times as needed, but each
 // call to wxInitialize() must be matched by wxUninitialize())

-extern bool WXDLLEXPORT wxInitialize(int argc = 0, wxChar **argv = NULL);
+extern bool WXDLLIMPEXP_BASE wxInitialize(int argc = 0, wxChar **argv = NULL);

 
 // clean up -- the library can't be used any more after the last call to
 // wxUninitialize()
 
 // clean up -- the library can't be used any more after the last call to
 // wxUninitialize()

-extern void WXDLLEXPORT wxUninitialize();
+extern void WXDLLIMPEXP_BASE wxUninitialize();

 
 // create an object of this class on stack to initialize/cleanup the library
 // automatically
 
 // create an object of this class on stack to initialize/cleanup the library
 // automatically

-class WXDLLEXPORT wxInitializer
+class WXDLLIMPEXP_BASE wxInitializer

 {
 public:
     // initialize the library
 {
 public:
     // initialize the library