From b837e2003b069d64211cbe11780c6b21a032f891 Mon Sep 17 00:00:00 2001 From: ellson Date: Tue, 26 Feb 2008 20:47:05 +0000 Subject: [PATCH] fixes --- cmd/smyrna/gltemplate.c | 8 ++++---- cmd/smyrna/smyrnadefs.h | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cmd/smyrna/gltemplate.c b/cmd/smyrna/gltemplate.c index 38155fa20..38e50a49d 100755 --- a/cmd/smyrna/gltemplate.c +++ b/cmd/smyrna/gltemplate.c @@ -19,7 +19,7 @@ #include "gui.h" #include "viewport.h" #include "topview.h" -#include "glTemplate.h" +#include "gltemplate.h" #include "glutils.h" #include "glexpose.h" #include "glmenu.h" @@ -118,12 +118,12 @@ static void realize (GtkWidget *widget,gpointer data) #ifdef WIN32 -#define SMYRNA_OPENGL_FONT "c:/arial.tga" +#define SMYRNA_FONT "c:/arial.tga" // #else -// using -DGTKTOPVIEW_FONT from Makefile.am and configure.ac +// using -DSMYRNA_FONT from Makefile.am and configure.ac #endif - g_print("loading font....%i\n",fontLoad(SMYRNA_OPENGL_FONT)); + g_print("loading font....%i\n",fontLoad(SMYRNA_FONT)); /*** OpenGL BEGIN ***/ if (!gdk_gl_drawable_gl_begin (gldrawable, glcontext)) diff --git a/cmd/smyrna/smyrnadefs.h b/cmd/smyrna/smyrnadefs.h index 8c1db48c4..44451efaa 100644 --- a/cmd/smyrna/smyrnadefs.h +++ b/cmd/smyrna/smyrnadefs.h @@ -93,6 +93,7 @@ typedef struct { int limits[4]; glCompSet* topviewmenu; //for novice user open gl menu topviewdata* TopviewData; + void *customptr; } topview; enum { -- 2.40.0