MSVC 5 fix.

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

diff --git a/include/wx/msw/glcanvas.h b/include/wx/msw/glcanvas.h
index db3a6149df6417c4972d370a6e019c066d0e11ba..3ae12ab890d4dc64d0da0fa36a725a51c3e9afb3 100644 (file)
--- a/include/wx/msw/glcanvas.h
+++ b/include/wx/msw/glcanvas.h
@@ -34,22 +34,22 @@
 
 enum
 {
 
 enum
 {

-  WX_GL_RGBA=1,          /* use true color palette */
-  WX_GL_BUFFER_SIZE,     /* bits for buffer if not WX_GL_RGBA */
-  WX_GL_LEVEL,           /* 0 for main buffer, >0 for overlay, <0 for underlay */
-  WX_GL_DOUBLEBUFFER,    /* use doublebuffer */
-  WX_GL_STEREO,          /* use stereoscopic display */
-  WX_GL_AUX_BUFFERS,     /* number of auxiliary buffers */
-  WX_GL_MIN_RED,         /* use red buffer with most bits (> MIN_RED bits) */
-  WX_GL_MIN_GREEN,       /* use green buffer with most bits (> MIN_GREEN bits) */
-  WX_GL_MIN_BLUE,        /* use blue buffer with most bits (> MIN_BLUE bits) */
-  WX_GL_MIN_ALPHA,       /* use blue buffer with most bits (> MIN_ALPHA bits) */
-  WX_GL_DEPTH_SIZE,      /* bits for Z-buffer (0,16,32) */
-  WX_GL_STENCIL_SIZE,    /* bits for stencil buffer */
-  WX_GL_MIN_ACCUM_RED,   /* use red accum buffer with most bits (> MIN_ACCUM_RED bits) */
-  WX_GL_MIN_ACCUM_GREEN, /* use green buffer with most bits (> MIN_ACCUM_GREEN bits) */
-  WX_GL_MIN_ACCUM_BLUE,  /* use blue buffer with most bits (> MIN_ACCUM_BLUE bits) */
-  WX_GL_MIN_ACCUM_ALPHA  /* use blue buffer with most bits (> MIN_ACCUM_ALPHA bits) */
+    WX_GL_RGBA=1,          /* use true color palette */
+    WX_GL_BUFFER_SIZE,     /* bits for buffer if not WX_GL_RGBA */
+    WX_GL_LEVEL,           /* 0 for main buffer, >0 for overlay, <0 for underlay */
+    WX_GL_DOUBLEBUFFER,    /* use doublebuffer */
+    WX_GL_STEREO,          /* use stereoscopic display */
+    WX_GL_AUX_BUFFERS,     /* number of auxiliary buffers */
+    WX_GL_MIN_RED,         /* use red buffer with most bits (> MIN_RED bits) */
+    WX_GL_MIN_GREEN,       /* use green buffer with most bits (> MIN_GREEN bits) */
+    WX_GL_MIN_BLUE,        /* use blue buffer with most bits (> MIN_BLUE bits) */
+    WX_GL_MIN_ALPHA,       /* use blue buffer with most bits (> MIN_ALPHA bits) */
+    WX_GL_DEPTH_SIZE,      /* bits for Z-buffer (0,16,32) */
+    WX_GL_STENCIL_SIZE,    /* bits for stencil buffer */
+    WX_GL_MIN_ACCUM_RED,   /* use red accum buffer with most bits (> MIN_ACCUM_RED bits) */
+    WX_GL_MIN_ACCUM_GREEN, /* use green buffer with most bits (> MIN_ACCUM_GREEN bits) */
+    WX_GL_MIN_ACCUM_BLUE,  /* use blue buffer with most bits (> MIN_ACCUM_BLUE bits) */
+    WX_GL_MIN_ACCUM_ALPHA  /* use blue buffer with most bits (> MIN_ACCUM_ALPHA bits) */

 };
 
 class WXDLLIMPEXP_GL wxGLCanvas;     /* forward reference */
 };
 
 class WXDLLIMPEXP_GL wxGLCanvas;     /* forward reference */


