Changes to template Connect() to make it compile with MSVC7 and possible other

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

diff --git a/include/wx/cocoa/app.h b/include/wx/cocoa/app.h
index 4c44be6a8e43e04f9f39792ce5096580359ba71d..bed4a07c7f3873066e78485da99400282e2800f4 100644 (file)
--- a/include/wx/cocoa/app.h
+++ b/include/wx/cocoa/app.h
@@ -15,17 +15,16 @@
 typedef struct __CFRunLoopObserver * CFRunLoopObserverRef;
 typedef const struct __CFString * CFStringRef;
 
 typedef struct __CFRunLoopObserver * CFRunLoopObserverRef;
 typedef const struct __CFString * CFStringRef;
 

-#include "wx/mac/corefoundation/cfref.h"
+#include "wx/osx/core/cfref.h"

 
 // ========================================================================
 // wxApp
 // ========================================================================
 // Represents the application. Derive OnInit and declare
 // a new App object to start application
 
 // ========================================================================
 // wxApp
 // ========================================================================
 // Represents the application. Derive OnInit and declare
 // a new App object to start application

-class WXDLLEXPORT wxApp: public wxAppBase
+class WXDLLIMPEXP_CORE wxApp: public wxAppBase

 {
     DECLARE_DYNAMIC_CLASS(wxApp)
 {
     DECLARE_DYNAMIC_CLASS(wxApp)

-    DECLARE_EVENT_TABLE()

 // ------------------------------------------------------------------------
 // initialization
 // ------------------------------------------------------------------------
 // ------------------------------------------------------------------------
 // initialization
 // ------------------------------------------------------------------------


@@ -74,6 +73,8 @@ public:
     bool IsInAssert() const { return m_isInAssert; }
 #endif // __WXDEBUG__
 
     bool IsInAssert() const { return m_isInAssert; }
 #endif // __WXDEBUG__
 

+    // Set true _before_ initializing wx to force embedded mode (no app delegate, etc.)
+    static bool sm_isEmbedded;

 private:
 #ifdef __WXDEBUG__
     bool m_isInAssert;
 private:
 #ifdef __WXDEBUG__
     bool m_isInAssert;