From bfd3b18b175b3f13ea7b95ec6e4b8903e2e126e0 Mon Sep 17 00:00:00 2001 From: cxl Date: Sun, 23 Nov 2014 19:26:07 +0000 Subject: [PATCH] GLCtrl: GTK fixed git-svn-id: svn://ultimatepp.org/upp/trunk@7925 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/GLCtrl/GLCtrl.h | 1 + uppsrc/GLCtrl/GLCtrl.upp | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/uppsrc/GLCtrl/GLCtrl.h b/uppsrc/GLCtrl/GLCtrl.h index ab3e162fe..6d5ef83ae 100644 --- a/uppsrc/GLCtrl/GLCtrl.h +++ b/uppsrc/GLCtrl/GLCtrl.h @@ -37,6 +37,7 @@ public: Callback WhenGLPaint; virtual void GLPaint(); + virtual void GLResize(int w, int h); void StdView(); }; diff --git a/uppsrc/GLCtrl/GLCtrl.upp b/uppsrc/GLCtrl/GLCtrl.upp index 627760163..eb47c072b 100644 --- a/uppsrc/GLCtrl/GLCtrl.upp +++ b/uppsrc/GLCtrl/GLCtrl.upp @@ -3,11 +3,9 @@ uses library(WIN32 GCC) "glaux glu32 opengl32"; -library(LINUX) "GL GLU"; +library(LINUX | BSD) "GL GLU"; -library(BSD) "GL GLU"; - -library(GTK) "gdkglext-x11-1.0 gtkglext-x11-1.0"; +library((LINUX | FREEBSD) & (!X11 | !NOGTK)) "gdkglext-x11-1.0 gtkglext-x11-1.0"; file GLCtrl.h,