@@ -57,73 +57,99 @@ class WXDLLIMPEXP_GL wxGLCanvas;     /* forward reference */
 class WXDLLIMPEXP_GL wxGLContext: public wxObject
 {
 public:
 class WXDLLIMPEXP_GL wxGLContext: public wxObject
 {
 public:

-   wxGLContext(bool isRGB, wxGLCanvas *win, const wxPalette& palette = wxNullPalette);
-   wxGLContext(
-               bool isRGB, wxGLCanvas *win,
-               const wxPalette& WXUNUSED(palette),
-               const wxGLContext *other        /* for sharing display lists */
-    );
-   ~wxGLContext();
+    wxGLContext(bool isRGB, wxGLCanvas *win, const wxPalette& palette = wxNullPalette);

 
 

-   void SetCurrent();
-   void SetColour(const wxChar *colour);
-   void SwapBuffers();
+    wxGLContext( bool isRGB, wxGLCanvas *win,
+        const wxPalette& WXUNUSED(palette),
+        const wxGLContext *other /* for sharing display lists */ );

 
 

+    ~wxGLContext();

 
 

-   inline wxWindow* GetWindow() const { return m_window; }
-   inline WXHDC GetHDC() const { return m_hDC; }
-   inline HGLRC GetGLRC() const { return m_glContext; }
+
+    void SetCurrent();
+
+    void SetColour(const wxChar *colour);
+
+    void SwapBuffers();
+
+
+    inline wxWindow* GetWindow() const { return m_window; }
+
+    inline WXHDC GetHDC() const { return m_hDC; }
+
+    inline HGLRC GetGLRC() const { return m_glContext; }

 
 public:
 
 public:

-   HGLRC            m_glContext;
-   WXHDC            m_hDC;
-   wxWindow*        m_window;
+    HGLRC            m_glContext;
+    WXHDC            m_hDC;
+    wxWindow*        m_window;

 };
 
 class WXDLLIMPEXP_GL wxGLCanvas: public wxWindow
 {
 };
 
 class WXDLLIMPEXP_GL wxGLCanvas: public wxWindow
 {

-   DECLARE_CLASS(wxGLCanvas)
- public:
-   wxGLCanvas(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
+    DECLARE_CLASS(wxGLCanvas)
+public:
+    wxGLCanvas(wxWindow *parent, wxWindowID id = wxID_ANY,
+        const wxPoint& pos = wxDefaultPosition,

         const wxSize& size = wxDefaultSize, long style = 0,
         const wxSize& size = wxDefaultSize, long style = 0,

-        const wxString& name = wxGLCanvasName, int *attribList = 0, const wxPalette& palette = wxNullPalette);
-   wxGLCanvas( wxWindow *parent, const wxGLContext *shared = (wxGLContext *)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 );
+        const wxString& name = wxGLCanvasName, int *attribList = 0,
+        const wxPalette& palette = wxNullPalette);
+
+    wxGLCanvas(wxWindow *parent,
+        const wxGLContext *shared = (wxGLContext *) NULL,
+        wxWindowID id = wxID_ANY,
+        const wxPoint& pos = wxDefaultPosition,
+        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 = wxID_ANY,
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize,
+        long style = 0,
+        const wxString& name = wxGLCanvasName,
+        int *attribList = 0,
+        const wxPalette& palette = wxNullPalette);
+
+    ~wxGLCanvas();
+
+    // Replaces wxWindow::Create functionality, since
+    // we need to use a different window class
+    bool Create(wxWindow *parent, wxWindowID id,
+        const wxPoint& pos, const wxSize& size,
+        long style, const wxString& name);
+
+    void SetCurrent();
+
+#ifdef __WXUNIVERSAL__
+    virtual bool SetCurrent(bool doit) { return wxWindow::SetCurrent(doit); };
+#endif
+
+    void SetColour(const wxChar *colour);

 
 

-   wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared = (wxGLCanvas *)NULL, wxWindowID id = -1,
-        const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0,
-        const wxString& name = wxGLCanvasName, int *attribList = 0, const wxPalette& palette = wxNullPalette );
+    void SwapBuffers();

 
 

-   ~wxGLCanvas();
+    void OnSize(wxSizeEvent& event);

 
 

-   // Replaces wxWindow::Create functionality, since we need to use a different window class
-   bool Create(wxWindow *parent, wxWindowID id,
-          const wxPoint& pos, const wxSize& size, long style, const wxString& name);
+    void OnQueryNewPalette(wxQueryNewPaletteEvent& event);

 
 

-   void SetCurrent();
-   #ifdef __WXUNIVERSAL__
-   virtual bool SetCurrent(bool doit = true){ return wxWindow::SetCurrent(doit); }; 
-   #endif
+    void OnPaletteChanged(wxPaletteChangedEvent& event);

 
 

-   void SetColour(const wxChar *colour);
-   void SwapBuffers();
+    inline wxGLContext* GetContext() const { return m_glContext; }

 
 

-   void OnSize(wxSizeEvent& event);
+    inline WXHDC GetHDC() const { return m_hDC; }

 
 

-   void OnQueryNewPalette(wxQueryNewPaletteEvent& event);
-   void OnPaletteChanged(wxPaletteChangedEvent& event);
+    void SetupPixelFormat(int *attribList = (int *) NULL);

 
 

-   inline wxGLContext* GetContext() const { return m_glContext; }
+    void SetupPalette(const wxPalette& palette);

 
 

-   inline WXHDC GetHDC() const { return m_hDC; }
-   void SetupPixelFormat(int *attribList = (int*) NULL);
-   void SetupPalette(const wxPalette& palette);
-   wxPalette CreateDefaultPalette();
+    wxPalette CreateDefaultPalette();

 
 

-   inline wxPalette* GetPalette() const { return (wxPalette*) & m_palette; }
+    inline wxPalette* GetPalette() const { return (wxPalette *) &m_palette; }

 
 protected:
     wxGLContext*   m_glContext;  // this is typedef-ed ptr, in fact
 
 protected:
     wxGLContext*   m_glContext;  // this is typedef-ed ptr, in fact