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

Refactor all code common to X11 OpenGL implementations into glx11.h/.cpp

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45486 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-04-15 23:06:45 +00:00
parent e4e83f385a
commit 498ace9e1f
13 changed files with 711 additions and 976 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,37 +12,13 @@
#ifndef _WX_GLCANVAS_H_
#define _WX_GLCANVAS_H_
extern "C"
{
#include <GL/gl.h>
#include <GL/glx.h>
#include <GL/glu.h>
}
//---------------------------------------------------------------------------
// wxGLContext
//---------------------------------------------------------------------------
class WXDLLEXPORT wxGLContext : public wxGLContextBase
{
public:
wxGLContext(wxWindow* win, const wxGLContext* other = NULL);
virtual ~wxGLContext();
virtual void SetCurrent(const wxGLCanvas& win) const;
private:
GLXContext m_glContext;
DECLARE_CLASS(wxGLContext)
};
#include "wx/unix/glx11.h"
//---------------------------------------------------------------------------
// wxGLCanvas
//---------------------------------------------------------------------------
class WXDLLEXPORT wxGLCanvas : public wxGLCanvasBase
class WXDLLEXPORT wxGLCanvas : public wxGLCanvasX11
{
public:
wxGLCanvas(wxWindow *parent,
@@ -63,20 +39,11 @@ public:
const int *attribList = NULL,
const wxPalette& palette = wxNullPalette);
virtual ~wxGLCanvas();
// implement wxGLCanvasBase methods
// implement wxGLCanvasX11 methods
// --------------------------------
virtual void SwapBuffers();
// GTK-specific helpers
// --------------------
// return GLX version: 13 means 1.3
static int GetGLXVersion();
virtual Window GetXWindow() const;
// deprecated methods
@@ -125,10 +92,6 @@ public:
// implementation from now on
void OnInternalIdle();
void *m_vi; // actually an XVisualInfo*
GLXFBConfig *m_fbc;
bool m_canFreeVi;
bool m_canFreeFBC;
GtkWidget *m_glWidget;
bool m_exposed;
@@ -138,14 +101,6 @@ public:
const bool m_createImplicitContext;
#endif // WXWIN_COMPATIBILITY_2_8
// returns an XVisualInfo* based on desired GL attributes;
// returns NULL if an appropriate visual is not found. The
// caller is reponsible for using XFree() to deallocate
// the returned structure.
static void* ChooseGLVisual(const int *attribList);
static void* ChooseGLFBC(const int *attribList);
static void GetGLAttribListFromWX(const int *wx_attribList, int *gl_attribList );
private:
DECLARE_CLASS(wxGLCanvas)
};