projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add wxRichTextModuleInit
[wxWidgets.git]
/
src
/
gtk1
/
glcanvas.cpp
diff --git
a/src/gtk1/glcanvas.cpp
b/src/gtk1/glcanvas.cpp
index d81c4cbe575c280d1d64787f98f4901f4b9357d9..235c0de0d7befebbf433fcd80bcdeab70962160d 100644
(file)
--- a/
src/gtk1/glcanvas.cpp
+++ b/
src/gtk1/glcanvas.cpp
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name:
gtk
/glcanvas.cpp
+// Name:
src/gtk1
/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,19
@@
// 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"
-#include "wx/colour.h"
-#include "wx/module.h"
-#include "wx/app.h"
+#ifndef WX_PRECOMP
+ #include "wx/app.h"
+ #include "wx/frame.h"
+ #include "wx/colour.h"
+ #include "wx/module.h"
+#endif // WX_PRECOMP
extern "C"
{
extern "C"
{
@@
-34,7
+30,7
@@
extern "C"
#include "gdk/gdkx.h"
}
#include "gdk/gdkx.h"
}
-#include "wx/gtk/win_gtk.h"
+#include "wx/gtk
1
/win_gtk.h"
// DLL options compatibility check:
#include "wx/build.h"
// DLL options compatibility check:
#include "wx/build.h"
@@
-227,7
+223,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
+242,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,
@@
-259,7
+255,6
@@
gtk_glwindow_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExpose *gdk_e
// "draw" of m_wxwindow
//-----------------------------------------------------------------------------
// "draw" of m_wxwindow
//-----------------------------------------------------------------------------
-#ifndef __WXGTK20__
extern "C" {
static void
gtk_glwindow_draw_callback( GtkWidget *WXUNUSED(widget), GdkRectangle *rect, wxGLCanvas *win )
extern "C" {
static void
gtk_glwindow_draw_callback( GtkWidget *WXUNUSED(widget), GdkRectangle *rect, wxGLCanvas *win )
@@
-267,13
+262,12
@@
gtk_glwindow_draw_callback( GtkWidget *WXUNUSED(widget), GdkRectangle *rect, wxG
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( rect->x, rect->y,
rect->width, rect->height );
}
}
win->GetUpdateRegion().Union( rect->x, rect->y,
rect->width, rect->height );
}
}
-#endif
//-----------------------------------------------------------------------------
// "size_allocate" of m_wxwindow
//-----------------------------------------------------------------------------
// "size_allocate" of m_wxwindow
@@
-349,9
+343,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
+359,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
+385,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
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 );
@@
-433,10
+427,6
@@
bool wxGLCanvas::Create( wxWindow *parent,
m_glWidget = m_wxwindow;
}
m_glWidget = m_wxwindow;
}
-#ifdef __WXGTK20__
- 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_pizza_set_clear( GTK_PIZZA(m_wxwindow), FALSE );
gtk_signal_connect( GTK_OBJECT(m_wxwindow), "realize",
@@
-448,19
+438,14
@@
bool wxGLCanvas::Create( wxWindow *parent,
gtk_signal_connect( GTK_OBJECT(m_wxwindow), "expose_event",
GTK_SIGNAL_FUNC(gtk_glwindow_expose_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 );
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 );
gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
GTK_SIGNAL_FUNC(gtk_glcanvas_size_callback), (gpointer)this );
- if (gtk_check_version(2,2,0) != NULL)
- {
- gtk_widget_pop_visual();
- gtk_widget_pop_colormap();
- }
+ gtk_widget_pop_visual();
+ gtk_widget_pop_colormap();
// if our parent window is already visible, we had been realized before we
// connected to the "realize" signal and hence our m_glContext hasn't been
// if our parent window is already visible, we had been realized before we
// connected to the "realize" signal and hence our m_glContext hasn't been
@@
-471,7
+456,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
+654,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();
}