Small speed up to fonts and support for scaling.

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

diff --git a/include/wx/msw/glcanvas.h b/include/wx/msw/glcanvas.h
index 534528d5593ee66b69b6c46ca9256339d653c1a9..b8dab7af65bf4032f79816d224f7a3e282805747 100644 (file)
--- a/include/wx/msw/glcanvas.h
+++ b/include/wx/msw/glcanvas.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        glcanvas.h
+// Name:        wx/msw/glcanvas.h

 // Purpose:     wxGLCanvas, for using OpenGL with wxWindows under Windows
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxGLCanvas, for using OpenGL with wxWindows under Windows
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -16,16 +16,13 @@
 #ifndef _WX_GLCANVAS_H_
 #define _WX_GLCANVAS_H_
 
 #ifndef _WX_GLCANVAS_H_
 #define _WX_GLCANVAS_H_
 

-#include <wx/setup.h>
-
-#if wxUSE_GLCANVAS
-
-#include <wx/palette.h>
-#include <wx/scrolwin.h>
+#include "wx/palette.h"
+#include "wx/scrolwin.h"

 
 #include <windows.h>
 
 #include <windows.h>

+#include "wx/msw/winundef.h"

 
 

-#include "gl/gl.h"
+#include <GL/gl.h>

 
 //---------------------------------------------------------------------------
 // Constants for attriblist
 
 //---------------------------------------------------------------------------
 // Constants for attriblist


@@ -61,15 +58,15 @@ class WXDLLEXPORT wxGLContext: public wxObject
 {
 public:
    wxGLContext(bool isRGB, wxGLCanvas *win, const wxPalette& palette = wxNullPalette);
 {
 public:
    wxGLContext(bool isRGB, wxGLCanvas *win, const wxPalette& palette = wxNullPalette);

-   wxGLContext( 
-               bool isRGB, wxGLCanvas *win, 
+   wxGLContext(
+               bool isRGB, wxGLCanvas *win,

                const wxPalette& WXUNUSED(palette),
                const wxGLContext *other        /* for sharing display lists */
     );
    ~wxGLContext();
 
    void SetCurrent();
                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 SwapBuffers();
 
 


@@ -83,21 +80,22 @@ public:
    wxWindow*        m_window;
 };
 
    wxWindow*        m_window;
 };
 

-class WXDLLEXPORT wxGLCanvas: public wxScrolledWindow
+class WXDLLEXPORT wxGLCanvas: public wxWindow

 {
    DECLARE_CLASS(wxGLCanvas)
  public:
    wxGLCanvas(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, long style = 0,
 {
    DECLARE_CLASS(wxGLCanvas)
  public:
    wxGLCanvas(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, long style = 0,

-        const wxString& name = "GLCanvas", int *attribList = 0, 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 = -1, const wxPoint& pos = wxDefaultPosition,
    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 = "GLCanvas", 
+        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,
         int *attribList = (int*) NULL, const wxPalette& palette = wxNullPalette );
 
    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 = "GLCanvas", int *attribList = 0, const wxPalette& palette = wxNullPalette );
+        const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0,
+        const wxString& name = wxGLCanvasName, int *attribList = 0, const wxPalette& palette = wxNullPalette );

 
    ~wxGLCanvas();
 
 
    ~wxGLCanvas();
 


@@ -106,7 +104,7 @@ class WXDLLEXPORT wxGLCanvas: public wxScrolledWindow
           const wxPoint& pos, const wxSize& size, long style, const wxString& name);
 
    void SetCurrent();
           const wxPoint& pos, const wxSize& size, long style, const wxString& name);
 
    void SetCurrent();

-   void SetColour(const char *colour);
+   void SetColour(const wxChar *colour);

    void SwapBuffers();
 
    void OnSize(wxSizeEvent& event);
    void SwapBuffers();
 
    void OnSize(wxSizeEvent& event);


@@ -128,11 +126,9 @@ protected:
     wxPalette      m_palette;
     WXHDC          m_hDC;
 
     wxPalette      m_palette;
     WXHDC          m_hDC;
 

-DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE()

 };
 
 };
 

-#endif
-    // wxUSE_GLCANVAS

 #endif
     // _WX_GLCANVAS_H_
 
 #endif
     // _WX_GLCANVAS_H_