bracket unused function

[wxWidgets.git] / include / wx / x11 / glcanvas.h

diff --git a/include/wx/x11/glcanvas.h b/include/wx/x11/glcanvas.h
index 2ee71b678dfcca3d149e00e724239a7a92218e51..ab61c7376a2222e5d1f05cfa33ed37d9510dab6b 100644 (file)
--- a/include/wx/x11/glcanvas.h
+++ b/include/wx/x11/glcanvas.h
@@ -13,125 +13,38 @@
 #ifndef _WX_GLCANVAS_H_
 #define _WX_GLCANVAS_H_
 
 #ifndef _WX_GLCANVAS_H_
 #define _WX_GLCANVAS_H_
 

-#include "wx/defs.h"
+#include "wx/unix/glx11.h"

 
 

-#if wxUSE_GLCANVAS
-
-#include "wx/gdicmn.h"
-#include "wx/palette.h"
-#include "wx/scrolwin.h"
-
-#include <GL/glx.h>
-
-//---------------------------------------------------------------------------
-// classes
-//---------------------------------------------------------------------------
-
-
-class WXDLLEXPORT wxGLContext: public wxObject
-{
-public:
-    wxGLContext( bool isRGB, wxWindow *win,
-        const wxPalette& palette = wxNullPalette );
-    wxGLContext( bool WXUNUSED(isRGB), wxWindow *win,
-        const wxPalette& WXUNUSED(palette),
-        const wxGLContext *other  /* for sharing display lists */
-        );
-    virtual ~wxGLContext();
-
-    void SetCurrent();
-    void SetColour(const wxChar *colour);
-    void SwapBuffers();
-
-    void SetupPixelFormat();
-    void SetupPalette(const wxPalette& palette);
-    wxPalette CreateDefaultPalette();
-
-    inline wxPalette* GetPalette() const { return (wxPalette*) & m_palette; }
-    inline wxWindow* GetWindow() const { return m_window; }
-    // inline GtkWidget* GetWidget() const { return m_widget; }
-    inline GLXContext GetContext() const { return m_glContext; }
-
-public:
-    GLXContext       m_glContext;
-
-    // GtkWidget       *m_widget;
-    wxPalette        m_palette;
-    wxWindow*        m_window;
-
-    DECLARE_CLASS(wxGLContext)
-};
-
-
-class WXDLLEXPORT wxGLCanvas: public wxScrolledWindow
+class WXDLLIMPEXP_GL wxGLCanvas : public wxGLCanvasX11

 {
 public:
 {
 public:

-    inline wxGLCanvas() {
-        m_glContext = (wxGLContext*) NULL;
-        m_sharedContext = (wxGLContext*) NULL;
-        // m_glWidget = (GtkWidget*) NULL;
-        m_vi = (void*) NULL;
-        // m_exposed = FALSE;
-    }
-    wxGLCanvas( wxWindow *parent, wxWindowID id = wxID_ANY,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = 0, const wxString& name = wxT("GLCanvas"),
-        int *attribList = (int*) NULL,
-        const wxPalette& palette = wxNullPalette );
-    wxGLCanvas( wxWindow *parent, const wxGLContext *shared,
-        wxWindowID id = wxID_ANY,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = 0, const wxString& name = wxT("GLCanvas"),
-        int *attribList = (int*) NULL,
-        const wxPalette& palette = wxNullPalette );
-    wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared,
-        wxWindowID id = wxID_ANY,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = 0, const wxString& name = wxT("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 = wxID_ANY,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = 0, const wxString& name = wxT("GLCanvas"),
-        int *attribList = (int*) NULL,
-        const wxPalette& palette = wxNullPalette );
-
-    virtual ~wxGLCanvas();
-
-    void SetCurrent();
-    void SetColour(const wxChar *colour);
-    void SwapBuffers();
-
-    // void OnSize(wxSizeEvent& event);
-
-    // void OnInternalIdle();
-
-    inline wxGLContext* GetContext() const { return m_glContext; }
-
-    // implementation
-
-    wxGLContext      *m_glContext,
-        *m_sharedContext;
-    wxGLCanvas       *m_sharedContextOf;
-    void             *m_vi;
-    // GtkWidget        *m_glWidget;
-    // bool              m_exposed;
-
-    DECLARE_EVENT_TABLE()
-        DECLARE_CLASS(wxGLCanvas)
-
+    wxGLCanvas(wxWindow *parent,
+               wxWindowID id = wxID_ANY,
+               const int *attribList = NULL,
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,
+               long style = 0,
+               const wxString& name = wxGLCanvasName,
+               const wxPalette& palette = wxNullPalette);
+
+    bool Create(wxWindow *parent,
+                wxWindowID id = wxID_ANY,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = 0,
+                const wxString& name = wxGLCanvasName,
+                const int *attribList = NULL,
+                const wxPalette& palette = wxNullPalette);
+
+    // implement wxGLCanvasX11 methods
+    // --------------------------------
+
+    virtual Window GetXWindow() const;
+
+protected:
+    virtual int GetColourIndex(const wxColour& col);
+
+    DECLARE_CLASS(wxGLCanvas)

 };
 
 };
 

-#endif
-//  wxUSE_GLCANVAS
-
-#endif
-// _WX_GLCANVAS_H_
+#endif // _WX_GLCANVAS_H_