wxBLACK usage.

[wxWidgets.git] / src / gtk / glcanvas.cpp

diff --git a/src/gtk/glcanvas.cpp b/src/gtk/glcanvas.cpp
index d81c4cbe575c280d1d64787f98f4901f4b9357d9..3c28dee504b8843cd7836afcc640aee011081eba 100644 (file)
--- a/src/gtk/glcanvas.cpp
+++ b/src/gtk/glcanvas.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        gtk/glcanvas.cpp
+// Name:        src/gtk/glcanvas.cpp

 // Purpose:     wxGLCanvas, for using OpenGL/Mesa with wxWidgets and GTK
 // Author:      Robert Roebling
 // Modified by:
 // Purpose:     wxGLCanvas, for using OpenGL/Mesa with wxWidgets and GTK
 // Author:      Robert Roebling
 // Modified by:


@@ -9,23 +9,20 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "glcanvas.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/setup.h"
-

 #if wxUSE_GLCANVAS
 
 #include "wx/glcanvas.h"
 
 #if wxUSE_GLCANVAS
 
 #include "wx/glcanvas.h"
 

-#include "wx/frame.h"
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/frame.h"
+#endif // WX_PRECOMP
+

 #include "wx/colour.h"
 #include "wx/module.h"
 #include "wx/colour.h"
 #include "wx/module.h"

-#include "wx/app.h"

 
 extern "C"
 {
 
 extern "C"
 {


@@ -35,6 +32,7 @@ extern "C"
 }
 
 #include "wx/gtk/win_gtk.h"
 }
 
 #include "wx/gtk/win_gtk.h"

+#include "wx/gtk/private.h"

 
 // DLL options compatibility check:
 #include "wx/build.h"
 
 // DLL options compatibility check:
 #include "wx/build.h"


@@ -51,12 +49,6 @@ int wxGLCanvas::m_glxVersion = 0;
 //---------------------------------------------------------------------------
 
 XVisualInfo *g_vi = (XVisualInfo*) NULL;
 //---------------------------------------------------------------------------
 
 XVisualInfo *g_vi = (XVisualInfo*) NULL;

-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;

 
 //---------------------------------------------------------------------------
 // wxGLContext
 
 //---------------------------------------------------------------------------
 // wxGLContext


@@ -227,7 +219,7 @@ gtk_glwindow_map_callback( GtkWidget * WXUNUSED(widget), wxGLCanvas *win )
         event.SetEventObject( win );
         win->GetEventHandler()->ProcessEvent( event );
 
         event.SetEventObject( win );
         win->GetEventHandler()->ProcessEvent( event );
 

-        win->m_exposed = FALSE;
+        win->m_exposed = false;

         win->GetUpdateRegion().Clear();
     }
 
         win->GetUpdateRegion().Clear();
     }
 


@@ -246,7 +238,7 @@ gtk_glwindow_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExpose *gdk_e
     if (g_isIdle)
         wxapp_install_idle_handler();
 
     if (g_isIdle)
         wxapp_install_idle_handler();
 

-    win->m_exposed = TRUE;
+    win->m_exposed = true;

 
     win->GetUpdateRegion().Union( gdk_event->area.x,
                                   gdk_event->area.y,
 
     win->GetUpdateRegion().Union( gdk_event->area.x,
                                   gdk_event->area.y,


@@ -255,26 +247,6 @@ gtk_glwindow_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExpose *gdk_e
 }
 }
 
 }
 }
 

-//-----------------------------------------------------------------------------
-// "draw" of m_wxwindow
-//-----------------------------------------------------------------------------
-
-#ifndef __WXGTK20__
-extern "C" {
-static void
-gtk_glwindow_draw_callback( GtkWidget *WXUNUSED(widget), GdkRectangle *rect, wxGLCanvas *win )
-{
-    if (g_isIdle)
-        wxapp_install_idle_handler();
-
-    win->m_exposed = TRUE;
-
-    win->GetUpdateRegion().Union( rect->x, rect->y,
-                                  rect->width, rect->height );
-}
-}
-#endif
-

 //-----------------------------------------------------------------------------
 // "size_allocate" of m_wxwindow
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // "size_allocate" of m_wxwindow
 //-----------------------------------------------------------------------------


