Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merged 2.2 branch

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2000-07-15 19:51:35 +00:00
parent 8a693e6e04
commit f6bcfd974e
1835 changed files with 237729 additions and 67990 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/opengl/cube/Makefile.in
View File

@@ -15,7 +15,7 @@ program_dir = samples/opengl/cube
PROGRAM=cube
LIBRARIES=-lMesaGL -lMesaGLU ../../../lib/libwx_gtk_gl.so
LIBRARIES=$(OPENGLLIBS) ../../../lib/libwx_gtk_gl.so
OBJECTS=$(PROGRAM).o

2
samples/opengl/cube/cube.cpp
View File

@@ -427,7 +427,7 @@ void MyFrame::OnNewWindow()
MyFrame *frame = new MyFrame(NULL, "Cube OpenGL Demo Clone",
wxPoint(50, 50), wxSize(400, 300));
// Give it an icon
#ifdef wx_msw
#ifdef __WXMSW__
frame->SetIcon(wxIcon("mondrian"));
#endif

2
samples/opengl/isosurf/Makefile.in
View File

@@ -17,7 +17,7 @@ DATAFILES = isosurf.dat.gz
PROGRAM=isosurf
LIBRARIES=-lMesaGL -lMesaGLU ../../../lib/libwx_gtk_gl.so
LIBRARIES=$(OPENGLLIBS) ../../../lib/libwx_gtk_gl.so
OBJECTS=$(PROGRAM).o

2
samples/opengl/penguin/Makefile.in
View File

@@ -17,7 +17,7 @@ DATAFILES = penguin.lwo
PROGRAM=penguin
LIBRARIES=-lMesaGL -lMesaGLU ../../../lib/libwx_gtk_gl.so
LIBRARIES=$(OPENGLLIBS) ../../../lib/libwx_gtk_gl.so
OBJECTS=$(PROGRAM).o lw.o trackball.o