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

Compilation fixes for OGL

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1268 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1998-12-27 14:44:40 +00:00
parent a6b0bd49c7
commit bec3e8601d
11 changed files with 346 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
utils/ogl/Makefile Normal file
View File

@@ -0,0 +1 @@
include ../../setup/general/makedirs

44
utils/ogl/samples/ogledit/bitmaps/arrow.xpm Normal file
View File

@@ -0,0 +1,44 @@
/* XPM */
static char *arrow_xpm[] = {
/* columns rows colors chars-per-pixel */
"22 22 16 1",
" c Gray0",
". c #bf0000",
"X c #00bf00",
"o c #bfbf00",
"O c #0000bf",
"+ c #bf00bf",
"@ c #00bfbf",
"# c #c0c0c0",
"$ c #808080",
"% c Red",
"& c Green",
"* c Yellow",
"= c Blue",
"- c Magenta",
"; c Cyan",
": c Gray100",
/* pixels */
"######################",
"######################",
"######################",
"######################",
"######################",
"####### ##############",
"####### #############",
"####### ############",
"####### ###########",
"####### ##########",
"####### #########",
"####### ########",
"####### #######",
"####### ##########",
"####### # ##########",
"####### ### #########",
"########### #########",
"############ ########",
"############ ########",
"######################",
"######################",
"######################"
};

44
utils/ogl/samples/ogledit/bitmaps/tool1.xpm Normal file
View File

@@ -0,0 +1,44 @@
/* XPM */
static char *tool1_xpm[] = {
/* columns rows colors chars-per-pixel */
"22 22 16 1",
" c Gray0",
". c #bf0000",
"X c #00bf00",
"o c #bfbf00",
"O c #0000bf",
"+ c #bf00bf",
"@ c #00bfbf",
"# c #c0c0c0",
"$ c #808080",
"% c Red",
"& c Green",
"* c Yellow",
"= c Blue",
"- c Magenta",
"; c Cyan",
": c Gray100",
/* pixels */
"######################",
"######################",
"# ##",
"# ::::::::::::::::: ##",
"# ::::::::::::::::: ##",
"# ::::::::::::::::: ##",
"# ::::::::::::::::: ##",
"# ::::::::::::::::: ##",
"# ::::::::::::::::: ##",
"# ::::::::::::::::: ##",
"# ::::::::::::::::: ##",
"# ::::::::::::::::: ##",
"# ::::::::::::::::: ##",
"# ::::::::::::::::: ##",
"# ::::::::::::::::: ##",
"# ::::::::::::::::: ##",
"# ::::::::::::::::: ##",
"# ::::::::::::::::: ##",
"# ##",
"######################",
"######################",
"######################"
};

44
utils/ogl/samples/ogledit/bitmaps/tool2.xpm Normal file
View File

@@ -0,0 +1,44 @@
/* XPM */
static char *tool2_xpm[] = {
/* columns rows colors chars-per-pixel */
"22 22 16 1",
" c Gray0",
". c #bf0000",
"X c #00bf00",
"o c #bfbf00",
"O c #0000bf",
"+ c #bf00bf",
"@ c #00bfbf",
"# c #c0c0c0",
"$ c #808080",
"% c Red",
"& c Green",
"* c Yellow",
"= c Blue",
"- c Magenta",
"; c Cyan",
": c Gray100",
/* pixels */
"######################",
"######################",
"#### #####",
"### ::::::::::::: ####",
"## ::::::::::::::: ###",
"# ::::::::::::::::: ##",
"# ::::::::::::::::: ##",
"# ::::::::::::::::: ##",
"# ::::::::::::::::: ##",
"# ::::::::::::::::: ##",
"# ::::::::::::::::: ##",
"# ::::::::::::::::: ##",
"# ::::::::::::::::: ##",
"# ::::::::::::::::: ##",
"# ::::::::::::::::: ##",
"# ::::::::::::::::: ##",
"## ::::::::::::::: ###",
"### ::::::::::::: ####",
"#### #####",
"######################",
"######################",
"######################"
};

44
utils/ogl/samples/ogledit/bitmaps/tool3.xpm Normal file
View File

