projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
we need our own imaglist implementation because in wxmac wxIcon does not inherit...
[wxWidgets.git]
/
include
/
wx
/
cocoa
/
app.h
diff --git
a/include/wx/cocoa/app.h
b/include/wx/cocoa/app.h
index ac4078563f0f38c93894aa58f0387cdb0932433c..d0e7c782614656374a41b6e1a4d07085283c67c2 100644
(file)
--- a/
include/wx/cocoa/app.h
+++ b/
include/wx/cocoa/app.h
@@
-4,14
+4,17
@@
// Author: David Elliott
// Modified by:
// Created: 2002/11/27
// Author: David Elliott
// Modified by:
// Created: 2002/11/27
-// RCS-ID: $Id
:
+// RCS-ID: $Id
$
// Copyright: (c) 2002 David Elliott
// Copyright: (c) 2002 David Elliott
-// Licence: wxWindows licen
s
e
+// Licence: wxWindows licen
c
e
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_COCOA_APP_H_
#define _WX_COCOA_APP_H_
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_COCOA_APP_H_
#define _WX_COCOA_APP_H_
+// ========================================================================
+// wxApp
+// ========================================================================
// Represents the application. Derive OnInit and declare
// a new App object to start application
class WXDLLEXPORT wxApp: public wxAppBase
// Represents the application. Derive OnInit and declare
// a new App object to start application
class WXDLLEXPORT wxApp: public wxAppBase
@@
-30,28
+33,24
@@
public:
// ------------------------------------------------------------------------
public:
inline WX_NSApplication GetNSApplication() { return m_cocoaApp; }
// ------------------------------------------------------------------------
public:
inline WX_NSApplication GetNSApplication() { return m_cocoaApp; }
- void CocoaInstallRequestedIdleHandler() { if(m_isIdle) CocoaInstallIdleHandler(); }
- inline void CocoaRequestIdle() { m_isIdle = true; }
+ virtual void CocoaDelegate_applicationWillBecomeActive();
+ virtual void CocoaDelegate_applicationDidBecomeActive();
+ virtual void CocoaDelegate_applicationWillResignActive();
+ virtual void CocoaDelegate_applicationDidResignActive();
protected:
WX_NSApplication m_cocoaApp;
protected:
WX_NSApplication m_cocoaApp;
-
void CocoaInstallIdleHandler()
;
-
bool m_isIdle
;
+
struct objc_object *m_cocoaAppDelegate
;
+
WX_NSThread m_cocoaMainThread
;
// ------------------------------------------------------------------------
// Implementation
// ------------------------------------------------------------------------
public:
// Implement wxAppBase pure virtuals
// ------------------------------------------------------------------------
// Implementation
// ------------------------------------------------------------------------
public:
// Implement wxAppBase pure virtuals
- virtual int MainLoop();
- virtual void ExitMainLoop();
- virtual bool Initialized();
- virtual bool Pending();
- virtual void Dispatch();
-
virtual void Exit();
virtual bool Yield(bool onlyIfNeeded = FALSE);
virtual void Exit();
virtual bool Yield(bool onlyIfNeeded = FALSE);
- virtual void WakeUpIdle()
{ CocoaRequestIdle(); }
+ virtual void WakeUpIdle()
;
virtual bool Initialize(int& argc, wxChar **argv);
virtual void CleanUp();
virtual bool Initialize(int& argc, wxChar **argv);
virtual void CleanUp();
@@
-60,6
+59,16
@@
public:
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__
+
+private:
+#ifdef __WXDEBUG__
+ bool m_isInAssert;
+#endif // __WXDEBUG__
};
#endif // _WX_COCOA_APP_H_
};
#endif // _WX_COCOA_APP_H_