Add wxHAS_BITMAPTOGGLEBUTTON and test for it in the unit test.

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

diff --git a/include/wx/cocoa/app.h b/include/wx/cocoa/app.h
index 326b317d02382250b1d6a4348651ec6388d66b06..2f30970f7a252a326323b8c03e043dc26bf7a51e 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;
 
-#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
-class WXDLLEXPORT wxApp: public wxAppBase
+class WXDLLIMPEXP_CORE wxApp: public wxAppBase
 {
     DECLARE_DYNAMIC_CLASS(wxApp)
-    DECLARE_EVENT_TABLE()
 // ------------------------------------------------------------------------
 // initialization
 // ------------------------------------------------------------------------
@@ -58,28 +57,18 @@ public:
     // Implement wxAppBase pure virtuals
     virtual void Exit();
 
-    virtual bool Yield(bool onlyIfNeeded = FALSE);
     virtual void WakeUpIdle();
-    
+
     virtual bool Initialize(int& argc, wxChar **argv);
     virtual void CleanUp();
     virtual bool CallOnInit();
 
-    
+
     virtual bool OnInit();
     virtual bool OnInitGui();
 
-#ifdef __WXDEBUG__
-    virtual void OnAssert(const wxChar *file, int line, const wxChar *cond, const wxChar *msg);
-    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;
-#endif // __WXDEBUG__
 };
 
 #endif // _WX_COCOA_APP_H_