added definition of TARGET_CARBON when compiling with non generated setup.h

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

diff --git a/include/wx/gtk1/glcanvas.h b/include/wx/gtk1/glcanvas.h
index f78a8d8f10787b45832858cf08ba2a9dfa6b55d7..29f3deabc35271904519c2bcb031fc854b601d34 100644 (file)
--- a/include/wx/gtk1/glcanvas.h
+++ b/include/wx/gtk1/glcanvas.h
@@ -6,10 +6,10 @@
 // Created:     17/8/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
 // Created:     17/8/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling

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

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "glcanvas.h"
 #endif
 
 #pragma interface "glcanvas.h"
 #endif
 


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

-    wxGLContext( 
-               bool WXUNUSED(isRGB), wxWindow *win, 
+    wxGLContext(
+               bool WXUNUSED(isRGB), wxWindow *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 SetupPixelFormat();
     void SwapBuffers();
 
     void SetupPixelFormat();


@@ -91,7 +91,7 @@ public:
    GtkWidget       *m_widget;
    wxPalette        m_palette;
    wxWindow*        m_window;
    GtkWidget       *m_widget;
    wxPalette        m_palette;
    wxWindow*        m_window;

-   
+

 private:
   DECLARE_CLASS(wxGLContext)
 };
 private:
   DECLARE_CLASS(wxGLContext)
 };


@@ -110,51 +110,52 @@ public:
       m_vi = (void*) NULL;
       m_exposed = FALSE;
    }
       m_vi = (void*) NULL;
       m_exposed = FALSE;
    }

-   wxGLCanvas( wxWindow *parent, wxWindowID id = -1, 
+   wxGLCanvas( wxWindow *parent, wxWindowID id = -1,

         const wxPoint& pos = wxDefaultPosition,
         const wxPoint& pos = wxDefaultPosition,

-        const wxSize& size = wxDefaultSize, 
-        long style = 0, const wxString& name = "GLCanvas", 
-        int *attribList = (int*) NULL, 
+        const wxSize& size = wxDefaultSize,
+        long style = 0, const wxString& name = wxGLCanvasName,
+        int *attribList = (int*) NULL,

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

-        wxWindowID id = -1, 
+        wxWindowID id = -1,

         const wxPoint& pos = wxDefaultPosition,
         const wxPoint& pos = wxDefaultPosition,

-        const wxSize& size = wxDefaultSize, 
-        long style = 0, const wxString& name = "GLCanvas", 
-        int *attribList = (int*) NULL, 
+        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,
         const wxPalette& palette = wxNullPalette );
    wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared = (wxGLCanvas *)NULL,

-        wxWindowID id = -1, 
+        wxWindowID id = -1,

         const wxPoint& pos = wxDefaultPosition,
         const wxPoint& pos = wxDefaultPosition,

-        const wxSize& size = wxDefaultSize, 
-        long style = 0, const wxString& name = "GLCanvas", 
-        int *attribList = (int*) NULL, 
+        const wxSize& size = wxDefaultSize,
+        long style = 0, const wxString& name = wxGLCanvasName,
+        int *attribList = (int*) NULL,

         const wxPalette& palette = wxNullPalette );
 
         const wxPalette& palette = wxNullPalette );
 

-   bool Create( wxWindow *parent, 
-       const wxGLContext *shared = (wxGLContext*)NULL,
-       const wxGLCanvas *shared_context_of = (wxGLCanvas*)NULL,
-        wxWindowID id = -1, 
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize, 
-       long style = 0, const wxString& name = "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 = -1,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = 0,
+                const wxString& name = wxGLCanvasName,
+                int *attribList = (int*) NULL,
+                const wxPalette& palette = wxNullPalette );
+

    ~wxGLCanvas();
 
    void SetCurrent();
    ~wxGLCanvas();
 
    void SetCurrent();

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

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

-   
+

    void OnInternalIdle();
 
    void OnInternalIdle();
 

-   inline wxGLContext* GetContext() const { return m_glContext; } 
+   inline wxGLContext* GetContext() const { return m_glContext; }

 
  // implementation
 
  // implementation

-  
+

     wxGLContext      *m_glContext,
                      *m_sharedContext;
     wxGLCanvas       *m_sharedContextOf;
     wxGLContext      *m_glContext,
                      *m_sharedContext;
     wxGLCanvas       *m_sharedContextOf;


@@ -162,10 +163,10 @@ public:
     bool              m_canFreeVi;
     GtkWidget        *m_glWidget;
     bool              m_exposed;
     bool              m_canFreeVi;
     GtkWidget        *m_glWidget;
     bool              m_exposed;

-    
+

     // returns an XVisualInfo* based on desired GL attributes;
     // returns NULL if an appropriate visual is not found. The
     // returns an XVisualInfo* based on desired GL attributes;
     // returns NULL if an appropriate visual is not found. The

-    // caller is reponsible for using XFree() to deallocate 
+    // caller is reponsible for using XFree() to deallocate

     // the returned structure.
     static void* ChooseGLVisual(int *attribList);
 
     // the returned structure.
     static void* ChooseGLVisual(int *attribList);