projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wxCocoa: Added wxGauge
[wxWidgets.git]
/
include
/
wx
/
mgl
/
app.h
diff --git
a/include/wx/mgl/app.h
b/include/wx/mgl/app.h
index 8cb604c6a13879d74274d1141083ed41e8e45e24..e3bb8a3b38e75b676de2c276b8062fc4a50bfade 100644
(file)
--- a/
include/wx/mgl/app.h
+++ b/
include/wx/mgl/app.h
@@
-3,7
+3,7
@@
// Purpose:
// Author: Vaclav Slavik
// Id: $Id$
// Purpose:
// Author: Vaclav Slavik
// Id: $Id$
-// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
+// Copyright: (c) 2001
-2002
SciTech Software, Inc. (www.scitechsoft.com)
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@
-23,6
+23,7
@@
class WXDLLEXPORT wxApp;
class WXDLLEXPORT wxLog;
class WXDLLEXPORT wxApp;
class WXDLLEXPORT wxLog;
+class WXDLLEXPORT wxEventLoop;
//-----------------------------------------------------------------------------
// wxApp
//-----------------------------------------------------------------------------
// wxApp
@@
-47,24
+48,21
@@
public:
virtual bool Pending();
virtual void Dispatch();
virtual bool Pending();
virtual void Dispatch();
- virtual wxIcon GetStdIcon(int which) const;
+ virtual bool Initialize(int& argc, wxChar **argv);
+ virtual void CleanUp();
- // implementation only from now on
- void OnIdle(wxIdleEvent &event);
- bool SendIdleEvents();
- bool SendIdleEvents(wxWindow* win);
+ virtual bool Yield(bool onlyIfNeeded = FALSE);
- static bool Initialize();
- static void CleanUp();
-
- bool ProcessIdle();
- void DeletePendingObjects();
+ virtual wxDisplayModeInfo GetDisplayMode() const { return m_displayMode; }
+ virtual bool SetDisplayMode(const wxDisplayModeInfo& mode);
private:
DECLARE_DYNAMIC_CLASS(wxApp)
DECLARE_EVENT_TABLE()
private:
DECLARE_DYNAMIC_CLASS(wxApp)
DECLARE_EVENT_TABLE()
+
+ wxEventLoop *m_mainLoop;
+ wxDisplayModeInfo m_displayMode;
};
};
-int WXDLLEXPORT wxEntry(int argc, char *argv[]);
-
#endif // __WX_APP_H__
#endif // __WX_APP_H__
+