projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
define wxUSE_UNICODE before including wx/chkconf.h which uses it
[wxWidgets.git]
/
include
/
wx
/
gtk1
/
app.h
diff --git
a/include/wx/gtk1/app.h
b/include/wx/gtk1/app.h
index ac034847691a7139423aea28ea0ea4fae9f8d279..82ee2dd180fe934d76b5978b85686b22d166f0d5 100644
(file)
--- a/
include/wx/gtk1/app.h
+++ b/
include/wx/gtk1/app.h
@@
-16,6
+16,7
@@
#include "wx/frame.h"
#include "wx/icon.h"
#include "wx/frame.h"
#include "wx/icon.h"
+#include "wx/strconv.h"
//-----------------------------------------------------------------------------
// classes
//-----------------------------------------------------------------------------
// classes
@@
-41,14
+42,6
@@
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 void WakeUpIdle();
virtual bool Yield(bool onlyIfNeeded = FALSE);
virtual void WakeUpIdle();
@@
-63,21
+56,19
@@
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
- // selection; this is actually an XVisualInfo*
- void *m_glVisualInfo;
+ // selection.
+ void *m_glVisualInfo; // this is actually an XVisualInfo*
+ void *m_glFBCInfo; // this is actually an GLXFBConfig*
// This returns the current visual: either that used by wxRootWindow
// or the XVisualInfo* for SGI.
GdkVisual *GetGdkVisual();
// This returns the current visual: either that used by wxRootWindow
// or the XVisualInfo* for SGI.
GdkVisual *GetGdkVisual();
-
+
private:
// true if we're inside an assert modal dialog
#ifdef __WXDEBUG__
private:
// true if we're inside an assert modal dialog
#ifdef __WXDEBUG__