@@ -0,0 +1,44 @@
/* XPM */
static char *tool3_xpm[] = {
/* columns rows colors chars-per-pixel */
"22 22 16 1",
" c Gray0",
". c #bf0000",
"X c #00bf00",
"o c #bfbf00",
"O c #0000bf",
"+ c #bf00bf",
"@ c #00bfbf",
"# c #c0c0c0",
"$ c #808080",
"% c Red",
"& c Green",
"* c Yellow",
"= c Blue",
"- c Magenta",
"; c Cyan",
": c Gray100",
/* pixels */
"######################",
"######################",
"######################",
"######################",
"####### ########",
"#### ::::::: #####",
"### ::::::::::::: ####",
"## ::::::::::::::: ###",
"# ::::::::::::::::: ##",
"# ::::::::::::::::: ##",
"# ::::::::::::::::: ##",
"# ::::::::::::::::: ##",
"## ::::::::::::::: ###",
"### ::::::::::::: ####",
"#### ::::::: #####",
"###### ########",
"######################",
"######################",
"######################",
"######################",
"######################",
"######################"
};

44
utils/ogl/samples/ogledit/bitmaps/tool4.xpm Normal file
View File

@@ -0,0 +1,44 @@
/* XPM */
static char *tool4_xpm[] = {
/* columns rows colors chars-per-pixel */
"22 22 16 1",
" c Gray0",
". c #bf0000",
"X c #00bf00",
"o c #bfbf00",
"O c #0000bf",
"+ c #bf00bf",
"@ c #00bfbf",
"# c #c0c0c0",
"$ c #808080",
"% c Red",
"& c Green",
"* c Yellow",
"= c Blue",
"- c Magenta",
"; c Cyan",
": c Gray100",
/* pixels */
"######################",
"######################",
"######################",
"########## ##########",
"######### :: #########",
"######## :::: ########",
"####### :::::: #######",
"###### :::::::: ######",
"##### :::::::::: #####",
"#### :::::::::::: ####",
"### :::::::::::::: ###",
"### :::::::::::::: ###",
"#### :::::::::::: ####",
"##### :::::::::: #####",
"###### :::::::: ######",
"####### :::::: #######",
"######## :::: ########",
"######### :: #########",
"########## ##########",
"######################",
"######################",
"######################"
};

45
utils/ogl/samples/ogledit/ogl.xpm Normal file
View File

@@ -0,0 +1,45 @@
/* XPM */
static char * ogl_xpm[] = {
/* width height ncolors chars_per_pixel */
"32 32 7 1",
/* colors */
" s None c None",
". c #000000",
"+ c #000080",
"@ c #ff0000",
"# c #00ff00",
"$ c #00ffff",
"% c #ffffff",
/* pixels */
"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%",
"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%",
"%............%%%%%%........%%%%%",
"%.@@@@@@@@@@.%%%%..$$$$$$$$..%%%",
"%.@@@@@@@@@@.%%%.$$$$$$$$$$$$.%%",
"%.@@@@@@@@@@.+++.$$$$$$$$$$$$.%%",
"%.@@@@@@@@@@.+++.$$$$$$$$$$$$.%%",
"%.@@@@@@@@@@.%%%.$$$$$$$$$$$$.%%",
"%.@@@@@@@@@@.%%%%..$$$$$$$$..%%%",
"%............%%%%%.........%%%%%",
"%%%%%%++%%%%%%%%%%%%%%++%%%%%%%%",
"%%%%%%++%%%%%%%%%%%%%%++%%%%%%%%",
"%%%%%%++%%%%%%%%%%%%%%++%%%%%%%%",
"%%%%%%++%%%%%%%%%%%%%%++%%%%%%%%",
"%%%%%%++%%%%%%%%%%%%%%++%%%%%%%%",
"%%%%%%++%%%%%%%%%%%%%%++%%%%%%%%",
"%%%%%%+.%%%%%%%%%%%%%%++%%%%%%%%",
"%%%%%%.+.%%%%%%%%%%%%.++..%%%%%%",
"%%%%%.+++.%%%%%%%%%..#####..%%%%",
"%%%%.+++++.%%%%%%%.#########.%%%",
"%%%.+++++++.%%%%%%.#########.%%%",
"%%.+++++++++.%%%%.###########.%%",
"%.+++++++++++.++++###########.%%",
"%%.+++++++++.+++++###########.%%",
"%%%.+++++++.%%%%%%.#########.%%%",
"%%%%.+++++.%%%%%%%.#########.%%%",
"%%%%%.+++.%%%%%%%%%..#####..%%%%",
"%%%%%%.+.%%%%%%%%%%%%.....%%%%%%",
"%%%%%%%.%%%%%%%%%%%%%%%%%%%%%%%%",
"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%",
"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%",
"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"};

