another fix for wxUSE_DRAG_AND_DROP==0 build

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

diff --git a/include/wx/palmos/glcanvas.h b/include/wx/palmos/glcanvas.h
index 4aa7df791da721cf7eceaacc85e04976dda17058..e4e527552330a8be82fe1f84673e1826995f5fa8 100644 (file)
--- a/include/wx/palmos/glcanvas.h
+++ b/include/wx/palmos/glcanvas.h
@@ -19,7 +19,7 @@
 
 #include <GL/gl.h>
 
 
 #include <GL/gl.h>
 

-class WXDLLIMPEXP_GL wxGLCanvas;     /* forward reference */
+class WXDLLIMPEXP_FWD_GL wxGLCanvas;     /* forward reference */

 
 class WXDLLIMPEXP_GL wxGLContext: public wxObject
 {
 
 class WXDLLIMPEXP_GL wxGLContext: public wxObject
 {


@@ -35,7 +35,7 @@ public:
 
     void SetCurrent();
 
 
     void SetCurrent();
 

-    void SetColour(const wxChar *colour);
+    void SetColour(const wxString& colour);

 
     void SwapBuffers();
 
 
     void SwapBuffers();
 


@@ -63,17 +63,17 @@ public:
         const wxPalette& palette = wxNullPalette);
 
     wxGLCanvas(wxWindow *parent,
         const wxPalette& palette = wxNullPalette);
 
     wxGLCanvas(wxWindow *parent,

-        const wxGLContext *shared = (wxGLContext *) NULL,
+        const wxGLContext *shared = NULL,

         wxWindowID id = wxID_ANY,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         long style = 0,
         const wxString& name = wxGLCanvasName,
         wxWindowID id = wxID_ANY,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         long style = 0,
         const wxString& name = wxGLCanvasName,

-        int *attribList = (int *) NULL,
+        int *attribList = NULL,

         const wxPalette& palette = wxNullPalette);
 
     wxGLCanvas(wxWindow *parent,
         const wxPalette& palette = wxNullPalette);
 
     wxGLCanvas(wxWindow *parent,

-        const wxGLCanvas *shared = (wxGLCanvas *)NULL,
+        const wxGLCanvas *shared = NULL,

         wxWindowID id = wxID_ANY,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         wxWindowID id = wxID_ANY,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,


@@ -110,7 +110,7 @@ public:
 
     inline WXHDC GetHDC() const { return m_hDC; }
 
 
     inline WXHDC GetHDC() const { return m_hDC; }
 

-    void SetupPixelFormat(int *attribList = (int *) NULL);
+    void SetupPixelFormat(int *attribList = NULL);

 
     void SetupPalette(const wxPalette& palette);
 
 
     void SetupPalette(const wxPalette& palette);