applied (slightly modified) wxGLApp patch for MSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11717 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1,6 +1,10 @@
|
||||
#ifndef _WX_GLCANVAS_H_BASE_
|
||||
#define _WX_GLCANVAS_H_BASE_
|
||||
|
||||
#include "wx/defs.h"
|
||||
|
||||
#if wxUSE_GLCANVAS
|
||||
|
||||
#if defined(__WXMSW__)
|
||||
#include "wx/msw/glcanvas.h"
|
||||
#elif defined(__WXMOTIF__)
|
||||
@@ -15,5 +19,22 @@
|
||||
#include "wx/stubs/glcanvas.h"
|
||||
#endif
|
||||
|
||||
class WXDLLEXPORT wxGLApp : public wxApp
|
||||
{
|
||||
public:
|
||||
wxGLApp() : wxApp() { }
|
||||
virtual ~wxGLApp();
|
||||
|
||||
// use this in the constructor of the user-derived wxGLApp class to
|
||||
// determine if an OpenGL rendering context with these attributes
|
||||
// is available - returns TRUE if so, FALSE if not.
|
||||
bool InitGLVisual(int *attribList);
|
||||
|
||||
private:
|
||||
DECLARE_DYNAMIC_CLASS(wxGLApp)
|
||||
};
|
||||
|
||||
#endif
|
||||
// wxUSE_GLCANVAS
|
||||
#endif
|
||||
// _WX_GLCANVAS_H_BASE_
|
||||
|
@@ -16,10 +16,6 @@
|
||||
#ifndef _WX_GLCANVAS_H_
|
||||
#define _WX_GLCANVAS_H_
|
||||
|
||||
#include "wx/defs.h"
|
||||
|
||||
#if wxUSE_GLCANVAS
|
||||
|
||||
#include "wx/scrolwin.h"
|
||||
#include "wx/app.h"
|
||||
|
||||
@@ -178,30 +174,6 @@ private:
|
||||
DECLARE_CLASS(wxGLCanvas)
|
||||
};
|
||||
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
// wxGLApp
|
||||
//---------------------------------------------------------------------------
|
||||
|
||||
class WXDLLEXPORT wxGLApp: public wxApp
|
||||
{
|
||||
public:
|
||||
wxGLApp() : wxApp() { }
|
||||
~wxGLApp();
|
||||
|
||||
// use this in the constructor of the user-derived wxGLApp class to select
|
||||
// an appropriate X visual for GL. Returns TRUE if an appropriate visual
|
||||
// is found - and sets m_glVisualInfo; FALSE otherwise.
|
||||
bool InitGLVisual(int *attribList);
|
||||
|
||||
private:
|
||||
DECLARE_DYNAMIC_CLASS(wxGLApp)
|
||||
};
|
||||
|
||||
|
||||
#endif
|
||||
// wxUSE_GLCANVAS
|
||||
|
||||
#endif
|
||||
// _WX_GLCANVAS_H_
|
||||
|
||||
|
@@ -16,10 +16,6 @@
|
||||
#ifndef _WX_GLCANVAS_H_
|
||||
#define _WX_GLCANVAS_H_
|
||||
|
||||
#include "wx/defs.h"
|
||||
|
||||
#if wxUSE_GLCANVAS
|
||||
|
||||
#include "wx/scrolwin.h"
|
||||
#include "wx/app.h"
|
||||
|
||||
@@ -178,30 +174,6 @@ private:
|
||||
DECLARE_CLASS(wxGLCanvas)
|
||||
};
|
||||
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
// wxGLApp
|
||||
//---------------------------------------------------------------------------
|
||||
|
||||
class WXDLLEXPORT wxGLApp: public wxApp
|
||||
{
|
||||
public:
|
||||
wxGLApp() : wxApp() { }
|
||||
~wxGLApp();
|
||||
|
||||
// use this in the constructor of the user-derived wxGLApp class to select
|
||||
// an appropriate X visual for GL. Returns TRUE if an appropriate visual
|
||||
// is found - and sets m_glVisualInfo; FALSE otherwise.
|
||||
bool InitGLVisual(int *attribList);
|
||||
|
||||
private:
|
||||
DECLARE_DYNAMIC_CLASS(wxGLApp)
|
||||
};
|
||||
|
||||
|
||||
#endif
|
||||
// wxUSE_GLCANVAS
|
||||
|
||||
#endif
|
||||
// _WX_GLCANVAS_H_
|
||||
|
||||
|
@@ -16,10 +16,6 @@
|
||||
#ifndef _WX_GLCANVAS_H_
|
||||
#define _WX_GLCANVAS_H_
|
||||
|
||||
#include <wx/setup.h>
|
||||
|
||||
#if wxUSE_GLCANVAS
|
||||
|
||||
#include <wx/palette.h>
|
||||
#include <wx/scrolwin.h>
|
||||
|
||||
@@ -128,11 +124,9 @@ protected:
|
||||
wxPalette m_palette;
|
||||
WXHDC m_hDC;
|
||||
|
||||
DECLARE_EVENT_TABLE()
|
||||
DECLARE_EVENT_TABLE()
|
||||
};
|
||||
|
||||
#endif
|
||||
// wxUSE_GLCANVAS
|
||||
#endif
|
||||
// _WX_GLCANVAS_H_
|
||||
|
||||
|
Reference in New Issue
Block a user