No changes, just simplify preprocessor checks in wxMSW wxTextEntry.

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

diff --git a/include/wx/cocoa/app.h b/include/wx/cocoa/app.h
index 50900b4f18b9d14d54b86eea1cefb4e9b7fff53a..839a4e012c5e0da1e474992fd44018602de7d902 100644 (file)
--- a/include/wx/cocoa/app.h
+++ b/include/wx/cocoa/app.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        cocoa/app.h
+// Name:        wx/cocoa/app.h

 // Purpose:     wxApp class
 // Author:      David Elliott
 // Modified by:
 // Purpose:     wxApp class
 // Author:      David Elliott
 // Modified by:


@@ -15,14 +15,14 @@
 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)
 // ------------------------------------------------------------------------


@@ -57,28 +57,18 @@ public:
     // Implement wxAppBase pure virtuals
     virtual void Exit();
 
     // Implement wxAppBase pure virtuals
     virtual void Exit();
 

-    virtual bool Yield(bool onlyIfNeeded = FALSE);

     virtual void WakeUpIdle();
     virtual void WakeUpIdle();

-    
+

     virtual bool Initialize(int& argc, wxChar **argv);
     virtual void CleanUp();
     virtual bool CallOnInit();
 
     virtual bool Initialize(int& argc, wxChar **argv);
     virtual void CleanUp();
     virtual bool CallOnInit();
 

-    
+

     virtual bool OnInit();
     virtual bool OnInitGui();
 
     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;
     // 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_
 };
 
 #endif // _WX_COCOA_APP_H_