Implement support for markup labels for wxGTK wxButton.

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

diff --git a/include/wx/glcanvas.h b/include/wx/glcanvas.h
index 7c325642fc9b13710a20568cee60ac3372d6c808..b3d3c5d43e245802956027a368a3d5bbe21a2d47 100644 (file)
--- a/include/wx/glcanvas.h
+++ b/include/wx/glcanvas.h
@@ -113,7 +113,9 @@ public:
     // check if the given attributes are supported without creating a canvas
     static bool IsDisplaySupported(const int *attribList);
 
+#if wxUSE_PALETTE
     const wxPalette *GetPalette() const { return &m_palette; }
+#endif // wxUSE_PALETTE
 
     // miscellaneous helper functions
     // ------------------------------
@@ -149,16 +151,18 @@ protected:
     // (currently only implemented in wxX11 and wxMotif ports)
     virtual int GetColourIndex(const wxColour& WXUNUSED(col)) { return -1; }
 
-    // create default palette if we're not using RGBA mode
-    // (not supported in most ports)
-    virtual wxPalette CreateDefaultPalette() { return wxNullPalette; }
-
     // check if the given extension name is present in the space-separated list
     // of extensions supported by the current implementation such as returned
     // by glXQueryExtensionsString() or glGetString(GL_EXTENSIONS)
     static bool IsExtensionInList(const char *list, const char *extension);
 
+#if wxUSE_PALETTE
+    // create default palette if we're not using RGBA mode
+    // (not supported in most ports)
+    virtual wxPalette CreateDefaultPalette() { return wxNullPalette; }
+
     wxPalette m_palette;
+#endif // wxUSE_PALETTE
 
 #if WXWIN_COMPATIBILITY_2_8
     wxGLContext *m_glContext;
@@ -229,7 +233,7 @@ public:
     wxGLAPI();
     ~wxGLAPI();
 
-    static void glFrustum(GLfloat left, GLfloat right, GLfloat bottom, 
+    static void glFrustum(GLfloat left, GLfloat right, GLfloat bottom,
                             GLfloat top, GLfloat zNear, GLfloat zFar);
     static void glBegin(GLenum mode);
     static void glTexCoord2f(GLfloat s, GLfloat t);