projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Get rid of wxFontMapper in wxBase library.
[wxWidgets.git]
/
include
/
wx
/
gtk
/
app.h
diff --git
a/include/wx/gtk/app.h
b/include/wx/gtk/app.h
index fea48cf032eb2829df87aa165a316b328a07a54e..fd4fa6226bbaadc0d519176a2bd6c41d69105053 100644
(file)
--- a/
include/wx/gtk/app.h
+++ b/
include/wx/gtk/app.h
@@
-10,7
+10,7
@@
#ifndef __GTKAPPH__
#define __GTKAPPH__
#ifndef __GTKAPPH__
#define __GTKAPPH__
-#if defined(__GNUG__) && !defined(
__APPLE__
)
+#if defined(__GNUG__) && !defined(
NO_GCC_PRAGMA
)
#pragma interface
#endif
#pragma interface
#endif
@@
-41,24
+41,10
@@
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 void Exit();
-
virtual bool Yield(bool onlyIfNeeded = FALSE);
virtual bool Yield(bool onlyIfNeeded = FALSE);
- virtual bool ProcessIdle();
virtual void WakeUpIdle();
virtual void WakeUpIdle();
- // implementation only from now on
- void OnIdle( wxIdleEvent &event );
- bool SendIdleEvents();
- bool SendIdleEvents( wxWindow* win );
-
- virtual bool Initialize(int argc, wxChar **argv);
+ virtual bool Initialize(int& argc, wxChar **argv);
virtual void CleanUp();
static bool InitialzeVisual();
virtual void CleanUp();
static bool InitialzeVisual();
@@
-69,12
+55,9
@@
public:
bool IsInAssert() const { return m_isInAssert; }
#endif // __WXDEBUG__
bool IsInAssert() const { return m_isInAssert; }
#endif // __WXDEBUG__
- bool m_initialized;
-
gint m_idleTag;
gint m_idleTag;
-#if wxUSE_THREADS
- gint m_wakeUpTimerTag;
-#endif
+ void RemoveIdleTag();
+
unsigned char *m_colorCube;
// Used by the the wxGLApp and wxGLCanvas class for GL-based X visual
unsigned char *m_colorCube;
// Used by the the wxGLApp and wxGLCanvas class for GL-based X visual
@@
-90,12
+73,8
@@
private:
bool m_isInAssert;
#endif // __WXDEBUG__
bool m_isInAssert;
#endif // __WXDEBUG__
- bool CallInternalIdle( wxWindow* win );
-
DECLARE_DYNAMIC_CLASS(wxApp)
DECLARE_EVENT_TABLE()
};
DECLARE_DYNAMIC_CLASS(wxApp)
DECLARE_EVENT_TABLE()
};
-int WXDLLEXPORT wxEntry( int argc, char *argv[] );
-
#endif // __GTKAPPH__
#endif // __GTKAPPH__