@@ -349,9 +321,9 @@ bool wxGLCanvas::Create( wxWindow *parent,
     m_sharedContextOf = (wxGLCanvas*)shared_context_of;  // const_cast
     m_glContext = (wxGLContext*) NULL;
 
     m_sharedContextOf = (wxGLCanvas*)shared_context_of;  // const_cast
     m_glContext = (wxGLContext*) NULL;
 

-    m_exposed = FALSE;
-    m_noExpose = TRUE;
-    m_nativeSizeEvent = TRUE;
+    m_exposed = false;
+    m_noExpose = true;
+    m_nativeSizeEvent = true;

     m_fbc = NULL;
     m_vi = NULL;
 
     m_fbc = NULL;
     m_vi = NULL;
 


@@ -365,22 +337,22 @@ bool wxGLCanvas::Create( wxWindow *parent,
         if (wxTheApp->m_glFBCInfo != NULL)
         {
             fbc = (GLXFBConfig *) wxTheApp->m_glFBCInfo;
         if (wxTheApp->m_glFBCInfo != NULL)
         {
             fbc = (GLXFBConfig *) wxTheApp->m_glFBCInfo;

-            m_canFreeFBC = FALSE; // owned by wxTheApp - don't free upon destruction
+            m_canFreeFBC = false; // owned by wxTheApp - don't free upon destruction

         }
         else
         {
             fbc = (GLXFBConfig *) wxGLCanvas::ChooseGLFBC(attribList);
         }
         else
         {
             fbc = (GLXFBConfig *) wxGLCanvas::ChooseGLFBC(attribList);

-            m_canFreeFBC = TRUE;
+            m_canFreeFBC = true;

         }
         m_fbc = fbc;  // save for later use
         }
         m_fbc = fbc;  // save for later use

-        wxCHECK_MSG( m_fbc, FALSE, _T("required FBConfig couldn't be found") );
+        wxCHECK_MSG( m_fbc, false, _T("required FBConfig couldn't be found") );

     }
 
     XVisualInfo *vi = NULL;
     if (wxTheApp->m_glVisualInfo != NULL)
     {
         vi = (XVisualInfo *)wxTheApp->m_glVisualInfo;
     }
 
     XVisualInfo *vi = NULL;
     if (wxTheApp->m_glVisualInfo != NULL)
     {
         vi = (XVisualInfo *)wxTheApp->m_glVisualInfo;

-        m_canFreeVi = FALSE; // owned by wxTheApp - don't free upon destruction
+        m_canFreeVi = false; // owned by wxTheApp - don't free upon destruction

     }
     else
     {
     }
     else
     {


@@ -391,17 +363,17 @@ bool wxGLCanvas::Create( wxWindow *parent,
             // GLX <= 1.2
             vi = (XVisualInfo *) ChooseGLVisual(attribList);
 
             // GLX <= 1.2
             vi = (XVisualInfo *) ChooseGLVisual(attribList);
 

-        m_canFreeVi = TRUE;
+        m_canFreeVi = true;

     }
 
     m_vi = vi;  // save for later use
 
     }
 
     m_vi = vi;  // save for later use
 

-    wxCHECK_MSG( m_vi, FALSE, _T("required visual couldn't be found") );
+    wxCHECK_MSG( m_vi, false, _T("required visual couldn't be found") );

     GdkVisual *visual;
     GdkColormap *colormap;
 
     // MR: This needs a fix for lower gtk+ versions too. Might need to rethink logic (FIXME)
     GdkVisual *visual;
     GdkColormap *colormap;
 
     // MR: This needs a fix for lower gtk+ versions too. Might need to rethink logic (FIXME)

-#if GTK_CHECK_VERSION(2,2,0)
+#if defined(__WXGTK20__) && GTK_CHECK_VERSION(2,2,0)

     if (!gtk_check_version(2,2,0))
     {
         wxWindow::Create( parent, id, pos, size, style, name );
     if (!gtk_check_version(2,2,0))
     {
         wxWindow::Create( parent, id, pos, size, style, name );


@@ -427,38 +399,28 @@ bool wxGLCanvas::Create( wxWindow *parent,
         colormap = gdk_colormap_new( visual, TRUE );
 
         gtk_widget_push_colormap( colormap );
         colormap = gdk_colormap_new( visual, TRUE );
 
         gtk_widget_push_colormap( colormap );

-        gtk_widget_push_visual( visual );

 
         wxWindow::Create( parent, id, pos, size, style, name );
         m_glWidget = m_wxwindow;
     }
 
 
         wxWindow::Create( parent, id, pos, size, style, name );
         m_glWidget = m_wxwindow;
     }
 

-#ifdef __WXGTK20__

     gtk_widget_set_double_buffered( m_glWidget, FALSE );
     gtk_widget_set_double_buffered( m_glWidget, FALSE );

-#endif
-
-    gtk_pizza_set_clear( GTK_PIZZA(m_wxwindow), FALSE );
-
-    gtk_signal_connect( GTK_OBJECT(m_wxwindow), "realize",
-                            GTK_SIGNAL_FUNC(gtk_glwindow_realized_callback), (gpointer) this );
-
-    gtk_signal_connect( GTK_OBJECT(m_wxwindow), "map",
-                            GTK_SIGNAL_FUNC(gtk_glwindow_map_callback), (gpointer) this );
-
-    gtk_signal_connect( GTK_OBJECT(m_wxwindow), "expose_event",
-        GTK_SIGNAL_FUNC(gtk_glwindow_expose_callback), (gpointer)this );
-
-#ifndef __WXGTK20__
-    gtk_signal_connect( GTK_OBJECT(m_wxwindow), "draw",
-        GTK_SIGNAL_FUNC(gtk_glwindow_draw_callback), (gpointer)this );
-#endif

 
 

-    gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
-        GTK_SIGNAL_FUNC(gtk_glcanvas_size_callback), (gpointer)this );
+    g_signal_connect (m_wxwindow, "realize",
+                      G_CALLBACK (gtk_glwindow_realized_callback),
+                      this);
+    g_signal_connect (m_wxwindow, "map",
+                      G_CALLBACK (gtk_glwindow_map_callback),
+                      this);
+    g_signal_connect (m_wxwindow, "expose_event",
+                      G_CALLBACK (gtk_glwindow_expose_callback),
+                      this);
+    g_signal_connect (m_widget, "size_allocate",
+                      G_CALLBACK (gtk_glcanvas_size_callback),
+                      this);

 
     if (gtk_check_version(2,2,0) != NULL)
     {
 
     if (gtk_check_version(2,2,0) != NULL)
     {

-        gtk_widget_pop_visual();

         gtk_widget_pop_colormap();
     }
 
         gtk_widget_pop_colormap();
     }
 


@@ -471,7 +433,7 @@ bool wxGLCanvas::Create( wxWindow *parent,
     if (GTK_WIDGET_MAPPED(m_wxwindow))
         gtk_glwindow_map_callback( m_wxwindow, this );
 
     if (GTK_WIDGET_MAPPED(m_wxwindow))
         gtk_glwindow_map_callback( m_wxwindow, this );
 

-    return TRUE;
+    return true;

 }
 
 wxGLCanvas::~wxGLCanvas()
 }
 
 wxGLCanvas::~wxGLCanvas()


@@ -669,7 +631,7 @@ void wxGLCanvas::OnInternalIdle()
         event.SetEventObject( this );
         GetEventHandler()->ProcessEvent( event );
 
         event.SetEventObject( this );
         GetEventHandler()->ProcessEvent( event );
 

-        m_exposed = FALSE;
+        m_exposed = false;

         GetUpdateRegion().Clear();
     }
 
         GetUpdateRegion().Clear();
     }