Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

applied patch fixing problems with X server crash when using wxGLCanvas with nVidia cards (patch 1155132)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33104 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-03-27 18:06:43 +00:00
parent 8d36b2167d
commit 34a34b020f
8 changed files with 404 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/gtk/app.h
View File

@@ -61,8 +61,9 @@ public:
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();

7
include/wx/gtk/glcanvas.h
View File

@@ -160,7 +160,9 @@ public:
*m_sharedContext;
wxGLCanvas *m_sharedContextOf;
void *m_vi; // actually an XVisualInfo*
GLXFBConfig *m_fbc;
bool m_canFreeVi;
bool m_canFreeFBC;
GtkWidget *m_glWidget;
bool m_exposed;
@@ -169,7 +171,12 @@ public:
// caller is reponsible for using XFree() to deallocate
// the returned structure.
static void* ChooseGLVisual(int *attribList);
static void* ChooseGLFBC(int *attribList);
static void GetGLAttribListFromWX(int *wx_attribList, int *gl_attribList );
static void QueryGLXVersion();
static int GetGLXVersion();
static int m_glxVersion;
private:
DECLARE_EVENT_TABLE()
DECLARE_CLASS(wxGLCanvas)