projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clean up wxEvtHandler::m_eventsLocker weirdness: there is no need to allocate it...
[wxWidgets.git]
/
include
/
wx
/
glcanvas.h
diff --git
a/include/wx/glcanvas.h
b/include/wx/glcanvas.h
index adbbb033a1341891ddbd8105b8461e0d79eb2b95..3ac73811c30d48180abc0caafae3a18349ad6dcd 100644
(file)
--- a/
include/wx/glcanvas.h
+++ b/
include/wx/glcanvas.h
@@
-20,8
+20,8
@@
#include "wx/palette.h"
#include "wx/window.h"
#include "wx/palette.h"
#include "wx/window.h"
-class WXDLLIMPEXP_GL wxGLCanvas;
-class WXDLLIMPEXP_GL wxGLContext;
+class WXDLLIMPEXP_
FWD_
GL wxGLCanvas;
+class WXDLLIMPEXP_
FWD_
GL wxGLContext;
// ----------------------------------------------------------------------------
// Constants for attributes list
// ----------------------------------------------------------------------------
// Constants for attributes list
@@
-66,7
+66,7
@@
public:
*/
// set this context as the current one
*/
// set this context as the current one
- virtual
void
SetCurrent(const wxGLCanvas& win) const = 0;
+ virtual
bool
SetCurrent(const wxGLCanvas& win) const = 0;
};
// ----------------------------------------------------------------------------
};
// ----------------------------------------------------------------------------
@@
-77,12
+77,7
@@
class WXDLLIMPEXP_GL wxGLCanvasBase : public wxWindow
{
public:
// default ctor doesn't initialize the window, use Create() later
{
public:
// default ctor doesn't initialize the window, use Create() later
- wxGLCanvasBase()
- {
-#if WXWIN_COMPATIBILITY_2_8
- m_glContext = NULL;
-#endif
- }
+ wxGLCanvasBase();
virtual ~wxGLCanvasBase();
virtual ~wxGLCanvasBase();
@@
-104,10
+99,10
@@
public:
// ----------
// set the given context associated with this window as the current one
// ----------
// set the given context associated with this window as the current one
-
void
SetCurrent(const wxGLContext& context) const;
+
bool
SetCurrent(const wxGLContext& context) const;
// flush the back buffer (if we have it)
// flush the back buffer (if we have it)
- virtual
void
SwapBuffers() = 0;
+ virtual
bool
SwapBuffers() = 0;
// accessors
// accessors
@@
-120,7
+115,7
@@
public:
// call glcolor() for the colour with the given name, return false if
// colour not found
// call glcolor() for the colour with the given name, return false if
// colour not found
- bool SetColour(const wx
Char *
colour);
+ bool SetColour(const wx
String&
colour);