projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added semicolons after HASH_MAP macros
[wxWidgets.git]
/
include
/
wx
/
gtk1
/
app.h
diff --git
a/include/wx/gtk1/app.h
b/include/wx/gtk1/app.h
index e031a2ce9f57e48fa50487b2c2887a13fed79fc8..398275be7191ae5cee77feb78a846e13730d8ebf 100644
(file)
--- a/
include/wx/gtk1/app.h
+++ b/
include/wx/gtk1/app.h
@@
-10,7
+10,7
@@
#ifndef __GTKAPPH__
#define __GTKAPPH__
#ifndef __GTKAPPH__
#define __GTKAPPH__
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(__APPLE__)
#pragma interface
#endif
#pragma interface
#endif
@@
-47,8
+47,7
@@
public:
virtual bool Pending();
virtual void Dispatch();
virtual bool Yield(bool onlyIfNeeded = FALSE);
virtual bool Pending();
virtual void Dispatch();
virtual bool Yield(bool onlyIfNeeded = FALSE);
-
- virtual wxIcon GetStdIcon(int which) const;
+ virtual bool ProcessIdle();
// implementation only from now on
void OnIdle( wxIdleEvent &event );
// implementation only from now on
void OnIdle( wxIdleEvent &event );
@@
-59,11
+58,10
@@
public:
static bool InitialzeVisual();
static void CleanUp();
static bool InitialzeVisual();
static void CleanUp();
- bool ProcessIdle();
void DeletePendingObjects();
#ifdef __WXDEBUG__
void DeletePendingObjects();
#ifdef __WXDEBUG__
- virtual void OnAssert(const wxChar *file, int line, const wxChar *msg);
+ virtual void OnAssert(const wxChar *file, int line, const wxChar *
cond, const wxChar *
msg);
bool IsInAssert() const { return m_isInAssert; }
#endif // __WXDEBUG__
bool IsInAssert() const { return m_isInAssert; }
#endif // __WXDEBUG__
@@
-76,16
+74,21
@@
public:
#endif
unsigned char *m_colorCube;
#endif
unsigned char *m_colorCube;
- //
used by the the wxGLApp and wxGLCanvas class for GL-based X visual
+ //
Used by the the wxGLApp and wxGLCanvas class for GL-based X visual
// selection; this is actually an XVisualInfo*
void *m_glVisualInfo;
// selection; this is actually an XVisualInfo*
void *m_glVisualInfo;
-
+ // 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__
bool m_isInAssert;
#endif // __WXDEBUG__
private:
// true if we're inside an assert modal dialog
#ifdef __WXDEBUG__
bool m_isInAssert;
#endif // __WXDEBUG__
+ bool CallInternalIdle( wxWindow* win );
+
DECLARE_DYNAMIC_CLASS(wxApp)
DECLARE_EVENT_TABLE()
};
DECLARE_DYNAMIC_CLASS(wxApp)
DECLARE_EVENT_TABLE()
};