2
utils/ogl/samples/ogledit/palette.cpp
View File

@@ -55,7 +55,9 @@ EditorToolPalette::EditorToolPalette(wxWindow* parent, const wxPoint& pos, const
{ {
currentlySelected = -1; currentlySelected = -1;
#ifndef __WXGTK__
SetMaxRowsCols(1000, 1); SetMaxRowsCols(1000, 1);
#endif
} }
bool EditorToolPalette::OnLeftClick(int toolIndex, bool toggled) bool EditorToolPalette::OnLeftClick(int toolIndex, bool toggled)

8
utils/ogl/samples/ogledit/palette.h
View File

@@ -18,7 +18,11 @@
#include <wx/wx.h> #include <wx/wx.h>
#include <wx/string.h> #include <wx/string.h>
#ifdef __WXGTK__
#include <wx/toolbar.h>
#else
#include <wx/tbarsmpl.h> #include <wx/tbarsmpl.h>
#endif
/* /*
* Object editor tool palette * Object editor tool palette
@@ -28,7 +32,11 @@
// TODO for wxWin: wxToolBar95 cannot be moved to a non-0,0 position! // TODO for wxWin: wxToolBar95 cannot be moved to a non-0,0 position!
// Needs to have a parent window... // Needs to have a parent window...
// So use a simple toolbar at present. // So use a simple toolbar at present.
#ifdef __WXGTK__
#define TOOLPALETTECLASS wxToolBar
#else
#define TOOLPALETTECLASS wxToolBarSimple #define TOOLPALETTECLASS wxToolBarSimple
#endif
class EditorToolPalette: public TOOLPALETTECLASS class EditorToolPalette: public TOOLPALETTECLASS
{ {

1
utils/ogl/src/Makefile Normal file
View File

@@ -0,0 +1 @@
include ../../../setup/general/makedirs

69
utils/ogl/src/Makefile.in Normal file
View File

@@ -0,0 +1,69 @@
#
# wGLCanvas source makefile for Unix
#
# Copyright 1998, Robert Roebling
#
# wxWindows base directory
WXBASEDIR=@WXBASEDIR@
# set the OS type for compilation
OS=@OS@
# compile a library only
RULE=gslib
# needed for unactivated
NONE=
# define library name
LIB_TARGET=wx_ogl_gtk
LIB_MAJOR=0
LIB_MINOR=1
# define library sources
LIB_CPP_SRC= \
\
basic.cpp basic2.cpp bmpshape.cpp canvas.cpp \
composit.cpp divided.cpp drawn.cpp lines.cpp \
mfutils.cpp misc.cpp ogldiag.cpp
#define library objects
LIB_OBJ= \
\
$(LIB_CPP_SRC:.cpp=.o)
all::
clean::
#additional things needed for compile
ADD_COMPILE=
# include the definitions now
include ../../../../template.mak
install::
@echo "Installing library files and headers for libwx_ogl_gtk.."
@echo " Creating directory.."
@$(WXBASEDIR)/mkinstalldirs /usr/local/include/wx_ogl
@echo " Copying headers from /include/wx"
@cd $(WXBASEDIR)/utils/ogl/src ; \
for f in *.h ; do \
rm -f /usr/local/include/wx_ogl/$$f ; \
$(INSTALL_DATA) $$f /usr/local/include/wx_ogl/$$f ; \
done
@echo " Copying static library files to /usr/local/lib"
@cd $(WXBASEDIR)/lib/$(OS) ; \
for f in libwx_ogl_gtk.a ; do \
rm -f /usr/local/lib/$$f ; \
$(INSTALL_DATA) $$f /usr/local/lib/$$f ; \
done
@echo " Copying shared libraries to /usr/local/lib"
@cd $(WXBASEDIR)/lib/$(OS) ; \
for f in libwx_ogl_gtk.so* ; do \
rm -f /usr/local/lib/$$f ; \
$(INSTALL_PROGRAM) $$f /usr/local/lib/$$f ; \
done