wxConvGdk is not used anymore

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

diff --git a/include/wx/app.h b/include/wx/app.h
index 6143fd4213ac71e40c765d2e827870f0420509de..c541b9015a7cd182880fdf207eee4b4d6a33a359 100644 (file)
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -26,11 +26,11 @@
 #include "wx/build.h"
 #include "wx/init.h"        // we must declare wxEntry()
 
 #include "wx/build.h"
 #include "wx/init.h"        // we must declare wxEntry()
 

-class WXDLLEXPORT_CORE wxApp;
-class WXDLLEXPORT_BASE wxAppTraits;
-class WXDLLEXPORT_BASE wxCmdLineParser;
-class WXDLLEXPORT_BASE wxLog;
-class WXDLLEXPORT_BASE wxMessageOutput;
+class WXDLLIMPEXP_CORE wxApp;
+class WXDLLIMPEXP_BASE wxAppTraits;
+class WXDLLIMPEXP_BASE wxCmdLineParser;
+class WXDLLIMPEXP_BASE wxLog;
+class WXDLLIMPEXP_BASE wxMessageOutput;

 
 // ----------------------------------------------------------------------------
 // typedefs
 
 // ----------------------------------------------------------------------------
 // typedefs


@@ -57,7 +57,7 @@ enum
 // VS: Fullscreen/framebuffer application needs to choose display mode prior
 //     to wxWindows initialization. This class holds information about display
 //     mode. It is used by  wxApp::Set/GetDisplayMode.
 // VS: Fullscreen/framebuffer application needs to choose display mode prior
 //     to wxWindows initialization. This class holds information about display
 //     mode. It is used by  wxApp::Set/GetDisplayMode.

-class WXDLLEXPORT_CORE wxDisplayModeInfo
+class WXDLLIMPEXP_CORE wxDisplayModeInfo

 {
 public:
     wxDisplayModeInfo() : m_ok(FALSE) {}
 {
 public:
     wxDisplayModeInfo() : m_ok(FALSE) {}


@@ -79,7 +79,7 @@ private:
 // wxAppConsole: wxApp for non-GUI applications
 // ----------------------------------------------------------------------------
 
 // wxAppConsole: wxApp for non-GUI applications
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT_BASE wxAppConsole : public wxEvtHandler
+class WXDLLIMPEXP_BASE wxAppConsole : public wxEvtHandler

 {
 public:
     // ctor and dtor
 {
 public:
     // ctor and dtor


@@ -97,6 +97,9 @@ public:
     // class version!
     virtual bool Initialize(int& argc, wxChar **argv);
 
     // class version!
     virtual bool Initialize(int& argc, wxChar **argv);
 

+    // This gives wxCocoa a chance to call OnInit() with a memory pool in place
+    virtual bool CallOnInit() { return OnInit(); }
+

     // Called before OnRun(), this is a good place to do initialization -- if
     // anything fails, return false from here to prevent the program from
     // continuing. The command line is normally parsed here, call the base
     // Called before OnRun(), this is a good place to do initialization -- if
     // anything fails, return false from here to prevent the program from
     // continuing. The command line is normally parsed here, call the base


@@ -302,7 +305,7 @@ protected:
 
 #if wxUSE_GUI
 
 
 #if wxUSE_GUI
 

-class WXDLLEXPORT_CORE wxAppBase : public wxAppConsole
+class WXDLLIMPEXP_CORE wxAppBase : public wxAppConsole

 {
 public:
     wxAppBase();
 {
 public:
     wxAppBase();


@@ -503,7 +506,7 @@ protected:
     #endif
 #else // !GUI
     // can't use typedef because wxApp forward declared as a class
     #endif
 #else // !GUI
     // can't use typedef because wxApp forward declared as a class

-    class WXDLLEXPORT_BASE wxApp : public wxAppConsole
+    class WXDLLIMPEXP_BASE wxApp : public wxAppConsole

     {
     };
 #endif // GUI/!GUI
     {
     };
 #endif // GUI/!GUI


@@ -516,7 +519,7 @@ protected:
 // is discouraged, consider using DECLARE_APP() after which you may call
 // wxGetApp() which will return the object of the correct type (i.e. MyApp and
 // not wxApp)
 // is discouraged, consider using DECLARE_APP() after which you may call
 // wxGetApp() which will return the object of the correct type (i.e. MyApp and
 // not wxApp)

-WXDLLEXPORT_DATA_BASE(extern wxApp*) wxTheApp;
+WXDLLIMPEXP_DATA_BASE(extern wxApp*) wxTheApp;

 
 // ----------------------------------------------------------------------------
 // global functions
 
 // ----------------------------------------------------------------------------
 // global functions


@@ -526,13 +529,13 @@ WXDLLEXPORT_DATA_BASE(extern wxApp*) wxTheApp;
 // ------------------------------------------------------
 
 // Force an exit from main loop
 // ------------------------------------------------------
 
 // Force an exit from main loop

-extern void WXDLLEXPORT_BASE wxExit();
+extern void WXDLLIMPEXP_BASE wxExit();

 
 // Yield to other apps/messages
 
 // Yield to other apps/messages

-extern bool WXDLLEXPORT_BASE wxYield();
+extern bool WXDLLIMPEXP_BASE wxYield();

 
 // Yield to other apps/messages
 
 // Yield to other apps/messages

-extern void WXDLLEXPORT_BASE wxWakeUpIdle();
+extern void WXDLLIMPEXP_BASE wxWakeUpIdle();

 
 // ----------------------------------------------------------------------------
 // macros for dynamic creation of the application object
 
 // ----------------------------------------------------------------------------
 // macros for dynamic creation of the application object


@@ -542,7 +545,7 @@ extern void WXDLLEXPORT_BASE wxWakeUpIdle();
 // creator function. wxApp can then call this function to create a new app
 // object. Convoluted, but necessary.
 
 // creator function. wxApp can then call this function to create a new app
 // object. Convoluted, but necessary.
 

-class WXDLLEXPORT_BASE wxAppInitializer
+class WXDLLIMPEXP_BASE wxAppInitializer

 {
 public:
     wxAppInitializer(wxAppInitializerFunction fn)
 {
 public:
     wxAppInitializer(wxAppInitializerFunction fn)