projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update setup.h for univ
[wxWidgets.git]
/
include
/
wx
/
mgl
/
app.h
diff --git
a/include/wx/mgl/app.h
b/include/wx/mgl/app.h
index e3bb8a3b38e75b676de2c276b8062fc4a50bfade..8bd35c976032f56d720774d5ff202b7c69218e61 100644
(file)
--- a/
include/wx/mgl/app.h
+++ b/
include/wx/mgl/app.h
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: app.h
+// Name:
wx/mgl/
app.h
// Purpose:
// Author: Vaclav Slavik
// Id: $Id$
// Purpose:
// Author: Vaclav Slavik
// Id: $Id$
@@
-10,20
+10,17
@@
#ifndef __WX_APP_H__
#define __WX_APP_H__
#ifndef __WX_APP_H__
#define __WX_APP_H__
-#ifdef __GNUG__
-#pragma interface "app.h"
-#endif
-
#include "wx/frame.h"
#include "wx/icon.h"
#include "wx/frame.h"
#include "wx/icon.h"
+#include "wx/vidmode.h"
//-----------------------------------------------------------------------------
// classes
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
// classes
//-----------------------------------------------------------------------------
-class WXDLL
EXPORT
wxApp;
-class WXDLL
EXPORT
wxLog;
-class WXDLL
EXPORT
wxEventLoop;
+class WXDLL
IMPEXP_FWD_CORE
wxApp;
+class WXDLL
IMPEXP_FWD_CORE
wxLog;
+class WXDLL
IMPEXP_FWD_CORE
wxEventLoop;
//-----------------------------------------------------------------------------
// wxApp
//-----------------------------------------------------------------------------
// wxApp
@@
-33,7
+30,7
@@
class WXDLLEXPORT wxApp: public wxAppBase
{
public:
wxApp();
{
public:
wxApp();
- ~wxApp();
+
virtual
~wxApp();
/* override for altering the way wxGTK intializes the GUI
* (palette/visual/colorcube). under wxMSW, OnInitGui() does nothing by
/* override for altering the way wxGTK intializes the GUI
* (palette/visual/colorcube). under wxMSW, OnInitGui() does nothing by
@@
-42,27
+39,20
@@
public:
virtual bool OnInitGui();
// override base class (pure) virtuals
virtual bool OnInitGui();
// override base class (pure) virtuals
- virtual int MainLoop();
- virtual void ExitMainLoop();
- virtual bool Initialized();
- virtual bool Pending();
- virtual void Dispatch();
-
virtual bool Initialize(int& argc, wxChar **argv);
virtual void CleanUp();
virtual bool Initialize(int& argc, wxChar **argv);
virtual void CleanUp();
+ virtual void Exit();
+ virtual void WakeUpIdle();
virtual bool Yield(bool onlyIfNeeded = FALSE);
virtual bool Yield(bool onlyIfNeeded = FALSE);
- virtual wx
DisplayModeInfo
GetDisplayMode() const { return m_displayMode; }
- virtual bool SetDisplayMode(const wx
DisplayModeInfo
& mode);
+ virtual wx
VideoMode
GetDisplayMode() const { return m_displayMode; }
+ virtual bool SetDisplayMode(const wx
VideoMode
& mode);
private:
DECLARE_DYNAMIC_CLASS(wxApp)
private:
DECLARE_DYNAMIC_CLASS(wxApp)
- DECLARE_EVENT_TABLE()
-
- wxEventLoop *m_mainLoop;
- wxDisplayModeInfo m_displayMode;
+
+ wxVideoMode m_displayMode;
};
#endif // __WX_APP_H__
};
#endif // __WX_APP_H__
-