X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a6f5aa49cf93fc19c776bcce0a7872bdc9707afb..ef094fa075bc56bcbc33b12159c395ea28afda3b:/include/wx/gtk1/glcanvas.h diff --git a/include/wx/gtk1/glcanvas.h b/include/wx/gtk1/glcanvas.h index 3eec4ab6ad..29f3deabc3 100644 --- a/include/wx/gtk1/glcanvas.h +++ b/include/wx/gtk1/glcanvas.h @@ -6,20 +6,16 @@ // Created: 17/8/98 // RCS-ID: $Id$ // Copyright: (c) Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "glcanvas.h" #endif #ifndef _WX_GLCANVAS_H_ #define _WX_GLCANVAS_H_ -#include "wx/defs.h" - -#if wxUSE_GLCANVAS - #include "wx/scrolwin.h" #include "wx/app.h" @@ -69,15 +65,15 @@ class WXDLLEXPORT wxGLContext: public wxObject { public: wxGLContext( bool isRGB, wxWindow *win, const wxPalette& palette = wxNullPalette ); - wxGLContext( - bool WXUNUSED(isRGB), wxWindow *win, + wxGLContext( + bool WXUNUSED(isRGB), wxWindow *win, const wxPalette& WXUNUSED(palette), const wxGLContext *other /* for sharing display lists */ ); ~wxGLContext(); void SetCurrent(); - void SetColour(const char *colour); + void SetColour(const wxChar *colour); void SwapBuffers(); void SetupPixelFormat(); @@ -95,7 +91,7 @@ public: GtkWidget *m_widget; wxPalette m_palette; wxWindow* m_window; - + private: DECLARE_CLASS(wxGLContext) }; @@ -104,7 +100,7 @@ private: // wxGLCanvas //--------------------------------------------------------------------------- -class WXDLLEXPORT wxGLCanvas: public wxScrolledWindow +class WXDLLEXPORT wxGLCanvas: public wxWindow { public: inline wxGLCanvas() { @@ -114,51 +110,52 @@ public: m_vi = (void*) NULL; m_exposed = FALSE; } - wxGLCanvas( wxWindow *parent, wxWindowID id = -1, + wxGLCanvas( wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, const wxString& name = "GLCanvas", - int *attribList = (int*) NULL, + const wxSize& size = wxDefaultSize, + long style = 0, const wxString& name = wxGLCanvasName, + int *attribList = (int*) NULL, const wxPalette& palette = wxNullPalette ); wxGLCanvas( wxWindow *parent, const wxGLContext *shared = (wxGLContext *)NULL, - wxWindowID id = -1, + wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, const wxString& name = "GLCanvas", - int *attribList = (int*) NULL, + const wxSize& size = wxDefaultSize, + long style = 0, const wxString& name = wxGLCanvasName, + int *attribList = (int*) NULL, const wxPalette& palette = wxNullPalette ); wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared = (wxGLCanvas *)NULL, - wxWindowID id = -1, + wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, const wxString& name = "GLCanvas", - int *attribList = (int*) NULL, + const wxSize& size = wxDefaultSize, + long style = 0, const wxString& name = wxGLCanvasName, + int *attribList = (int*) NULL, const wxPalette& palette = wxNullPalette ); - bool Create( wxWindow *parent, - const wxGLContext *shared = (wxGLContext*)NULL, - const wxGLCanvas *shared_context_of = (wxGLCanvas*)NULL, - wxWindowID id = -1, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, const wxString& name = "GLCanvas", - int *attribList = (int*) NULL, - const wxPalette& palette = wxNullPalette ); - + bool Create( wxWindow *parent, + const wxGLContext *shared = (wxGLContext*)NULL, + const wxGLCanvas *shared_context_of = (wxGLCanvas*)NULL, + wxWindowID id = -1, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxString& name = wxGLCanvasName, + int *attribList = (int*) NULL, + const wxPalette& palette = wxNullPalette ); + ~wxGLCanvas(); void SetCurrent(); - void SetColour(const char *colour); + void SetColour(const wxChar *colour); void SwapBuffers(); void OnSize(wxSizeEvent& event); - + void OnInternalIdle(); - inline wxGLContext* GetContext() const { return m_glContext; } + inline wxGLContext* GetContext() const { return m_glContext; } // implementation - + wxGLContext *m_glContext, *m_sharedContext; wxGLCanvas *m_sharedContextOf; @@ -166,10 +163,10 @@ public: bool m_canFreeVi; GtkWidget *m_glWidget; bool m_exposed; - + // 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 + // caller is reponsible for using XFree() to deallocate // the returned structure. static void* ChooseGLVisual(int *attribList); @@ -178,30 +175,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_